rpms/xfce-mcs-plugins/devel xfce-mcs-plugins-4.4.2-fedora.patch, 1.1, 1.2 xfce-mcs-plugins.spec, 1.19, 1.20

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/pkgs/rpms/xfce-mcs-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27501

Modified Files:
	xfce-mcs-plugins-4.4.2-fedora.patch xfce-mcs-plugins.spec 
Log Message:
* Tue Feb 19 2008 Christoph Wickert <fedora christoph-wickert.de> - 4.4.2-4
- Use Nodoka Theme by default
- Configure with --disable-static instead of removing .a files
- Run gtk-update-icon-cache 


xfce-mcs-plugins-4.4.2-fedora.patch:

Index: xfce-mcs-plugins-4.4.2-fedora.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins-4.4.2-fedora.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xfce-mcs-plugins-4.4.2-fedora.patch	3 Dec 2007 06:01:11 -0000	1.1
+++ xfce-mcs-plugins-4.4.2-fedora.patch	19 Feb 2008 20:43:45 -0000	1.2
@@ -1,14 +1,14 @@
---- xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c.orig	2007-12-01 20:56:27.000000000 +0100
-+++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c	2007-12-01 20:59:17.000000000 +0100
-@@ -131,9 +131,9 @@
- #define RCFILE  "gtk.xml"
+--- xfce-mcs-plugins-4.4.2.orig/plugins/ui_plugin/ui_plugin.c	2007-11-17 20:31:23.000000000 +0100
++++ xfce-mcs-plugins-4.4.2/plugins/ui_plugin/ui_plugin.c	2008-02-19 05:59:20.000000000 +0100
+@@ -132,9 +132,9 @@
  #define CHANNEL "settings"
  #define PLUGIN_NAME "ui"
--#define DEFAULT_THEME "Default"
-+#define DEFAULT_THEME "Clearlooks"
- #define INITIAL_THEME "Xfce"
--#define DEFAULT_ICON_THEME "hicolor"
-+#define DEFAULT_ICON_THEME "Fedora"
- #define INITIAL_ICON_THEME "Rodent"
+ #define DEFAULT_THEME "Default"
+-#define INITIAL_THEME "Xfce"
++#define INITIAL_THEME "Nodoka"
+ #define DEFAULT_ICON_THEME "hicolor"
+-#define INITIAL_ICON_THEME "Rodent"
++#define INITIAL_ICON_THEME "Fedora"
  #define DEFAULT_TOOLBAR_STYLE "icons"
  #define DEFAULT_FONT "Sans 9"
+ #define DEFAULT_XFT_ANTIALIAS 1


Index: xfce-mcs-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfce-mcs-plugins/devel/xfce-mcs-plugins.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- xfce-mcs-plugins.spec	10 Feb 2008 23:38:21 -0000	1.19
+++ xfce-mcs-plugins.spec	19 Feb 2008 20:43:45 -0000	1.20
@@ -1,11 +1,11 @@
 Summary: Plugins for multi channel settings manager
 Name: xfce-mcs-plugins
 Version: 4.4.2
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2
 URL: http://www.xfce.org/
 Source0: http://www.xfce.org/archive/xfce-4.4.2/src/xfce-mcs-plugins-4.4.2.tar.bz2
-Patch: xfce-mcs-plugins-4.4.2-fedora.patch
+Patch0: xfce-mcs-plugins-4.4.2-fedora.patch
 Patch1: xfce-mcs-plugins-4.4.2-mouse.patch
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -25,24 +25,31 @@
 
 %prep
 %setup -q
-%patch -p1 -b .theme
+%patch0 -p1 -b .fedora
 %patch1 -p1 -b .mouse
 
 %build
-%configure
+%configure --disable-static
 make %{?_smp_mflags}
 
 %install
 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}
 
 %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 README COPYING AUTHORS
@@ -50,12 +57,17 @@
 %{_datadir}/xfce4/doc/C
 %{_datadir}/xfce4/doc/fr
 %{_datadir}/xfce4/doc/it
-%{_libdir}/xfce4/mcs-plugins/*
+%{_libdir}/xfce4/mcs-plugins/*.so
 %{_datadir}/xfce-mcs-plugins/
 %{_datadir}/applications/*
-%{_datadir}/icons/*/*/apps/*
+%{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Tue Feb 19 2008 Christoph Wickert <fedora christoph-wickert.de> - 4.4.2-4
+- Use Nodoka Theme by default
+- Configure with --disable-static instead of removing .a files
+- Run gtk-update-icon-cache 
+
 * Sun Feb 10 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-3
 - Rebuild for gcc43