From 89528820862eaa26b5a54653f2fa5631c7652a31ece72faa2c76ac93c56607a8 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 3 Jun 2010 17:16:23 +0000
Subject: [PATCH] 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