2.17.1

.cvsignore

@@ -1 +1 @@
-file-roller-2.16.0.tar.bz2
+file-roller-2.17.1.tar.bz2

file-roller.spec

@@ -10,8 +10,8 @@
 
 Summary:	File Roller is a tool for viewing and creating archives
 Name:		file-roller
-Version:	2.16.0
+Version:	2.17.1
-Release: 	2%{?dist}
+Release: 	1%{?dist}
 
 License:	GPL
 Group:		Applications/Archiving
@@ -91,16 +91,25 @@ rm -rf $RPM_BUILD_ROOT
 update-desktop-database -q
 scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null
+gconftool-2 --makefile-install-rule \
+	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null || :
 touch --no-create %{_datadir}/icons/hicolor
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor
 fi
 
+%pre
+if [ "$1" -gt 1 ]; then
+  export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
+  gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null
+fi
+
 %preun
 if [ "$1" -eq 0 ]; then
   export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-  gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null
+  gconftool-2 --makefile-uninstall-rule \
+	%{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null
 fi
 
 %postun
@@ -124,6 +133,9 @@ fi
 %{_libdir}/nautilus/extensions-1.0/libnautilus-fileroller.so
 
 %changelog
+* Sat Oct 21 2006 Matthias Clasen <mclasen@redhat.com> - 2.17.1-1
+- Update to 2.17.1
+
 * Fri Sep  8 2006 Matthias Clasen <mclasen@redhat.com> - 2.16.0-2
 - Fix directory ownership issues
 

sources

@@ -1 +1 @@
-96a17824bedce36d3ebfee602e6a68c5  file-roller-2.16.0.tar.bz2
+7fe85116d52da4d18dc1c40f23f9e341  file-roller-2.17.1.tar.bz2