rpms/xfce-utils/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfce-utils.spec, 1.9, 1.10

[Christoph Wickert (cwickert)]

Author: cwickert

Update of /cvs/extras/rpms/xfce-utils/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4910

Modified Files:
	.cvsignore sources xfce-utils.spec 
Log Message:
final update to 4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:30:23 -0000	1.4
+++ .cvsignore	25 Jun 2007 04:19:51 -0000	1.5
@@ -1 +1 @@
-xfce-utils-4.2.3.tar.gz
+xfce-utils-4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:30:23 -0000	1.4
+++ sources	25 Jun 2007 04:19:51 -0000	1.5
@@ -1 +1 @@
-8028266d03c5bae7c7ccbddd6656ea97  xfce-utils-4.2.3.tar.gz
+721a4ef05efa935c9bdddf36e068efb3  xfce-utils-4.2.4.tar.gz


Index: xfce-utils.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce-utils/FC-5/xfce-utils.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- xfce-utils.spec	6 Jun 2006 02:04:34 -0000	1.9
+++ xfce-utils.spec	25 Jun 2007 04:19:51 -0000	1.10
@@ -2,21 +2,21 @@
 
 Summary: Utilities for the Xfce Desktop Environment
 Name: xfce-utils
-Version: 4.2.3
-Release: 4%{?dist}
+Version: 4.2.4
+Release: 1%{?dist}
 License: GPL
 URL: http://www.xfce.org/
-Source0: http://www.us.xfce.org/archive/xfce-4.2.3.1/src/xfce-utils-4.2.3.tar.gz
+Source0: http://www.us.xfce.org/archive/xfce-4.2.4/src/xfce-utils-4.2.4.tar.gz
 Source1: xfce4.desktop
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-Requires: xfce-mcs-manager
-Requires: xfwm4
-Requires: xfdesktop
+Requires: xfce-mcs-manager >= %{version}
+Requires: xfwm4 >= %{version}
+Requires: xfdesktop >= %{version}
 Requires: /usr/bin/id
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: libxfce4mcs-devel >= %{version}
-BuildRequires: xfce-mcs-manager-devel
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
@@ -28,7 +28,7 @@
 %setup -q
 
 %build
-%configure --enable-gdm
+%configure --enable-gdm --disable-static
 
 make %{?_smp_mflags}
 
@@ -42,8 +42,10 @@
 
 install -m 755 %{SOURCE1} $RPM_BUILD_ROOT%{xsessiondir}/
 
-rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.a
 rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/mcs-plugins/*.la
+# there alreday is a Xclients.xfce included in the switchdesk package, 
+# so we don't need this one
+rm -f $RPM_BUILD_ROOT/%{_datadir}/apps/switchdesk/Xclients.xfce4
 
 %find_lang %{name}
 
@@ -52,19 +54,32 @@
 %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 TODO ChangeLog NEWS COPYING AUTHORS
-%attr(0755,root,root) %{_sysconfdir}/xdg/xfce4
+%attr(0755,root,root) %{_sysconfdir}/xdg/xfce4/xinitrc
 %{_bindir}/*
-%{_libdir}/xfce4/mcs-plugins/*
-%{_datadir}/apps/switchdesk/*
-%{_datadir}/xfce4
-%{_datadir}/icons/*/*/*
+%{_libdir}/xfce4/mcs-plugins/*.so
+%{_datadir}/xfce4/*
+%{_datadir}/icons/hicolor/*/*
 %{_datadir}/applications/*
-%{xsessiondir}/*
+%attr(0644,root,root) %{xsessiondir}/xfce4.desktop
 
 %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
+- Require xfce-mcs-manager
+- Run gtk-update-icon-cache in %%post and %%postun
+
 * Mon Jun  5 2006 Kevin Fenzi <kevin at tummy.com> - 4.2.3-4
 - Add gettext BuildRequires (fixes #194140)