From 2557ab6fc20b3f8f4a70c144d8e738a939f85d35 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Apr 27 2010 17:17:31 +0000 Subject: 2.30.1.1 --- diff --git a/.cvsignore b/.cvsignore index 2460a7b..c177f07 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -file-roller-2.30.0.tar.bz2 +file-roller-2.30.1.1.tar.bz2 diff --git a/file-roller.spec b/file-roller.spec index 2d76bfe..15ec2e4 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -10,7 +10,7 @@ Summary: Tool for viewing and creating archives Name: file-roller -Version: 2.30.0 +Version: 2.30.1.1 Release: 1%{?dist} License: GPLv2+ Group: Applications/Archiving @@ -80,24 +80,14 @@ rm -rf $RPM_BUILD_ROOT %post update-desktop-database &> /dev/null || : -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule \ - %{_sysconfdir}/gconf/schemas/file-roller.schemas 2>&1 >/dev/null || : +%gconf_schema_upgrade file-roller touch --no-create %{_datadir}/icons/hicolor &> /dev/null || : %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 +%gconf_schema_prepare file-roller %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 -fi +%gconf_schema_remove file-roller %postun update-desktop-database &> /dev/null || : @@ -122,6 +112,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg %changelog +* Tue Apr 27 2010 Matthias Clasen 2.30.1.1-1 +- Update to 2.30.1.1 +- Spec file cleanups + * Mon Mar 29 2010 Matthias Clasen 2.30.0-1 - Update to 2.30.0 diff --git a/sources b/sources index 8ac6de9..8978a3f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c5e1121e612d57eb13fcb46791ed883d file-roller-2.30.0.tar.bz2 +a29a82396caf8c5726d7f0256e0ba02a file-roller-2.30.1.1.tar.bz2