From 22efb76387458b4b779cbd9eeed0b6f2abef73a0e8cffb8719c0d218eb6eff9f Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 8 Feb 2012 19:49:19 +0000 Subject: [PATCH] Accepting request 103158 from home:vuntz:branches:GNOME:Factory Update to 3.3.5 OBS-URL: https://build.opensuse.org/request/show/103158 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=127 --- epiphany-3.3.4.1.tar.xz | 3 --- epiphany-3.3.5.tar.xz | 3 +++ epiphany-hide-bookmark-editor.patch | 9 --------- epiphany.changes | 20 ++++++++++++++++++++ epiphany.spec | 15 +++++---------- 5 files changed, 28 insertions(+), 22 deletions(-) delete mode 100644 epiphany-3.3.4.1.tar.xz create mode 100644 epiphany-3.3.5.tar.xz delete mode 100644 epiphany-hide-bookmark-editor.patch diff --git a/epiphany-3.3.4.1.tar.xz b/epiphany-3.3.4.1.tar.xz deleted file mode 100644 index 1dc3606..0000000 --- a/epiphany-3.3.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e107af79ce5591bb00d6f76d9d5645f3fa9898e32122c41bf9474a2de44f8305 -size 5150356 diff --git a/epiphany-3.3.5.tar.xz b/epiphany-3.3.5.tar.xz new file mode 100644 index 0000000..ee5f0ad --- /dev/null +++ b/epiphany-3.3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:961cd2f326cca92723720e89c0ba2917f71319e17a984d32a29dc55c20eb9579 +size 5087876 diff --git a/epiphany-hide-bookmark-editor.patch b/epiphany-hide-bookmark-editor.patch deleted file mode 100644 index 7c003e5..0000000 --- a/epiphany-hide-bookmark-editor.patch +++ /dev/null @@ -1,9 +0,0 @@ -Index: epiphany-2.30.2/data/bme.desktop.in.in -=================================================================== ---- epiphany-2.30.2.orig/data/bme.desktop.in.in -+++ epiphany-2.30.2/data/bme.desktop.in.in -@@ -12,3 +12,4 @@ X-GNOME-Bugzilla-Product=epiphany - X-GNOME-Bugzilla-Component=BugBuddyBugs - X-GNOME-Bugzilla-Version=@VERSION@ - Categories=Network;GNOME;GTK; -+NoDisplay=true diff --git a/epiphany.changes b/epiphany.changes index eff8585..124d794 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Feb 7 13:42:05 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.3.5: + + Make about window modal again (bgo#668113) + + Remove statusbar hits for menu actions (bgo#668191) + + Support external protocols (apt://, magnet://, etc) properly + (bgo#551857) + + Disable most menu actions in about:blank (bgo#668105) + + Make the name 'Web' visible in more places (bgo#666587) + + Stop shipping the bookmarks editor .desktop file + + Run all unit tests on 'make check' + + Restore + accels for tabs (bgo#668702) + + Add toggle to enable WebGL support, off by default + + *Lots* of cleanups and refactorings. +- Remove xz BuildRequires now that it comes for free in the build + system. +- Drop epiphany-hide-bookmark-editor.patch: not needed since + bme.desktop doesn't exist anymore. + ------------------------------------------------------------------- Wed Jan 18 22:43:54 UTC 2012 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 78aa2f9..efc292a 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,15 +17,13 @@ Name: epiphany -Version: 3.3.4.1 +Version: 3.3.5 Release: 0 Summary: GNOME Web Browser License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ Source: http://download.gnome.org/sources/epiphany/3.3/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE epiphany-hide-bookmark-editor.patch vuntz@opensuse.org -- Hide bookmark editors in menu -Patch0: epiphany-hide-bookmark-editor.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: ca-certificates @@ -46,10 +44,8 @@ BuildRequires: libxslt-devel BuildRequires: mozilla-nss-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files -# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 -BuildRequires: xz BuildRequires: pkgconfig(gsettings-desktop-schemas) -BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.8 +BuildRequires: pkgconfig(gtk+-3.0) >= 3.3.14 Requires: %{name}-branding = %{version} Requires: NetworkManager Requires: gnome-icon-theme @@ -103,7 +99,6 @@ string. %prep %setup -q translation-update-upstream -%patch0 -p1 %patch6 -p1 %build @@ -133,7 +128,6 @@ for size in 8x8 16x16 22x22 24x24 32x32 48x48 256x256; do cp -a %{_datadir}/icons/gnome/$size/apps/web-browser.png %{buildroot}%{_datadir}/icons/hicolor/$size/apps/web-browser.png fi done -%suse_update_desktop_file bme %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} @@ -159,8 +153,9 @@ done %dir %{_datadir}/omf/ %dir %{_datadir}/omf/%{name}/ %doc %{_datadir}/omf/%{name}/%{name}-C.omf -%{_bindir}/* -%{_datadir}/applications/*.desktop +%{_bindir}/ephy-profile-migrator +%{_bindir}/epiphany +%{_datadir}/applications/epiphany.desktop %{_datadir}/dbus-1/services/org.gnome.Epiphany.service %exclude %{_datadir}/epiphany/default-bookmarks.rdf %{_datadir}/epiphany/