From 7bfd27be9ac2e26661b1a1ecf2a8066a104efe6e6766baae409e0c20a60449ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 4 Sep 2017 20:06:31 +0000 Subject: [PATCH] Accepting request 520519 from GNOME:Next 1 OBS-URL: https://build.opensuse.org/request/show/520519 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=259 --- epiphany-3.25.91.tar.xz | 3 --- epiphany-3.25.92.tar.xz | 3 +++ epiphany.changes | 22 ++++++++++++++++++++++ epiphany.spec | 41 +++++++++++++++-------------------------- 4 files changed, 40 insertions(+), 29 deletions(-) delete mode 100644 epiphany-3.25.91.tar.xz create mode 100644 epiphany-3.25.92.tar.xz diff --git a/epiphany-3.25.91.tar.xz b/epiphany-3.25.91.tar.xz deleted file mode 100644 index 4077f6e..0000000 --- a/epiphany-3.25.91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5320dc3ec7f3aa421405f17a456d02f6402983622d36fe79c723ec319dea4746 -size 4082440 diff --git a/epiphany-3.25.92.tar.xz b/epiphany-3.25.92.tar.xz new file mode 100644 index 0000000..729ed85 --- /dev/null +++ b/epiphany-3.25.92.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:56289c25d2697f30ee823f274ce26572a0d674690bd016782e4447b558465bc7 +size 4086840 diff --git a/epiphany.changes b/epiphany.changes index 06ed15d..02e4352 100644 --- a/epiphany.changes +++ b/epiphany.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Sun Sep 3 16:45:17 UTC 2017 - zaitor@opensuse.org + +- Update to version 3.25.92: + + Rename the meson build options. + + Switch to nontransitional IDN2008. + + Many improvements to password form detection (bgo#666326). + + Fix crash of bookmarks popover (bgo#780549). + + Don't create Mobile bookmarks tag when syncing unless needed + (bgo#786590). + + Handle invalid input from gnome-keyring (bgo#786811). + + Password manager should operate on security origins + (bgo#786818). + + Adblocker must not block main resource during redirects + (bgo#787011). + + Updated translations. +- Drop obsolete post(un) handling that file-triggers now takes care + of, following macros are dropped: + glib2_gsettings_schema_requires, desktop_database_post(un), + icon_theme_cache_post(un) and glib2_gsettings_schema_post(un). +- Run spec-cleaner, modernize spec. + ------------------------------------------------------------------- Tue Aug 22 08:31:17 UTC 2017 - zaitor@opensuse.org diff --git a/epiphany.spec b/epiphany.spec index d8a961f..94e2aba 100644 --- a/epiphany.spec +++ b/epiphany.spec @@ -17,7 +17,7 @@ Name: epiphany -Version: 3.25.91 +Version: 3.25.92 Release: 0 Summary: GNOME Web Browser License: GPL-3.0+ @@ -26,9 +26,7 @@ Url: http://www.gnome.org/projects/epiphany/ Source: https://download.gnome.org/sources/epiphany/3.25/%{name}-%{version}.tar.xz BuildRequires: fdupes BuildRequires: meson -%if ! 0%{?is_opensuse} -BuildRequires: translation-update-upstream -%endif +BuildRequires: pkgconfig BuildRequires: update-desktop-files BuildRequires: yelp-tools BuildRequires: pkgconfig(cairo) >= 1.2 @@ -59,8 +57,9 @@ Requires: %{name}-branding = %{version} Requires: iso-codes Recommends: %{name}-lang Recommends: ca-certificates -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%glib2_gsettings_schema_requires +%if ! 0%{?is_opensuse} +BuildRequires: translation-update-upstream +%endif %description Epiphany is a Web browser for the GNOME Desktop. Its principles are @@ -71,9 +70,9 @@ Summary: GNOME Web Browser -- Upstream default bookmarks and user agent s Group: Productivity/Networking/Web/Browsers Requires: %{name} = %{version} Supplements: packageand(%{name}:branding-upstream) +Conflicts: otherproviders(%{name}-branding) Provides: %{name}-branding = %{version} BuildArch: noarch -Conflicts: otherproviders(%{name}-branding) %description branding-upstream Epiphany is a Web Browser for the GNOME Desktop. Its principles are @@ -96,6 +95,7 @@ This package contains a search provider to enable GNOME Shell to get search results from Web (epiphany) %lang_package + %prep %setup -q %if ! 0%{?is_opensuse} @@ -103,30 +103,21 @@ translation-update-upstream %endif %build -%meson -Ddistributor_name=openSUSE -%meson_build +%{meson} \ + -Ddistributor_name=openSUSE \ + %{nil} +%{meson_build} %install -%meson_install -find %{buildroot} -type f -name '*.la' -delete -print +%{meson_install} %suse_update_desktop_file org.gnome.Epiphany %find_lang %{name} %{?no_lang_C} %fdupes %{buildroot} -%post -/sbin/ldconfig -%desktop_database_post -%icon_theme_cache_post -%glib2_gsettings_schema_post - -%postun -/sbin/ldconfig -%desktop_database_postun -%icon_theme_cache_postun -%glib2_gsettings_schema_postun +%post -p /sbin/ldconfig +%postun -p /sbin/ldconfig %files -%defattr(-,root,root) %doc AUTHORS COPYING NEWS README TODO %doc %{_datadir}/help/C/%{name}/ %{_bindir}/epiphany @@ -138,7 +129,7 @@ find %{buildroot} -type f -name '*.la' -delete -print %{_datadir}/glib-2.0/schemas/org.gnome.Epiphany.enums.xml %{_datadir}/glib-2.0/schemas/org.gnome.epiphany.gschema.xml %{_datadir}/icons/hicolor/*/apps/org.gnome.Epiphany* -%doc %{_mandir}/man1/epiphany.1.gz +%{_mandir}/man1/epiphany.1%{ext_man} %dir %{_libdir}/epiphany %dir %{_libdir}/epiphany/web-extensions %{_libdir}/epiphany/web-extensions/libephywebextension.so @@ -151,11 +142,9 @@ find %{buildroot} -type f -name '*.la' -delete -print %files lang -f %{name}.lang %files branding-upstream -%defattr(-,root,root) %{_datadir}/epiphany/default-bookmarks.rdf %files -n gnome-shell-search-provider-epiphany -%defattr(-,root,root) %{_datadir}/dbus-1/services/org.gnome.EpiphanySearchProvider.service %dir %{_datadir}/gnome-shell %dir %{_datadir}/gnome-shell/search-providers