[gucharmap] ifix file lists

Matthias Clasen mclasen at fedoraproject.org
Wed Feb 8 02:50:33 UTC 2012


commit 4b1285a2f21a6d155a2ed1e676e1d8e97512f681
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Feb 7 21:50:31 2012 -0500

    ifix file lists

 gucharmap.spec |   13 +++++--------
 1 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/gucharmap.spec b/gucharmap.spec
index 6eb8aca..ba2780e 100644
--- a/gucharmap.spec
+++ b/gucharmap.spec
@@ -46,7 +46,6 @@ needed to use the libgucharmap library.
 
 %build
 %configure --with-gtk=3.0 \
-           --disable-gtk-immodules \
            --disable-scrollkeeper \
            --enable-introspection
 make %{?_smp_mflags}
@@ -71,7 +70,7 @@ desktop-file-install --vendor gnome --delete-original       \
 %post
 /sbin/ldconfig
 update-desktop-database &> /dev/null || :
-%gconf_schema_upgrade gucharmap
+%gconf_schema_obsolete gucharmap
 touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
@@ -80,16 +79,13 @@ update-desktop-database &> /dev/null || :
 if [ $1 -eq 0 ] ; then
   touch --no-create %{_datadir}/icons/hicolor &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
-%pre
-%gconf_schema_prepare gucharmap
-
-%preun
-%gconf_schema_remove gucharmap
 
 %files -f gucharmap.lang
 %doc AUTHORS COPYING NEWS README
@@ -98,8 +94,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %{_bindir}/gnome-character-map
 %{_libdir}/libgucharmap_2_90.so.*
 %{_datadir}/applications/gnome-gucharmap.desktop
-%{_sysconfdir}/gconf/schemas/gucharmap.schemas
 %{_libdir}/girepository-1.0
+%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.Charmap.gschema.xml
 
 
 %files devel


More information about the scm-commits mailing list