rpms/xfwm4/FC-5 xfwm4-bluecurve-prep-4.2.4.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 sources, 1.5, 1.6 xfwm4.spec, 1.13, 1.14

Mon Jun 25 03:32:43 UTC 2007

Author: cwickert

Update of /cvs/extras/rpms/xfwm4/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26363

Modified Files:
	.cvsignore sources xfwm4.spec 
Added Files:
	xfwm4-bluecurve-prep-4.2.4.patch 
Log Message:
final update to 4.2.4

xfwm4-bluecurve-prep-4.2.4.patch:

--- NEW FILE xfwm4-bluecurve-prep-4.2.4.patch ---
diff -dur xfwm4-4.2.4.orig/configure xfwm4-4.2.4/configure
--- xfwm4-4.2.4.orig/configure	2007-01-14 22:08:54.000000000 +0100
+++ xfwm4-4.2.4/configure	2007-06-21 02:30:26.000000000 +0200
@@ -25338,7 +25338,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
@@ -25982,6 +25982,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" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
Nur in xfwm4-4.2.4/: configure~.
diff -dur xfwm4-4.2.4.orig/configure.ac xfwm4-4.2.4/configure.ac
--- xfwm4-4.2.4.orig/configure.ac	2007-01-13 22:48:15.000000000 +0100
+++ xfwm4-4.2.4/configure.ac	2007-06-21 02:31:24.000000000 +0200
@@ -130,4 +130,5 @@
 themes/therapy/Makefile
 themes/waza/Makefile
 themes/wildbush/Makefile
+themes/bluecurve/Makefile
 ])
Nur in xfwm4-4.2.4/: configure.ac~.
diff -dur xfwm4-4.2.4.orig/mcs-plugin/xfwm4_plugin.h xfwm4-4.2.4/mcs-plugin/xfwm4_plugin.h
--- xfwm4-4.2.4.orig/mcs-plugin/xfwm4_plugin.h	2007-01-13 22:48:13.000000000 +0100
+++ xfwm4-4.2.4/mcs-plugin/xfwm4_plugin.h	2007-06-21 02:32:32.000000000 +0200
@@ -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"
Nur in xfwm4-4.2.4/mcs-plugin: xfwm4_plugin.h~.
diff -dur xfwm4-4.2.4.orig/themes/Makefile.am xfwm4-4.2.4/themes/Makefile.am
--- xfwm4-4.2.4.orig/themes/Makefile.am	2007-01-13 22:48:04.000000000 +0100
+++ xfwm4-4.2.4/themes/Makefile.am	2007-06-21 02:34:13.000000000 +0200
@@ -10,4 +10,5 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush							\
+	bluecurve
Nur in xfwm4-4.2.4/themes: Makefile.am~.
diff -dur xfwm4-4.2.4.orig/themes/Makefile.in xfwm4-4.2.4/themes/Makefile.in
--- xfwm4-4.2.4.orig/themes/Makefile.in	2007-01-14 22:08:53.000000000 +0100
+++ xfwm4-4.2.4/themes/Makefile.in	2007-06-21 02:34:20.000000000 +0200
@@ -235,7 +235,8 @@
 	therapy								\
 	tyrex								\
 	waza								\
-	wildbush
+	wildbush							\
+	bluecurve
 
 all: all-recursive
 
Nur in xfwm4-4.2.4/themes: Makefile.in~.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-5/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	17 Nov 2005 06:21:54 -0000	1.5
+++ .cvsignore	25 Jun 2007 03:32:08 -0000	1.6
@@ -1 +1 @@
-xfwm4-4.2.3.2.tar.gz
+xfwm4-4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	17 Nov 2005 06:21:54 -0000	1.5
+++ sources	25 Jun 2007 03:32:08 -0000	1.6
@@ -1 +1 @@
-d73e89c50179ccb438c076b3b71d59a4  xfwm4-4.2.3.2.tar.gz
+20dff9e377102d64b17047133e4c9993  xfwm4-4.2.4.tar.gz


Index: xfwm4.spec
===================================================================
RCS file: /cvs/extras/rpms/xfwm4/FC-5/xfwm4.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xfwm4.spec	7 Jun 2006 01:58:28 -0000	1.13
+++ xfwm4.spec	25 Jun 2007 03:32:08 -0000	1.14
@@ -1,24 +1,23 @@
 Summary: Next generation window manager for Xfce
 Name: xfwm4
-Version: 4.2.3.2
-Release: 5%{?dist}
+Version: 4.2.4
+Release: 1%{?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.2.4/src/xfwm4-4.2.4.tar.gz
 
 # Change default for Fedora
-Patch0: xfwm4-bluecurve-prep-4.2.3.1.patch
+Patch0: xfwm4-bluecurve-prep-4.2.4.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 >= %{version}
+Requires: libxfcegui4 >= %{version}
+BuildRequires: libxfce4mcs-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: libXpm-devel
@@ -35,7 +34,7 @@
 %patch1 -p1 -b .bluecurve
 
 %build
-%configure
+%configure --disable-static
 
 make %{?_smp_mflags}
 
@@ -43,7 +42,6 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
 
 %find_lang %{name}
@@ -51,6 +49,14 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%postun
+touch --no-create %{_datadir}/icons/hicolor || :
+%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc example.gtkrc-2.0 README TODO COPYING AUTHORS COMPOSITOR
@@ -58,11 +64,19 @@
 %{_libdir}/xfce4/mcs-plugins/*
 %{_datadir}/applications/*
 %{_datadir}/icons/hicolor/*/*/*
-%{_datadir}/xfce4
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 %{_datadir}/xfwm4
 %{_datadir}/themes
 
 %changelog
+* Wed Jun 20 2007 Christoph Wickert <fedora at christoph-wickert.de> - 4.2.4-1
+- Update to 4.2.4
+- disable-static instead of removing .a files
+- Use versioned %%BuildRequires for the xfce stuff
+- Run gtk-update-icon-cache in %%post and %%postun
+
 * Tue Jun  6 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3.2-5
 - Add gettext and intltool to BuildRequires (fixes #194148)
 
@@ -105,7 +119,7 @@
 - Updated to version 4.2.1
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Removed generic INSTALL from %doc
+- Removed generic INSTALL from %%doc
 - Fixed case of Xfce
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1


