[file-roller/f14/master] fix file lists

Matthias Clasen mclasen at fedoraproject.org
Mon Aug 16 23:58:08 UTC 2010


commit 4279255d6918086bfd72db3370fd0b9ec5e76cc2
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Mon Aug 16 19:55:15 2010 -0400

    fix file lists

 file-roller.spec |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)
---
diff --git a/file-roller.spec b/file-roller.spec
index 4419329..dbc0d6f 100644
--- a/file-roller.spec
+++ b/file-roller.spec
@@ -31,6 +31,8 @@ BuildRequires: intltool
 BuildRequires: GConf2-devel
 
 Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
 
 # The context menu API changed in 2.2.0:
 Conflicts: nautilus < 2.2.0
@@ -72,20 +74,20 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 %post
 update-desktop-database &> /dev/null || :
 touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
+%gconf_schema_upgrade file-roller
 
 %pre
-%gconf_schema_obsolete file-roller
+%gconf_schema_prepare file-roller
 
 %postun
 update-desktop-database &> /dev/null || :
-glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
+gconf_schema_remove file-roller
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
   gtk-update-icon-cache -q %{_datadir}/icons/hicolor &> /dev/null || :
 fi
 
 %posttrans
-glib-compile-schemas %{_datadir}/glib-2.0/schemas || :
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f %{name}.lang
@@ -98,7 +100,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_libexecdir}/file-roller
 %{_datadir}/icons/hicolor/*/apps/file-roller.png
 %{_datadir}/icons/hicolor/scalable/apps/file-roller.svg
-%{_datadir}/glib-2.0/schemas/org.gnome.file-roller.gschema.xml
+%{_sysconfdir}/gconf/schemas/file-roller.schemas
 
 
 %changelog


More information about the scm-commits mailing list