rpms/epiphany-extensions/devel epiphany-extensions-2.22_23-api.diff, NONE, 1.1 epiphany-extensions.spec, 1.46, 1.47

[Peter Gordon (pgordon)]

Author: pgordon

Update of /cvs/pkgs/rpms/epiphany-extensions/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31221

Modified Files:
	epiphany-extensions.spec 
Added Files:
	epiphany-extensions-2.22_23-api.diff 
Log Message:
Update for Ephy 2.23, and rebuild for XULrunner 1.9.0.1

epiphany-extensions-2.22_23-api.diff:

--- NEW FILE epiphany-extensions-2.22_23-api.diff ---
diff -up ./configure.ac.old ./configure.ac
--- ./configure.ac.old	2008-07-26 20:23:21.000000000 -0700
+++ ./configure.ac	2008-07-26 20:24:42.000000000 -0700
@@ -24,7 +24,7 @@ m4_define([e_e_branch],["branches/gnome-
 
 AC_INIT([GNOME Web Browser Extensions],[e_e_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=epiphany-extensions],[epiphany-extensions])
 
-EPIPHANY_API_VERSION=e_e_version_major.e_e_version_minor
+EPIPHANY_API_VERSION=e_e_version_major.23
 
 EPIPHANY_EXTENSIONS_MAJOR=e_e_version_major.e_e_version_minor
 AC_SUBST(EPIPHANY_EXTENSIONS_MAJOR)
@@ -99,7 +99,7 @@ GNOME_DOC_INIT
 # pkg config checks
 # ********************************
 
-EPIPHANY_REQUIRED=2.22.0
+EPIPHANY_REQUIRED=2.23.0
 LIBXML_REQUIRED=2.6.0
 LIBGLIB_REQUIRED=2.15.5
 LIBGTK_REQUIRED=2.11.6


Index: epiphany-extensions.spec
===================================================================
RCS file: /cvs/pkgs/rpms/epiphany-extensions/devel/epiphany-extensions.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- epiphany-extensions.spec	7 Apr 2008 20:10:55 -0000	1.46
+++ epiphany-extensions.spec	27 Jul 2008 04:17:14 -0000	1.47
@@ -1,10 +1,10 @@
-%global ephy_major          2.22
+%global ephy_major          2.23
 %global ephy_min_version    %{ephy_major}.0
-%global gecko_version       1.9
+%global gecko_version       1.9.0.1
 
 Name:           epiphany-extensions
-Version:        %{ephy_major}.1
-Release:        1%{?dist}
+Version:        %{ephy_major}.0
+Release:        0.1%{?dist}
 Summary:        Extensions for Epiphany, the GNOME web browser
 
 ## The Live HTTP Headers extension is LGPLv2.1+; the Gestures extension is
@@ -13,7 +13,10 @@
 Group:          Applications/Internet
 URL:            http://www.gnome.org/projects/epiphany/extensions
 
-Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/%{ephy_major}/%{name}-%{version}.tar.bz2
+Source0:        http://ftp.gnome.org/pub/GNOME/sources/epiphany-extensions/2.22/%{name}-2.22.1.tar.bz2
+
+## Upstream bug report: http://bugzilla.gnome.org/show_bug.cgi?id=544928
+Patch0: 	%{name}-2.22_23-api.diff
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -27,6 +30,9 @@
 ## BuildRequire it anyway so we fail if not building against the version
 ## we are expecting to.
 BuildRequires:  gecko-devel-unstable = %{gecko_version}
+## We need the following for recreating the internal build-system after
+## patching...
+BuildRequires:	gnome-common
 
 Requires:       epiphany >= %{ephy_min_version}
 Requires:       gecko-libs = %{gecko_version}
@@ -47,13 +53,14 @@
 
 
 %prep
-%setup -q
+%setup -qn "%{name}-2.22.1"
+%patch0 -b _2.23-api-build-scripts
+
 
 %build
-## XXX: We're forcibly building against Firefox until the XULrunner
-## obsoletes/upgrade-path issues can be properly fixed. 
-%configure --disable-compiler-warnings --disable-scrollkeeper   \
-           --with-gecko=libxul-embedding                        \
+autoreconf
+%configure --disable-scrollkeeper   		\
+           --with-gecko=libxul-embedding	\
            --with-extensions=really-all
 %{__make} %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool
 
@@ -113,6 +120,12 @@
 
 
 %changelog
+* Sat Jul 26 2008 Peter Gordon <peter at thecodergeek.com> - 2.23.0-0.1
+- Adapt internal build scripts so that the Extensions are built against and
+  run with Ephy 2.23/2.24: 
+  + 2.22_23-api.diff
+- Rebuild for XULrunner 1.9.0.1 while we're at it. :)
+
 * Mon Apr  7 2008 Christopher Aillon <caillon at redhat.com> - 2.22.1-1
 - Update to 2.22.1