ohaessler pushed to guake (epel7). "Update the spec to use the gconf macro"

[notifications at fedoraproject.org]

From 1e88735626b86f7d14494ad7ac107791433b902b Mon Sep 17 00:00:00 2001
From: Pierre-YvesChibon <pingou at fedoraproject.org>
Date: Fri, 7 May 2010 22:23:52 +0000
Subject: Update the spec to use the gconf macro


diff --git a/guake.spec b/guake.spec
index 99be98d..8097f37 100644
--- a/guake.spec
+++ b/guake.spec
@@ -18,6 +18,7 @@ Source1:        fr.po
 # cd ../
 # tar zcvf guake-0.3.1.20090321git.tar.gz guake/
 # ---------------------------------------------
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel gtk2-devel gettext desktop-file-utils perl(XML::Parser) GConf2-devel
@@ -36,10 +37,12 @@ and press again to hide.
 %prep
 %setup -q 
 #-n %{name}
-cp %{SOURCE1} ./po/
+
 # Enables to pass the configure without problem concerning python vte library
 sed -i -e 's|if test -z "$ac_pvte_result"; then|if test -z "" ; then|g' configure
 
+# Add the french translation
+cp %{SOURCE1} ./po/
 sed -i -e 's|ALL_LINGUAS="pt_BR ja es ru pl no de it fa hu el zh_CN"|ALL_LINGUAS="pt_BR ja es ru pl no de it fa hu el zh_CN fr"|' configure
 
 
@@ -65,35 +68,23 @@ desktop-file-install --vendor=""                           \
   %{buildroot}%{_datadir}/applications/%{name}-prefs.desktop
 
 
-
 %find_lang %{name}
 rm -f %{buildroot}%{_libdir}/%{name}/globalhotkeys.la
  
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-
 %pre
-if [ "$1" -gt 1 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/%{name}.schemas >/dev/null || :
-fi
-
+%gconf_schema_prepare %{name}.schemas
 
 %post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
-  %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-
+%gconf_schema_upgrade %{name}.schemas
 
 %preun
-if [ "$1" -eq 0 ]; then
-    export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-    gconftool-2 --makefile-uninstall-rule \
-      %{_sysconfdir}/gconf/schemas/%{name}.schemas > /dev/null || :
-fi
+%gconf_schema_remove %{name}.schemas
 
+%posttrans
+killall -HUP gconfd-2 > /dev/null || :
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
@@ -111,6 +102,10 @@ fi
 %{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Sat May 08 2010 pingou <pingou at pingoured.fr> - 0.4.1-3
+- Use the gconf_schema macro instead of the former code
+- Add the posttrans part
+
 * Thu Feb 04 2010 pingou <pingou at pingoured.fr> - 0.4.1-2
 - Rebuild to include French translations
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/guake.git/commit/?h=epel7&id=1e88735626b86f7d14494ad7ac107791433b902b