rpms/file-roller/devel .cvsignore, 1.35, 1.36 file-roller.spec, 1.56, 1.57 sources, 1.36, 1.37

[fedora-cvs-commits at redhat.com]

Author: mclasen

Update of /cvs/dist/rpms/file-roller/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8243

Modified Files:
	.cvsignore file-roller.spec sources 
Log Message:
2.14.2



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/.cvsignore,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- .cvsignore	11 Apr 2006 04:09:31 -0000	1.35
+++ .cvsignore	18 Apr 2006 17:57:36 -0000	1.36
@@ -21,3 +21,4 @@
 file-roller-2.13.92.tar.bz2
 file-roller-2.14.0.tar.bz2
 file-roller-2.14.1.tar.bz2
+file-roller-2.14.2.tar.bz2


Index: file-roller.spec
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- file-roller.spec	11 Apr 2006 04:37:50 -0000	1.56
+++ file-roller.spec	18 Apr 2006 17:57:36 -0000	1.57
@@ -19,11 +19,6 @@
 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: 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 @@
 %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 -rf $RPM_BUILD_ROOT
 
 %post
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+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 @@
 fi
 
 %postun
-update-desktop-database %{_datadir}/applications
-scrollkeeper-update
+update-desktop-database -q
+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 @@
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Tue Apr 18 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.2-2
+- Update to 2.14.2
+- Some .spec file cleanups
+
 * Mon Apr 10 2006 Matthias Clasen <mclasen at redhat.com> - 2.14.1-2
 - Update to 2.14.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/file-roller/devel/sources,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- sources	11 Apr 2006 04:09:31 -0000	1.36
+++ sources	18 Apr 2006 17:57:36 -0000	1.37
@@ -1 +1 @@
-31f994e5874e8f96c33cbe39d9e7a7e9  file-roller-2.14.1.tar.bz2
+4900dc4b2e4f0f173bd88cb5e6b9bde1  file-roller-2.14.2.tar.bz2