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