From 89528820862eaa26b5a54653f2fa5631c7652a31ece72faa2c76ac93c56607a8 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Thu, 3 Jun 2010 17:16:23 +0000 Subject: [PATCH 1/3] Accepting request 41055 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/epiphany via accept of submit request 41055 revision 2. Request was accepted with message: Forwarding to openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/41055 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=69 --- epiphany.changes | 7 +++++++ epiphany.spec | 13 +++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index 5fb98a1..036d747 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org + +- Add ca-certificates BuildRequires and use --with-ca-file for + configure on 11.3 and later, now that we have a bundle for all + certificates. + ------------------------------------------------------------------- Fri Apr 9 16:58:15 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 328d77f..25a399a 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -20,7 +20,6 @@ Name: epiphany Version: 2.30.2 Release: 1 -# FIXME: once ca-certificates will create the bundle file, uncomment the --with-ca-file configure option License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -29,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click Patch6: epiphany-safe-one-click-install.patch BuildRequires: NetworkManager-devel +BuildRequires: ca-certificates BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gconf2-devel @@ -117,18 +117,15 @@ translation-update-upstream ACLOCAL="aclocal -I m4" autoreconf -f -i %configure \ --disable-scrollkeeper \ - --enable-dbus \ --enable-zeroconf \ --enable-network-manager \ --enable-introspection \ --enable-seed \ +%if 0%{?suse_version} > 1120 + --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem +%else --without-ca-file -# FIXME: when ca-certificates will be recent-enough: -#%if 0%{?suse_version} > 1120 -# --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem -#%else -# --without-ca-file -#%endif +%endif %__make %{?jobs:-j%jobs} %install From cd786e88e27905bd86512834454e148526d76e16bf9cfbf3febea5020746a48e Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Jun 2010 13:04:12 +0000 Subject: [PATCH 2/3] Accepting request 41057 from GNOME:Factory checked in (request 41057) OBS-URL: https://build.opensuse.org/request/show/41057 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=70 --- epiphany.changes | 7 ------- epiphany.spec | 13 ++++++++----- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index 036d747..5fb98a1 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org - -- Add ca-certificates BuildRequires and use --with-ca-file for - configure on 11.3 and later, now that we have a bundle for all - certificates. - ------------------------------------------------------------------- Fri Apr 9 16:58:15 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 25a399a..328d77f 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -20,6 +20,7 @@ Name: epiphany Version: 2.30.2 Release: 1 +# FIXME: once ca-certificates will create the bundle file, uncomment the --with-ca-file configure option License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -28,7 +29,6 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click Patch6: epiphany-safe-one-click-install.patch BuildRequires: NetworkManager-devel -BuildRequires: ca-certificates BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gconf2-devel @@ -117,15 +117,18 @@ translation-update-upstream ACLOCAL="aclocal -I m4" autoreconf -f -i %configure \ --disable-scrollkeeper \ + --enable-dbus \ --enable-zeroconf \ --enable-network-manager \ --enable-introspection \ --enable-seed \ -%if 0%{?suse_version} > 1120 - --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem -%else --without-ca-file -%endif +# FIXME: when ca-certificates will be recent-enough: +#%if 0%{?suse_version} > 1120 +# --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem +#%else +# --without-ca-file +#%endif %__make %{?jobs:-j%jobs} %install From c68fc0e16f78f4640df5bff3edd1b397e6d8904551d8f06b0458ff43a2db07b8 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 4 Jun 2010 13:04:13 +0000 Subject: [PATCH 3/3] Updating link to change in openSUSE:Factory/epiphany revision 59.0 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=26f18492aba06f23460697d854192002 --- epiphany.changes | 7 +++++++ epiphany.spec | 15 ++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/epiphany.changes b/epiphany.changes index 5fb98a1..036d747 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Jun 3 19:00:25 CEST 2010 - vuntz@opensuse.org + +- Add ca-certificates BuildRequires and use --with-ca-file for + configure on 11.3 and later, now that we have a bundle for all + certificates. + ------------------------------------------------------------------- Fri Apr 9 16:58:15 CEST 2010 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 328d77f..56563c8 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -19,8 +19,7 @@ Name: epiphany Version: 2.30.2 -Release: 1 -# FIXME: once ca-certificates will create the bundle file, uncomment the --with-ca-file configure option +Release: 2 License: GPLv2+ Summary: GNOME Web Browser Based on the WebKit Rendering Engine Url: http://www.gnome.org/projects/epiphany/ @@ -29,6 +28,7 @@ Source: %{name}-%{version}.tar.bz2 # PATCH-FEATURE-OPENSUSE epiphany-safe-one-click-install.patch bnc330070 vuntz@novell.com -- Make one-click install work with one-click Patch6: epiphany-safe-one-click-install.patch BuildRequires: NetworkManager-devel +BuildRequires: ca-certificates BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gconf2-devel @@ -117,18 +117,15 @@ translation-update-upstream ACLOCAL="aclocal -I m4" autoreconf -f -i %configure \ --disable-scrollkeeper \ - --enable-dbus \ --enable-zeroconf \ --enable-network-manager \ --enable-introspection \ --enable-seed \ +%if 0%{?suse_version} > 1120 + --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem +%else --without-ca-file -# FIXME: when ca-certificates will be recent-enough: -#%if 0%{?suse_version} > 1120 -# --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem -#%else -# --without-ca-file -#%endif +%endif %__make %{?jobs:-j%jobs} %install