[epiphany-extensions/f14/master] - Update to 2.30.2 - Enable all extensions - Spec cleanup

Mon Mar 28 18:29:28 UTC 2011

commit 1fda111669334cf782017afa90112788a47aad66
Author: Mohamed El Morabity <melmorabity at fedoraproject.org>
Date:   Mon Mar 28 20:30:15 2011 +0200

    - Update to 2.30.2
    - Enable all extensions
    - Spec cleanup

 .gitignore                                         |    1 +
 ...ensions-2.30.2-deprecated_GtkNotebookPage.patch |   60 ++++++++++++++++++++
 epiphany-extensions.spec                           |   58 ++++++++-----------
 sources                                            |    2 +-
 4 files changed, 86 insertions(+), 35 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 2780d9a..7e15fdd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 epiphany-extensions-2.30.1.tar.bz2
 /epiphany-extensions-2.32.0.tar.bz2
+/epiphany-extensions-2.30.2.tar.bz2
diff --git a/epiphany-extensions-2.30.2-deprecated_GtkNotebookPage.patch b/epiphany-extensions-2.30.2-deprecated_GtkNotebookPage.patch
new file mode 100644
index 0000000..af73378
--- /dev/null
+++ b/epiphany-extensions-2.30.2-deprecated_GtkNotebookPage.patch
@@ -0,0 +1,60 @@
+diff -up epiphany-extensions-2.30.2/extensions/adblock/adblock-ui.c.orig epiphany-extensions-2.30.2/extensions/adblock/adblock-ui.c
+--- epiphany-extensions-2.30.2/extensions/adblock/adblock-ui.c.orig	2010-08-19 06:12:06.000000000 +0200
++++ epiphany-extensions-2.30.2/extensions/adblock/adblock-ui.c	2010-12-22 06:09:01.917985080 +0100
+@@ -348,7 +348,7 @@ adblock_ui_populate_store (InfoPage *pag
+ 
+ static void
+ adblock_ui_switch_page (GtkNotebook *notebook,
+-			GtkNotebookPage *page,
++			GtkWidget *page,
+ 			guint page_num,
+ 			AdblockUI *dialog)
+ {
+diff -up epiphany-extensions-2.30.2/extensions/adblock/ephy-adblock-extension.c.orig epiphany-extensions-2.30.2/extensions/adblock/ephy-adblock-extension.c
+--- epiphany-extensions-2.30.2/extensions/adblock/ephy-adblock-extension.c.orig	2010-08-19 06:12:06.000000000 +0200
++++ epiphany-extensions-2.30.2/extensions/adblock/ephy-adblock-extension.c	2010-12-22 06:09:01.931984833 +0100
+@@ -386,7 +386,7 @@ ephy_adblock_extension_edit_cb (GtkActio
+ 
+ static void
+ switch_page_cb (GtkNotebook *notebook,
+-		GtkNotebookPage *page,
++		GtkWidget *page,
+ 		guint page_num,
+ 		EphyWindow *window)
+ {
+diff -up epiphany-extensions-2.30.2/extensions/error-viewer/ephy-error-viewer-extension.c.orig epiphany-extensions-2.30.2/extensions/error-viewer/ephy-error-viewer-extension.c
+--- epiphany-extensions-2.30.2/extensions/error-viewer/ephy-error-viewer-extension.c.orig	2010-08-19 06:12:06.000000000 +0200
++++ epiphany-extensions-2.30.2/extensions/error-viewer/ephy-error-viewer-extension.c	2010-12-22 06:09:01.989983809 +0100
+@@ -315,7 +315,7 @@ load_status_cb (EphyEmbed *embed,
+ 
+ static void
+ switch_page_cb (GtkNotebook *notebook,
+-		GtkNotebookPage *page,
++		GtkWidget *page,
+ 		guint page_num,
+ 		EphyWindow *window)
+ {
+diff -up epiphany-extensions-2.30.2/extensions/page-info/ephy-page-info-extension.c.orig epiphany-extensions-2.30.2/extensions/page-info/ephy-page-info-extension.c
+--- epiphany-extensions-2.30.2/extensions/page-info/ephy-page-info-extension.c.orig	2010-08-19 06:12:06.000000000 +0200
++++ epiphany-extensions-2.30.2/extensions/page-info/ephy-page-info-extension.c	2010-12-22 06:09:01.969984162 +0100
+@@ -217,7 +217,7 @@ load_status_cb (EphyEmbed *embed,
+ 
+ static void
+ switch_page_cb (GtkNotebook *notebook,
+-		GtkNotebookPage *page,
++		GtkWidget *page,
+ 		guint page_num,
+ 		EphyWindow *window)
+ {
+diff -up epiphany-extensions-2.30.2/extensions/permissions/ephy-permissions-dialog.c.orig epiphany-extensions-2.30.2/extensions/permissions/ephy-permissions-dialog.c
+--- epiphany-extensions-2.30.2/extensions/permissions/ephy-permissions-dialog.c.orig	2010-08-19 06:12:06.000000000 +0200
++++ epiphany-extensions-2.30.2/extensions/permissions/ephy-permissions-dialog.c	2010-12-22 06:09:01.949984517 +0100
+@@ -220,7 +220,7 @@ fill_tab (DialogTab *tab)
+ 
+ static void
+ sync_notebook_tab (GtkNotebook *notebook,
+-		   GtkNotebookPage *page,
++		   GtkWidget *page,
+ 		   int page_num,
+ 		   EphyPermissionsDialog *dialog)
+ {
diff --git a/epiphany-extensions.spec b/epiphany-extensions.spec
index b08eede..f6b22dd 100644
--- a/epiphany-extensions.spec
+++ b/epiphany-extensions.spec
@@ -1,36 +1,27 @@
 %global ephy_major          2.30
 %global ephy_api_version    2.29
-%global ephy_min_version    %{ephy_major}.2
 
 Name:           epiphany-extensions
-Version:        2.32.0
+Version:        %{ephy_major}.2
 Release:        1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
+Group:          Applications/Internet
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
 ## GPLv2 (only); and all other extensions are GPLv2+.
 License:        LGPLv2+ and GPLv2 and GPLv2+ and GFDL
-Group:          Applications/Internet
 URL:            http://www.gnome.org/projects/epiphany/extensions
-
-#VCS: git:git://git.gnome.org/epiphany-extensions
-
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2
+# Remove deprecated GtkNotebookPage symbols (see https://bugzilla.gnome.org/show_bug.cgi?id=624879)
+Patch0:         epiphany-extensions-2.30.2-deprecated_GtkNotebookPage.patch
 
-
-BuildRequires:	epiphany-devel >= %{ephy_min_version}
-BuildRequires:	gettext
-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
+BuildRequires:  epiphany-devel
+BuildRequires:  gettext
+BuildRequires:  intltool
+BuildRequires:  libtool
+BuildRequires:  opensp-devel
+BuildRequires:  pcre-devel
+Requires:       epiphany
 
 %description
 Epiphany Extensions is a collection of extensions for Epiphany, the
@@ -39,20 +30,22 @@ GNOME web browser.
 
 %prep
 %setup -q
+%patch0 -p1 -b .deprecated_GtkNotebookPage
 
 
 %build
-%configure --disable-scrollkeeper
-%{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
+%configure \
+  --disable-static \
+  --with-extensions=really-all
+make %{?_smp_mflags}
 
 
 %install
 make DESTDIR=%{buildroot} install
-%{find_lang} "%{name}-%{ephy_api_version}"
+find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
+%{find_lang} %{name}-%{ephy_api_version}
 
-%pre
-%gconf_schema_obsolete smart-bookmarks epilicious
 
 %files -f %{name}-%{ephy_api_version}.lang
 %defattr(-,root,root,-)
@@ -60,19 +53,16 @@ make DESTDIR=%{buildroot} install
 %{_datadir}/epiphany/icons/hicolor/*/status/feed-presence.*
 %{_datadir}/epiphany/icons/hicolor/*/status/ad-blocked.*
 %{_datadir}/%{name}/
-%{_datadir}/gnome/help/%{name}
-%{_datadir}/omf/%{name}
-%exclude %{_libdir}/epiphany/%{ephy_api_version}/extensions/*.a
-%exclude %{_libdir}/epiphany/%{ephy_api_version}/extensions/*.la
+%{_datadir}/gnome/help/%{name}/
+%{_datadir}/omf/%{name}/
 %{_libdir}/epiphany/%{ephy_api_version}/extensions/
 
 
 %changelog
-* Fri Aug 20 2010 Matthias Clasen <mclasen at redhat.com> 2.32.0-1
-- Update to 2.32.0
-
-* Thu May 27 2010 Bastien Nocera <bnocera at redhat.com> 2.30.1-3
-- Build the extensions set as default by the developers
+* Mon Mar 28 2011 Mohamed El Morabity <melmorabity at fedoraproject.org> - 2.30.2-1
+- Update to 2.30.2
+- Enable all extensions
+- Spec cleanup
 
 * Sat May 15 2010 Matthias Clasen <mclasen at redhat.com> 2.30.1-2
 - Use GConf macros in %%pre
diff --git a/sources b/sources
index 88a4ed6..1143dc0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f447b9fb215e023845ebb2f62f973658  epiphany-extensions-2.32.0.tar.bz2
+4ee9beee4bfd8a588a6821e164c48b3d  epiphany-extensions-2.30.2.tar.bz2
