From dcc20f4410bb00226abda6dc03d43faefaa1efb2ab6473e28b610aa2a72f5eb1 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 28 Mar 2012 06:24:58 +0000 Subject: [PATCH] Accepting request 111489 from home:vuntz:branches:GNOME:Factory Update to 3.4.0, improved as suggested OBS-URL: https://build.opensuse.org/request/show/111489 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=137 --- epiphany-3.3.92.tar.xz | 3 --- epiphany-3.4.0.tar.xz | 3 +++ epiphany-fix-header.patch | 21 +++++++++++++++++++++ epiphany.changes | 10 ++++++++++ epiphany.spec | 9 ++++++--- 5 files changed, 40 insertions(+), 6 deletions(-) delete mode 100644 epiphany-3.3.92.tar.xz create mode 100644 epiphany-3.4.0.tar.xz create mode 100644 epiphany-fix-header.patch diff --git a/epiphany-3.3.92.tar.xz b/epiphany-3.3.92.tar.xz deleted file mode 100644 index cae9baf..0000000 --- a/epiphany-3.3.92.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2f557fafdd40e28e4ceb1b05b7d3117f5c9b9b362983ec435b8b49429141d144 -size 5116752 diff --git a/epiphany-3.4.0.tar.xz b/epiphany-3.4.0.tar.xz new file mode 100644 index 0000000..62eec84 --- /dev/null +++ b/epiphany-3.4.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8a9379448d26aae63f098618729502d9f208be27470b5b96b4135b86e31a84e6 +size 5114664 diff --git a/epiphany-fix-header.patch b/epiphany-fix-header.patch new file mode 100644 index 0000000..8385c8a --- /dev/null +++ b/epiphany-fix-header.patch @@ -0,0 +1,21 @@ +From 635ff532ed98c3e64a9e6b590a330df485ed27fe Mon Sep 17 00:00:00 2001 +From: Diego Escalante Urrelo +Date: Mon, 26 Mar 2012 19:56:39 +0000 +Subject: epiphany.h.in: remove ephy-history mention + +It breaks ephy-extensions build. +--- +diff --git a/src/epiphany.h.in b/src/epiphany.h.in +index 9c70093..2f05648 100644 +--- a/src/epiphany.h.in ++++ b/src/epiphany.h.in +@@ -49,7 +49,6 @@ + #include + #include + #include +-#include + #include + #include + #include +-- +cgit v0.9.0.2 diff --git a/epiphany.changes b/epiphany.changes index 2824c79..d8e7b04 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Mar 26 23:24:46 UTC 2012 - vuntz@opensuse.org + +- Update to version 3.4.0: + + Avoid infinite loops in the profile migrator for existing but + empty history files (bgo#672547) + + Updated translations. +- Add epiphany-fix-header.patch: fix epiphany.h to be usable, taken + from git. + ------------------------------------------------------------------- Wed Mar 21 10:08:23 UTC 2012 - vuntz@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index 4c43263..6dca6fb 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,13 +17,15 @@ Name: epiphany -Version: 3.3.92 +Version: 3.4.0 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 +Source: http://download.gnome.org/sources/epiphany/3.4/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM epiphany-fix-header.patch vuntz@opensuse.org -- Remove non-existing include from epiphany.h; taken from git +Patch0: epiphany-fix-header.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 @@ -104,6 +106,7 @@ string. %prep %setup -q translation-update-upstream +%patch0 -p1 %patch6 -p1 %build @@ -169,7 +172,7 @@ done %{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml %{_datadir}/icons/hicolor/*/apps/*.png %{_libdir}/epiphany -%{_libdir}/girepository-1.0/Epiphany-3.3.typelib +%{_libdir}/girepository-1.0/Epiphany-3.4.typelib %doc %{_mandir}/man1/epiphany.1.gz %files lang -f %{name}.lang