From a84f2fc3be132a5ef8ee030d26c4f73baf875227a5f93e5df28d756744fac947 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 5 Mar 2008 23:51:11 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=19 --- epiphany-2.21.90.tar.bz2 | 3 --- epiphany-2.21.92.tar.bz2 | 3 +++ epiphany-gcc4.3-fixes.patch | 26 +++++++------------------- epiphany.changes | 8 ++++++++ epiphany.spec | 16 ++++++++++------ 5 files changed, 28 insertions(+), 28 deletions(-) delete mode 100644 epiphany-2.21.90.tar.bz2 create mode 100644 epiphany-2.21.92.tar.bz2 diff --git a/epiphany-2.21.90.tar.bz2 b/epiphany-2.21.90.tar.bz2 deleted file mode 100644 index 19c134f..0000000 --- a/epiphany-2.21.90.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ff444a92c413349f350ec56efa812ebff7aa69f68a1f424d9f2c2b9e0078ece -size 5168624 diff --git a/epiphany-2.21.92.tar.bz2 b/epiphany-2.21.92.tar.bz2 new file mode 100644 index 0000000..b14596a --- /dev/null +++ b/epiphany-2.21.92.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:904275567e54f5fcdb068d544b42da34c0361d3b8d143dfecd878950850a54c9 +size 5203276 diff --git a/epiphany-gcc4.3-fixes.patch b/epiphany-gcc4.3-fixes.patch index d1db86a..81d9b68 100644 --- a/epiphany-gcc4.3-fixes.patch +++ b/epiphany-gcc4.3-fixes.patch @@ -1,27 +1,15 @@ -Index: epiphany-2.20.1/embed/mozilla/EphyBrowser.h +Index: epiphany-2.21.92/embed/mozilla/mozilla-x509-cert.h =================================================================== ---- epiphany-2.20.1.orig/embed/mozilla/EphyBrowser.h -+++ epiphany-2.20.1/embed/mozilla/EphyBrowser.h -@@ -187,7 +187,7 @@ public: - - nsresult LoadURI(const char *aURI, - PRUint32 aLoadFlags = nsIWebNavigation::LOAD_FLAGS_NONE, -- nsIURI *aURI = nsnull); -+ nsIURI *aReferrer = nsnull); - - EphyEmbedDocumentType GetDocumentType (); - -Index: epiphany-2.20.1/embed/mozilla/mozilla-x509-cert.h -=================================================================== ---- epiphany-2.20.1.orig/embed/mozilla/mozilla-x509-cert.h -+++ epiphany-2.20.1/embed/mozilla/mozilla-x509-cert.h -@@ -56,7 +56,8 @@ GType mozilla_x509_ce +--- epiphany-2.21.92.orig/embed/mozilla/mozilla-x509-cert.h ++++ epiphany-2.21.92/embed/mozilla/mozilla-x509-cert.h +@@ -56,7 +56,9 @@ GType mozilla_x509_ce MozillaX509Cert *mozilla_x509_cert_new (nsIX509Cert *aMozCert); --nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **cert); +-nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, nsIX509Cert **aCert); +nsresult mozilla_x509_cert_get_mozilla_cert (MozillaX509Cert *cert, -+ nsIX509Cert **aCert); ++ nsIX509Cert **aCert); ++ G_END_DECLS diff --git a/epiphany.changes b/epiphany.changes index f2cf580..32cfc24 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Mar 4 20:32:17 CET 2008 - maw@suse.de + +- Update to version 2.21.92: + + Bug fixes +- No longer build with the cert manager +- Remove epiphany-gcc4.3-fixes.patch. + ------------------------------------------------------------------- Tue Feb 12 15:26:43 CET 2008 - jpr@suse.de diff --git a/epiphany.spec b/epiphany.spec index 85e9fe1..5826a78 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.21.90) +# spec file for package epiphany (Version 2.21.92) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -29,8 +29,8 @@ BuildRequires: mozilla-devel Requires: mozilla = %{mozilla_ver} %endif %endif -Version: 2.21.90 -Release: 2 +Version: 2.21.92 +Release: 1 Requires: %{name}-lang = %{version} License: GPL v2 or later Group: Productivity/Networking/Web/Browsers @@ -119,7 +119,7 @@ Authors: %patch11 %patch13 %patch14 -p1 -%patch15 -p1 +###%patch15 -p1 %build #cp -i data/default-prefs-gecko-1-8.js data/default-prefs-xulrunner.js @@ -135,9 +135,8 @@ export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %endif --enable-dbus\ --enable-zeroconf\ - --enable-certificate-manager\ --enable-network-manager -# FIXME: Compile xulrunner with spellchecker extension. +# FIXME: Compile xulrunner with spellchecker extension. # --enable-spell-checker %__make %{?jobs:-j%jobs} @@ -197,6 +196,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/epiphany %changelog +* Tue Mar 04 2008 maw@suse.de +- Update to version 2.21.92: + + Bug fixes +- No longer build with the cert manager +- Remove epiphany-gcc4.3-fixes.patch. * Tue Feb 12 2008 jpr@suse.de - Fix missing directory ownership - Update to use -p /sbin/ldconfig