From 5663041f36f5f7bee40cb0adc2fb52a595ea3c4ae1a91025ab0b8f25df94bf17 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 3 Sep 2009 13:32:33 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=42 --- epiphany-2.27.90.tar.bz2 | 3 +++ epiphany-2.27.91.tar.bz2 | 3 --- epiphany.changes | 15 -------------- epiphany.spec | 44 ++++++++++++++++++++-------------------- 4 files changed, 25 insertions(+), 40 deletions(-) create mode 100644 epiphany-2.27.90.tar.bz2 delete mode 100644 epiphany-2.27.91.tar.bz2 diff --git a/epiphany-2.27.90.tar.bz2 b/epiphany-2.27.90.tar.bz2 new file mode 100644 index 0000000..6aa19ad --- /dev/null +++ b/epiphany-2.27.90.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2fc93193606330ad1a80e0877859d9ea6fcaa0b18f06a03323a0df1e4a26394e +size 5696273 diff --git a/epiphany-2.27.91.tar.bz2 b/epiphany-2.27.91.tar.bz2 deleted file mode 100644 index 3dfd56a..0000000 --- a/epiphany-2.27.91.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:037f1f5df3a203e39dd2f8184b8bf99434782f63ae0b0c722f0d58bb86457e22 -size 5683771 diff --git a/epiphany.changes b/epiphany.changes index dc9a53a..94b4810 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,18 +1,3 @@ -------------------------------------------------------------------- -Tue Aug 25 17:21:11 CEST 2009 - vuntz@novell.com - -- Update to version 2.27.91: - + Use new keyring support in libsoup instead of the old webkit - session feature. - + Performance and functionality improvements for the find - toolbar. - + Always show images in the bookmarks menu items. Makes them - re-appear after recent changes that set icons off by default in - menus for 2.28 (bgo#588563) - + Update URL in entry when clicking on #anchors (bgo#584506) - + Re-implement about:recover lookalike (bgo#583953) -- Use spec-cleaner to reorder lines in preamble. - ------------------------------------------------------------------- Mon Aug 10 21:32:57 CEST 2009 - vuntz@novell.com diff --git a/epiphany.spec b/epiphany.spec index 09034e4..39ce76c 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -1,5 +1,5 @@ # -# spec file for package epiphany (Version 2.27.91) +# spec file for package epiphany (Version 2.27.90) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -15,21 +15,10 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +# norootforbuild Name: epiphany -Version: 2.27.91 -Release: 1 -%define major_version 2.27 -License: GPL v2 or later -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 -# PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key -Patch0: epiphany-user-agent.patch -# 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: fdupes BuildRequires: gcc-c++ @@ -54,11 +43,22 @@ BuildRequires: lsb-release BuildRequires: startup-notification-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -Requires: %{name}-branding -Requires: %{name}-lang = %{version} -Requires: gnome-icon-theme -Requires: iso-codes +Version: 2.27.90 +Release: 1 +%define major_version 2.27 +License: GPL v2 or later +Group: Productivity/Networking/Web/Browsers +Summary: GNOME Web Browser Based on the Mozilla Rendering Engine +Source: %{name}-%{version}.tar.bz2 +# PATCH-FEATURE-UPSTREAM epiphany-user-agent.patch bgo580903 vuntz@novell.com -- Set user agent with a vendor part, via a gconf key +Patch0: epiphany-user-agent.patch +# 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 +Url: http://www.gnome.org/projects/epiphany/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: iso-codes gnome-icon-theme +Requires: %{name}-lang = %{version} +Requires: %{name}-branding %gconf_schemas_prereq %description @@ -94,9 +94,9 @@ This package contains developer documentation for epiphany. License: GPL v2 or later Summary: Upstream branding of Epiphany Group: Productivity/Networking/Web/Browsers -Supplements: packageand(%{name}:branding-upstream) Provides: %{name}-branding = %{version} Conflicts: otherproviders(%{name}-branding) +Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide a few files - #BRAND: /usr/share/epiphany/default-bookmarks.rdf #BRAND: the default bookmarks @@ -124,8 +124,8 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i %install %makeinstall -mkdir %{buildroot}%{_datadir}/pixmaps -ln -s ../icons/gnome/scalable/apps/web-browser.svg %{buildroot}%{_datadir}/pixmaps/ +mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps +ln -s ../icons/gnome/scalable/apps/web-browser.svg $RPM_BUILD_ROOT%{_datadir}/pixmaps/ # 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 @@ -137,10 +137,10 @@ mv %{buildroot}%{_datadir}/locale/sr@Latn %{buildroot}%{_datadir}/locale/sr@lati %find_lang %{name} %find_gconf_schemas cat %{name}.schemas_list >%{name}.lst -%fdupes %{buildroot} +%fdupes $RPM_BUILD_ROOT %clean -rm -rf %{buildroot} +rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre