[libgweather] fix spec

Matthias Clasen mclasen at fedoraproject.org
Wed Jun 27 03:04:31 UTC 2012


commit 6a8b5be97f9a65ab460225020d48e23359639e77
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Jun 26 23:05:45 2012 -0400

    fix spec

 libgweather.spec |   18 +++++-------------
 1 files changed, 5 insertions(+), 13 deletions(-)
---
diff --git a/libgweather.spec b/libgweather.spec
index 9a066b3..1cb87c1 100644
--- a/libgweather.spec
+++ b/libgweather.spec
@@ -59,42 +59,34 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %post
 /sbin/ldconfig
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/gweather.schemas > /dev/null || :
 touch --no-create %{_datadir}/icons/gnome &>/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/gweather.schemas > /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/gweather.schemas > /dev/null || :
-fi
 
 %postun
 /sbin/ldconfig
 if [ $1 -eq 0 ]; then
   touch --no-create %{_datadir}/icons/gnome &>/dev/null
   gtk-update-icon-cache %{_datadir}/icons/gnome &>/dev/null || :
+  glib-compile-schemas %{_datadir}/glib-2.0/schemas
 fi
 
 %posttrans
 gtk-update-icon-cache -q %{_datadir}/icons/gnome &>/dev/null || :
+glib-compile-schemas %{_datadir}/glib-2.0/schemas
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING
-%{_sysconfdir}/gconf/schemas/gweather.schemas
 %{_libdir}/libgweather-3.so.*
 %{_libdir}/girepository-1.0/GWeather-3.0.typelib
 %dir %{_datadir}/libgweather
 %{_datadir}/libgweather/Locations.xml
+%{_datadir}/libgweather/Locations.*.xml
 %{_datadir}/libgweather/locations.dtd
 %{_datadir}/icons/gnome/*/status/*
+%{_datadir}/glib-2.0/schemas/org.gnome.GWeather.enums.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.GWeather.gschema.xml
 
 %files devel
 %defattr(-,root,root,-)


More information about the scm-commits mailing list