rpms/xfcalendar/FC-5 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 xfcalendar.spec, 1.8, 1.9

[Christoph Wickert (cwickert)]

Author: cwickert

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

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


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/FC-5/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	12 Nov 2005 16:44:14 -0000	1.4
+++ .cvsignore	25 Jun 2007 02:07:44 -0000	1.5
@@ -1 +1 @@
-xfcalendar-4.2.3.tar.gz
+xfcalendar-4.2.4.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/FC-5/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	12 Nov 2005 16:44:14 -0000	1.4
+++ sources	25 Jun 2007 02:07:44 -0000	1.5
@@ -1 +1 @@
-d2e2c8e010cca708295aeaf621086205  xfcalendar-4.2.3.tar.gz
+920844f44cb66e39070f82e7c2d39ba9  xfcalendar-4.2.4.tar.gz


Index: xfcalendar.spec
===================================================================
RCS file: /cvs/extras/rpms/xfcalendar/FC-5/xfcalendar.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- xfcalendar.spec	16 Feb 2006 23:47:25 -0000	1.8
+++ xfcalendar.spec	25 Jun 2007 02:07:44 -0000	1.9
@@ -1,18 +1,21 @@
 Summary: Time-managing application for Xfce4
 Name: xfcalendar
-Version: 4.2.3
-Release: 2%{?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/xfcalendar-4.2.3.tar.gz
+Source0: http://www.us.xfce.org/archive/xfce-4.2.4/src/xfcalendar-4.2.4.tar.gz
 Group: User Interface/Desktops
-Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: xfce-mcs-manager-devel
-BuildRequires: libxfce4util-devel
-BuildRequires: libxfcegui4-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires: libxfcegui4 >= %{version}
+Requires: xfce-mcs-manager >= %{version}
+BuildRequires: xfce-mcs-manager-devel >= %{version}
+BuildRequires: libxfce4util-devel >= %{version}
+BuildRequires: libxfcegui4-devel >= %{version}
 BuildRequires: startup-notification-devel
 BuildRequires: gettext
 BuildRequires: dbh-devel
+BuildRequires: desktop-file-utils
 
 %description
 Time-managing application for Xfce4
@@ -21,31 +24,52 @@
 %setup -q
 
 %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}
 
+desktop-file-install --vendor fedora                            \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --delete-original                                       \
+        --add-category Office                                   \
+        $RPM_BUILD_ROOT%{_datadir}/applications/xfcalendar.desktop
+
 %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 ChangeLog COPYING AUTHORS
 %{_bindir}/xfcalendar
 %{_libdir}/xfce4/mcs-plugins/xfcalendar_plugin.so
-%{_datadir}/applications/xfcalendar.desktop
+%{_datadir}/applications/fedora-xfcalendar.desktop
 %{_datadir}/applications/xfce-xfcalendar-settings.desktop
 %{_datadir}/icons/hicolor/48x48/apps/xfcalendar.png
 %{_datadir}/icons/hicolor/scalable/apps/xfcalendar.svg
 
 %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
+- Require xfce-mcs-manager
+- Run gtk-update-icon-cache in %%post and %%postun
+- Use desktop-file-install and add Category "Office" (#243601)
+
 * Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 4.3.2-2.fc5
 - Rebuild for fc5
 
@@ -72,8 +96,8 @@
 - Updated to 4.2.1 version
 
 * Tue Mar  8 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-2
-- Fixed to use %find_lang
-- Removed generic INSTALL from %doc
+- Fixed to use %%find_lang
+- Removed generic INSTALL from %%doc
 - Added BuildRequires for xfce-mcs-manager-devel
 
 * Sun Mar  6 2005 Kevin Fenzi <kevin at tummy.com> - 4.2.0-1