Accepting request 37580 from GNOME:Factory

Copy from GNOME:Factory/epiphany based on submit request 37580 from user vuntz

OBS-URL: https://build.opensuse.org/request/show/37580
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany?expand=0&rev=58

epiphany-2.30.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2e403ab0fe04575575fa99cdb6b3007007fa8e961e2c2fd4308b13e27bbf58d4
-size 5879580

epiphany-2.30.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a
+size 5881032

epiphany.changes

@@ -1,3 +1,29 @@
+-------------------------------------------------------------------
+Fri Apr  9 16:58:15 CEST 2010 - vuntz@opensuse.org
+
+- When creating the extensions directory, create it with the value
+  that is in epiphany's pkg-config file. This ensures we'll have
+  the right directory.
+- Get ready to use the certificate bundle file: we will pass
+  --with-ca-file=%{_sysconfdir}/ssl/ca-bundle.pem to configure
+  instead of --without-ca-file on 11.3 and later. This is commented
+  out for now since we need a ca-certificates package that is not
+  in Factory yet.
+
+-------------------------------------------------------------------
+Thu Apr  8 19:45:18 CEST 2010 - vuntz@opensuse.org
+
+- Update to version 2.30.2:
+  + Correct extensions dir definition in lib/ too.
+- Changes from version 2.30.1:
+  + Improve page print implementation (bgo#609756)
+  + Ignore case of URL schemes (bgo#605089)
+  + Check if URL is NULL before setting its history title
+    (bgo#582629)
+  + Fix crasher when pressing Up arrow twice (bgo#599156)
+  + Look for extensions in the correct directory, using our API
+    version as versioning number.
+
 -------------------------------------------------------------------
 Wed Mar 31 01:51:49 CEST 2010 - vuntz@opensuse.org
 

epiphany.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package epiphany (Version 2.30.0)
+# spec file for package epiphany (Version 2.30.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,11 +18,11 @@
 
 
 Name:           epiphany
-Version:        2.30.0
+Version:        2.30.2
 Release:        1
-%define major_version 2.30
+# 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 Mozilla Rendering Engine
+Summary:        GNOME Web Browser Based on the WebKit Rendering Engine
 Url:            http://www.gnome.org/projects/epiphany/
 Group:          Productivity/Networking/Web/Browsers
 Source:         %{name}-%{version}.tar.bz2
@@ -70,7 +70,7 @@ simplicity and standards compliance.
 
 %package devel
 License:        GPLv2+
-Summary:        GNOME Web Browser based on the Mozilla Rendering Engine
+Summary:        GNOME Web Browser based on the WebKit Rendering Engine
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
 Requires:       gtk2-devel
@@ -123,6 +123,12 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
     --enable-introspection \
     --enable-seed \
     --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
 %__make %{?jobs:-j%jobs}
 
 %install
@@ -133,9 +139,11 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i
 %if 0%{?suse_version} <= 1120
 %{__rm} %{buildroot}%{_datadir}/locale/en@shaw/LC_MESSAGES/*
 %endif
-# In case make install did not create the extensions folder
+# In case make install did not create the extensions directory; note that we
-if ! test -d %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions; then
+# determine this directory with the pkg-config file that got installed.
-  install -d -m 0755 %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions
+extensionsdir=`pkg-config --variable extensionsdir %{buildroot}%{_libdir}/pkgconfig/epiphany-*.pc`
+if ! test -d %{buildroot}${extensionsdir}; then
+  install -d -m 0755 %{buildroot}${extensionsdir}
 fi
 %suse_update_desktop_file -N "Epiphany" %name
 %suse_update_desktop_file bme System