rpms/epiphany-extensions/F-13 epiphany-extensions.spec,1.78,1.79

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/epiphany-extensions/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv5808

Modified Files:
	epiphany-extensions.spec 
Log Message:
* Thu May 27 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-2
- Build the extensions set as default by the developers
- Use GConf macros in %pre



Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/F-13/epiphany-extensions.spec,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- epiphany-extensions.spec	14 May 2010 09:41:05 -0000	1.78
+++ epiphany-extensions.spec	27 May 2010 14:12:10 -0000	1.79
@@ -4,7 +4,7 @@
 
 Name:           epiphany-extensions
 Version:        %{ephy_major}.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -24,13 +24,13 @@ BuildRequires:	intltool
 BuildRequires:	libtool
 BuildRequires:	opensp-devel
 BuildRequires:	pcre-devel
+BuildRequires:	dbus-glib-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
@@ -42,29 +42,17 @@ GNOME web browser.
 
 
 %build
-%configure --disable-scrollkeeper   		\
-           --with-extensions=all
+%configure --disable-scrollkeeper
 %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
 
 %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,10 @@ fi
 
 
 %changelog
+* Thu May 27 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-2
+- Build the extensions set as default by the developers
+- Use GConf macros in %%pre
+
 * Fri May 14 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-1
 - Update to 2.30.1