From 579d416773b2b94d83a2c657b1cdf4c53ed93c97ec54646e4da708ca2dc90565 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 9 Mar 2018 10:03:28 +0000 Subject: [PATCH] Accepting request 583553 from GNOME:Next Scripted push of project GNOME:Next OBS-URL: https://build.opensuse.org/request/show/583553 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=55 --- epiphany-branding-openSUSE.changes | 5 +++++ epiphany-branding-openSUSE.spec | 17 ++++++++--------- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 833fa34..7ea2249 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:25:05 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Mon Dec 5 10:05:23 UTC 2016 - dimstar@opensuse.org diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 7fc3773..8b51765 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-openSUSE # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,14 @@ # +%define epiphany_version %(rpm -q --qf '%%{version}' epiphany) Name: epiphany-branding-openSUSE Version: 42.1 Release: 0 Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Networking/Web/Browsers -Url: http://www.gnome.org/projects/epiphany/ +URL: http://www.gnome.org/projects/epiphany/ Source0: COPYING Source1: branding.conf.in # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks @@ -32,12 +33,10 @@ BuildRequires: epiphany >= 3.23.2 # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! BuildRequires: epiphany-branding-upstream >= 3.11.2 -%define epiphany_version %(rpm -q --qf '%%{version}' epiphany) Requires: epiphany = %{epiphany_version} -Provides: epiphany-branding = %{epiphany_version} -Conflicts: otherproviders(epiphany-branding) Supplements: packageand(epiphany:branding-openSUSE) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Conflicts: epiphany-branding +Provides: epiphany-branding = %{epiphany_version} BuildArch: noarch %description @@ -83,8 +82,8 @@ install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf %files -%defattr(-,root,root) -%doc COPYING +%license COPYING + %{_datadir}/epiphany/default-bookmarks.rdf %{_datadir}/epiphany/branding.conf