2.14.2

file-roller.spec

@@ -19,11 +19,6 @@ URL:		http://ftp.gnome.org/pub/gnome/sources/file-roller/
 Source:		file-roller-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/file-roller-%{version}-root
 
-PreReq:         scrollkeeper >= 0.3.4-2
-PreReq:         GConf2
-PreReq:         /usr/bin/gconftool-2
-PreReq:         desktop-file-utils >= %{desktop_file_utils_version}
-
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: pango-devel >= %{pango_version}
 BuildRequires: gtk2-devel >= %{gtk2_version}
@@ -34,6 +29,15 @@ BuildRequires: nautilus >= %{nautilus_version}
 BuildRequires: libtool
 BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
 BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version}
+BuildRequires: scrollkeeper
+
+Requires(post): scrollkeeper
+Requires(post): desktop-file-utils >= %{desktop_file_utils_version}
+Requires(post): GConf2
+
+Requires(postun): scrollkeeper
+Requires(postun): desktop-file-utils >= %{desktop_file_utils_version}
+
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -59,9 +63,6 @@ export tagname=CC
 %makeinstall
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
-# temporary hack to add missing semicolon, fix sent upstream
-perl -pi -e 's/Categories=Application;Utility$/Categories=Application;Utility;/' $RPM_BUILD_ROOT%{_datadir}/applications/*
-
 desktop-file-install --vendor gnome --delete-original       \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications             \
   --add-only-show-in GNOME                                  \
@@ -84,8 +85,8 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 rm -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
+update-desktop-database -q
-scrollkeeper-update
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 SCHEMAS="file-roller.schemas"
 for S in $SCHEMAS; do
@@ -97,8 +98,8 @@ if [ -x /usr/bin/gtk-update-icon-cache ]; then
 fi
 
 %postun
-update-desktop-database %{_datadir}/applications
+update-desktop-database -q
-scrollkeeper-update
+scrollkeeper-update -q
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
@@ -117,6 +118,10 @@ fi
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.2-2
+- Update to 2.14.2
+- Some .spec file cleanups
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 2.14.1-2
 - Update to 2.14.1