From ee15f30bc6816f4172fc557c03e241b5ab3d45e6e92a8ba514185d8711df79f7 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 15 Apr 2010 22:11:02 +0000 Subject: [PATCH] Accepting request 37580 from GNOME:Factory checked in (request 37580) OBS-URL: https://build.opensuse.org/request/show/37580 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=68 --- epiphany-2.30.0.tar.bz2 | 3 +++ epiphany-2.30.2.tar.bz2 | 3 --- epiphany.changes | 26 -------------------------- epiphany.spec | 24 ++++++++---------------- 4 files changed, 11 insertions(+), 45 deletions(-) create mode 100644 epiphany-2.30.0.tar.bz2 delete mode 100644 epiphany-2.30.2.tar.bz2 diff --git a/epiphany-2.30.0.tar.bz2 b/epiphany-2.30.0.tar.bz2 new file mode 100644 index 0000000..eb8c24b --- /dev/null +++ b/epiphany-2.30.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2e403ab0fe04575575fa99cdb6b3007007fa8e961e2c2fd4308b13e27bbf58d4 +size 5879580 diff --git a/epiphany-2.30.2.tar.bz2 b/epiphany-2.30.2.tar.bz2 deleted file mode 100644 index 6e48de6..0000000 --- a/epiphany-2.30.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd0124e71e72142593cfeb442d58d97e99ba94ace6e31d94717fe977c0bfb98a -size 5881032 diff --git a/epiphany.changes b/epiphany.changes index 5fb98a1..ad4f734 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,29 +1,3 @@ -------------------------------------------------------------------- -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 diff --git a/epiphany.spec b/epiphany.spec index 328d77f..697cb7b 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.30.2) +# spec file for package epiphany (Version 2.30.0) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,11 +18,11 @@ Name: epiphany -Version: 2.30.2 +Version: 2.30.0 Release: 1 -# FIXME: once ca-certificates will create the bundle file, uncomment the --with-ca-file configure option +%define major_version 2.30 License: GPLv2+ -Summary: GNOME Web Browser Based on the WebKit Rendering Engine +Summary: GNOME Web Browser Based on the Mozilla 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 WebKit Rendering Engine +Summary: GNOME Web Browser based on the Mozilla Rendering Engine Group: Development/Libraries/GNOME Requires: %{name} = %{version} Requires: gtk2-devel @@ -123,12 +123,6 @@ 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 @@ -139,11 +133,9 @@ 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 directory; note that we -# determine this directory with the pkg-config file that got installed. -extensionsdir=`pkg-config --variable extensionsdir %{buildroot}%{_libdir}/pkgconfig/epiphany-*.pc` -if ! test -d %{buildroot}${extensionsdir}; then - install -d -m 0755 %{buildroot}${extensionsdir} +# In case make install did not create the extensions folder +if ! test -d %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions; then + install -d -m 0755 %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions fi %suse_update_desktop_file -N "Epiphany" %name %suse_update_desktop_file bme System