From 722a9da502ca165dbaaf7a1e25b7284c547b7708 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Oct 05 2006 03:11:10 +0000 Subject: Upgrade to 4.4rc1/4.3.99.1 --- diff --git a/.cvsignore b/.cvsignore index 52de15f..353b4c0 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfwm4-4.2.3.2.tar.gz +xfwm4-4.3.99.1.tar.bz2 diff --git a/sources b/sources index 03585b5..b377471 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d73e89c50179ccb438c076b3b71d59a4 xfwm4-4.2.3.2.tar.gz +ab8fcfdf496f093bbe711a7d853deb33 xfwm4-4.3.99.1.tar.bz2 diff --git a/xfwm4.spec b/xfwm4.spec index 18d0520..49e4837 100644 --- a/xfwm4.spec +++ b/xfwm4.spec @@ -1,29 +1,32 @@ Summary: Next generation window manager for Xfce Name: xfwm4 -Version: 4.2.3.2 -Release: 6%{?dist} +Version: 4.3.99.1 +Release: 4%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.2.3.2/src/xfwm4-4.2.3.2.tar.gz +Source0: http://www.xfce.org/archive/xfce-4.3.99.1/src/xfwm4-4.3.99.1.tar.bz2 # Change default for Fedora -Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch -Patch1: xfwm4-bluecurve.patch +#Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch +#Patch1: xfwm4-bluecurve.patch Group: User Interface/Desktops BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Requires: libxfce4mcs >= 4.2.3 -Requires: libxfcegui4 >= 4.2.3 -Requires: xfce-mcs-manager >= 4.2.3 -BuildRequires: libxfce4mcs-devel >= 4.2.3 -BuildRequires: libxfcegui4-devel >= 4.2.3 -BuildRequires: xfce-mcs-manager-devel >= 4.2.3 +Requires: libxfce4mcs >= 4.3.90.2 +Requires: libxfcegui4 >= 4.3.90.2 +Requires: xfce-mcs-manager >= 4.3.90.2 +BuildRequires: libxfce4mcs-devel >= 4.3.90.2 +BuildRequires: libxfcegui4-devel >= 4.3.90.2 +BuildRequires: xfce-mcs-manager-devel >= 4.3.90.2 BuildRequires: imake BuildRequires: libXt-devel BuildRequires: libXpm-devel BuildRequires: libXext-devel BuildRequires: gettext intltool +BuildRequires: libXcomposite-devel +BuildRequires: libXdamage-devel +BuildRequires: startup-notification-devel %description xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce. @@ -31,8 +34,8 @@ xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce. %prep %setup -q -%patch0 -p1 -b .bluecurve-prep -%patch1 -p1 -b .bluecurve +#%patch0 -p1 -b .bluecurve-prep +#%patch1 -p1 -b .bluecurve %build %configure @@ -58,19 +61,35 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xfce4/mcs-plugins/* %{_datadir}/applications/* %{_datadir}/icons/hicolor/*/*/* -%{_datadir}/xfce4 +%dir %{_datadir}/xfce4 +%{_datadir}/xfce4/doc/*/images/* +%{_datadir}/xfce4/doc/*/*.html %{_datadir}/xfwm4 %{_datadir}/themes %changelog -* Tue Aug 29 2006 Kevin Fenzi - 4.2.3.2-6 -- Rebuild for fc6 +* Wed Oct 4 2006 Kevin Fenzi - 4.3.99.1-5 +- Bump release for devel checkin -* Tue Jun 6 2006 Kevin Fenzi - 4.2.3.2-5 -- Add gettext and intltool to BuildRequires (fixes #194148) +* Mon Oct 2 2006 Kevin Fenzi - 4.3.99.1-4 +- Own the datadir/xfce4 directory -* Thu Feb 16 2006 Kevin Fenzi - 4.2.3.2-4.fc5 -- Rebuild for fc5 +* Mon Oct 2 2006 Kevin Fenzi - 4.3.99.1-3 +- Add libXcomposite-devel and libXdamage-devel BuildRequires +- Add startup-notification-devel BuildRequires + +* Sun Sep 24 2006 Kevin Fenzi - 4.3.99.1-2 +- Don't own the xfce4 docdir. (xfdesktop does) + +* Sun Sep 3 2006 Kevin Fenzi - 4.3.99.1-1 +- Upgrade to 4.3.99.1 +- Fix macro in changelog + +* Wed Jul 12 2006 Kevin Fenzi - 4.3.90.2-1 +- Upgrade to 4.3.90.2 + +* Mon May 8 2006 Kevin Fenzi - 4.3.90.1-1 +- Upgrade 4.3.90.1 * Thu Nov 17 2005 Kevin Fenzi - 4.2.3.2-3.fc5 - Added libXpm-devel and libXext-devel BuildRequires @@ -108,7 +127,7 @@ rm -rf $RPM_BUILD_ROOT - Updated to version 4.2.1 * Tue Mar 8 2005 Kevin Fenzi - 4.2.0-2 -- Removed generic INSTALL from %doc +- Removed generic INSTALL from %%doc - Fixed case of Xfce * Sun Mar 6 2005 Kevin Fenzi - 4.2.0-1