diff --git a/.cvsignore b/.cvsignore index 31742d7..0eca6e4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -xfwm4-4.2.2.tar.gz +xfwm4-4.2.3.1.tar.gz diff --git a/sources b/sources index 3e29417..d0411ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e4c91c59da7d1bdc6141cde3263ea6f9 xfwm4-4.2.2.tar.gz +f42a4556e53fb298579821500045e36a xfwm4-4.2.3.1.tar.gz diff --git a/xfwm4-bluecurve-prep-4.2.3.1.patch b/xfwm4-bluecurve-prep-4.2.3.1.patch new file mode 100644 index 0000000..7585510 --- /dev/null +++ b/xfwm4-bluecurve-prep-4.2.3.1.patch @@ -0,0 +1,64 @@ +diff -Nur xfwm4-4.2.3.1.orig/configure xfwm4-4.2.3.1/configure +--- xfwm4-4.2.3.1.orig/configure 2005-11-07 13:20:58.000000000 -0700 ++++ xfwm4-4.2.3.1/configure 2005-11-07 20:02:10.000000000 -0700 +@@ -26117,7 +26117,7 @@ + fi + + +- ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile doc/he/Makefile doc/he/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile" ++ ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile doc/he/Makefile doc/he/images/Makefile defaults/Makefile icons/Makefile icons/48x48/Makefile icons/scalable/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/symphony/Makefile themes/tyrex/Makefile themes/therapy/Makefile themes/waza/Makefile themes/wildbush/Makefile themes/bluecurve/Makefile" + cat >confcache <<\_ACEOF + # This file is a shell script that caches the results of configure + # tests run on this system so they can be shared between configure +@@ -26729,6 +26729,7 @@ + "themes/therapy/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/therapy/Makefile" ;; + "themes/waza/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/waza/Makefile" ;; + "themes/wildbush/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/wildbush/Makefile" ;; ++ "themes/bluecurve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/bluecurve/Makefile" ;; + "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; + "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; + "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; +diff -Nur xfwm4-4.2.3.1.orig/configure.ac xfwm4-4.2.3.1/configure.ac +--- xfwm4-4.2.3.1.orig/configure.ac 2005-11-07 12:41:46.000000000 -0700 ++++ xfwm4-4.2.3.1/configure.ac 2005-11-07 20:02:10.000000000 -0700 +@@ -130,4 +130,5 @@ + themes/therapy/Makefile + themes/waza/Makefile + themes/wildbush/Makefile ++themes/bluecurve/Makefile + ]) +diff -Nur xfwm4-4.2.3.1.orig/mcs-plugin/xfwm4_plugin.h xfwm4-4.2.3.1/mcs-plugin/xfwm4_plugin.h +--- xfwm4-4.2.3.1.orig/mcs-plugin/xfwm4_plugin.h 2005-11-07 12:41:42.000000000 -0700 ++++ xfwm4-4.2.3.1/mcs-plugin/xfwm4_plugin.h 2005-11-07 20:02:10.000000000 -0700 +@@ -29,7 +29,7 @@ + #define CHANNEL2 "xfwm4_keys" + #define PLUGIN_NAME "xfwm4" + +-#define DEFAULT_THEME "Default" ++#define DEFAULT_THEME "Bluecurve" + #define DEFAULT_KEY_THEME "Default" + #define DEFAULT_LAYOUT "OTS|HMC" + #define DEFAULT_ACTION "maximize" +diff -Nur xfwm4-4.2.3.1.orig/themes/Makefile.am xfwm4-4.2.3.1/themes/Makefile.am +--- xfwm4-4.2.3.1.orig/themes/Makefile.am 2005-11-07 12:41:23.000000000 -0700 ++++ xfwm4-4.2.3.1/themes/Makefile.am 2005-11-07 20:02:57.000000000 -0700 +@@ -10,4 +10,5 @@ + therapy \ + tyrex \ + waza \ +- wildbush ++ wildbush \ ++ bluecurve +diff -Nur xfwm4-4.2.3.1.orig/themes/Makefile.in xfwm4-4.2.3.1/themes/Makefile.in +--- xfwm4-4.2.3.1.orig/themes/Makefile.in 2005-11-07 13:20:54.000000000 -0700 ++++ xfwm4-4.2.3.1/themes/Makefile.in 2005-11-07 20:02:10.000000000 -0700 +@@ -233,7 +233,8 @@ + therapy \ + tyrex \ + waza \ +- wildbush ++ wildbush \ ++ bluecurve + + all: all-recursive + diff --git a/xfwm4.spec b/xfwm4.spec index 664d702..d507bac 100644 --- a/xfwm4.spec +++ b/xfwm4.spec @@ -1,24 +1,24 @@ Summary: Next generation window manager for Xfce Name: xfwm4 -Version: 4.2.2 -Release: 1.fc4 +Version: 4.2.3.1 +Release: 1%{?dist} License: GPL URL: http://www.xfce.org/ -Source0: http://www.xfce.org/archive/xfce-4.2.2/src/xfwm4-4.2.2.tar.gz +Source0: http://www.xfce.org/archive/xfce-4.2.3.1/src/xfwm4-4.2.3.1.tar.gz # Change default for Fedora -Patch0: xfwm4-bluecurve-prep-4.2.2.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 >= %{version} -Requires: libxfcegui4 >= %{version} -Requires: xfce-mcs-manager >= %{version} -BuildRequires: libxfce4mcs-devel >= %{version} -BuildRequires: libxfcegui4-devel >= %{version} -BuildRequires: xfce-mcs-manager-devel >= %{version} +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 %description xfwm4 is a window manager compatible with GNOME, GNOME2, KDE2, KDE3 and Xfce. @@ -58,6 +58,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/themes %changelog +* Mon Nov 7 2005 Kevin Fenzi - 4.2.3.1-1.fc5 +- Update to 4.2.3.1 +- Added dist tag +- Rediffed bluecurve-prep patch + * Tue May 17 2005 Kevin Fenzi - 4.2.2-1.fc4 - Update to 4.2.2 - Rediffed bluecurve-prep patch