rpms/epiphany-extensions/devel epiphany-extensions.spec,1.77,1.78

Matthias Clasen mclasen at fedoraproject.org
Sat May 15 22:33:26 UTC 2010


Author: mclasen

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv2538

Modified Files:
	epiphany-extensions.spec 
Log Message:
Use GConf macros in %pre



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -p -r1.77 -r1.78
--- epiphany-extensions.spec	14 May 2010 10:09:25 -0000	1.77
+++ epiphany-extensions.spec	15 May 2010 22:33:26 -0000	1.78
@@ -3,7 +3,7 @@
 %global ephy_min_version    %{ephy_major}.2
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.1
+Version:        %{ephy_major}.2
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
@@ -28,9 +28,8 @@ BuildRequires:	pcre-devel
 Requires:       epiphany >= %{ephy_min_version}
 Requires:       pygtk2 >= 2.11
 
+BuildRequires: GConf2
 Requires(pre):  GConf2
-Requires(post): GConf2
-Requires(preun): GConf2
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -48,23 +47,12 @@ GNOME web browser.
 
 
 %install
-%{__rm} -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 %{find_lang} "%{name}-%{ephy_api_version}"
 
 
-%clean
-%{__rm} -rf %{buildroot}
-
-
 %pre
-if [ "$1" -gt 1 ]; then
-  export GCONF_CONFIG_SOURCE=$(gconftool-2 --get-default-source)
-  gconftool-2 --makefile-uninstall-rule \
-              %{_sysconfdir}/gconf/schemas/smart-bookmarks.schemas \
-              %{_sysconfdir}/gconf/schemas/epilicious.schemas \
-              > /dev/null ||:
-fi
+%gconf_schema_obsolete smart-bookmarks epilicious
 
 %files -f %{name}-%{ephy_api_version}.lang
 %defattr(-,root,root,-)
@@ -80,6 +68,9 @@ fi
 
 
 %changelog
+* Sat May 15 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1-2
+- Use GConf macros in %%pre
+
 * Fri May 14 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-1
 - Update to 2.30.1
 



More information about the scm-commits mailing list