rpms/guake/F-13 guake.spec,1.15,1.16
Pierre-YvesChibon
pingou at fedoraproject.org
Fri May 7 22:29:35 UTC 2010
Author: pingou
Update of /cvs/pkgs/rpms/guake/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv26143/F-13
Modified Files:
guake.spec
Log Message:
Update the spec to add the posttrans to fix gconf issue
Index: guake.spec
===================================================================
RCS file: /cvs/pkgs/rpms/guake/F-13/guake.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- guake.spec 4 Feb 2010 10:22:57 -0000 1.15
+++ guake.spec 7 May 2010 22:29:35 -0000 1.16
@@ -1,6 +1,6 @@
Name: guake
Version: 0.4.1
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Drop-down terminal for GNOME
Group: Applications/System
@@ -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
More information about the scm-commits
mailing list