Accepting request 37579 from home:vuntz:branches:GNOME:Factory

Copy from home:vuntz:branches:GNOME:Factory/epiphany via accept of submit request 37579 revision 3.
Request was accepted with message:
ok

OBS-URL: https://build.opensuse.org/request/show/37579
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=67
This commit is contained in:
Vincent Untz 2010-04-09 15:29:35 +00:00 committed by Git OBS Bridge
parent 6f0778bd3d
commit 74be935626
2 changed files with 26 additions and 6 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
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

View File

@ -20,9 +20,9 @@
Name: epiphany
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
if ! test -d %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions; then
install -d -m 0755 %{buildroot}%{_libdir}/epiphany/%{major_version}/extensions
# 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}
fi
%suse_update_desktop_file -N "Epiphany" %name
%suse_update_desktop_file bme System