rpms/xfdesktop/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfdesktop.spec, 1.11, 1.12

[Christoph Wickert (cwickert)]

Author: cwickert

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

Modified Files:
	.cvsignore sources xfdesktop.spec 
Log Message:
final update to 4.2.4


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 18:17:05 -0000	1.4
+++ .cvsignore	25 Jun 2007 04:01:54 -0000	1.5
@@ -1 +1 @@
-xfdesktop-4.2.3.tar.gz
+xfdesktop-4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 18:17:05 -0000	1.4
+++ sources	25 Jun 2007 04:01:54 -0000	1.5
@@ -1 +1 @@
-0be57a574a654625d61281411fb6be55  xfdesktop-4.2.3.tar.gz
+667dec93fcb895f0012ad52520787716  xfdesktop-4.2.4.tar.gz


Index: xfdesktop.spec
===================================================================
RCS file: /cvs/extras/rpms/xfdesktop/FC-5/xfdesktop.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- xfdesktop.spec	6 Jun 2006 03:05:42 -0000	1.11
+++ xfdesktop.spec	25 Jun 2007 04:01:54 -0000	1.12
@@ -1,10 +1,10 @@
 Summary: Desktop manager for the XFce Desktop Environment
 Name: xfdesktop
-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/xfdesktop-4.2.3.tar.gz
+Source0: http://www.us.xfce.org/archive/xfce-4.2.4/src/xfdesktop-4.2.4.tar.gz
 
 # Change default for Fedora
 Patch0: xfdesktop-image-4.2.1.patch
@@ -12,15 +12,15 @@
 Group: User Interface/Desktops
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires: xfce-mcs-manager
-Requires: xfwm4
-Requires: xfce4-panel
+Requires: xfce-mcs-manager >= %{version}
+Requires: xfwm4 >= %{version}
+Requires: xfce4-panel >= %{version}
 Requires: desktop-backgrounds-basic
 BuildRequires: libxfce4mcs-devel >= %{version}
 BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: xfce4-panel-devel >= %{version}
 BuildRequires: libxml2-devel
-BuildRequires: xfce-mcs-manager-devel
+BuildRequires: xfce-mcs-manager-devel >= %{version}
 BuildRequires: imake
 BuildRequires: libXt-devel
 BuildRequires: gettext
@@ -34,7 +34,7 @@
 %patch0 -p1 -b .fedora
 
 %build
-%configure
+%configure --disable-static
 
 make %{?_smp_mflags}
 
@@ -43,7 +43,6 @@
 
 make install DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.a
 rm -f $RPM_BUILD_ROOT%{_libdir}/xfce4/*/*.la
 
 %find_lang %{name}
@@ -51,12 +50,23 @@
 %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
-%{_sysconfdir}/xdg/xfce4/*
+%config(noreplace) %{_sysconfdir}/xdg/xfce4/*
 %{_bindir}/*
-%{_datadir}/xfce4/*
+%{_datadir}/xfce4/backdrops
+%{_datadir}/xfce4/doc/C/*
+%lang(fr) %{_datadir}/xfce4/doc/fr/*
+%lang(he) %{_datadir}/xfce4/doc/he/*
 %{_libdir}/xfce4/mcs-plugins/*
 %{_libdir}/xfce4/modules/*
 %{_libdir}/xfce4/panel-plugins/*
@@ -66,6 +76,11 @@
 %{_mandir}/man1/*
 
 %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
+- 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 #194142)