Accepting request 584714 from GNOME:Factory

Scripted push of project GNOME:Next (forwarded request 583553 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/584714
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=39
This commit is contained in:
Dominique Leuenberger 2018-03-14 18:36:43 +00:00 committed by Git OBS Bridge
commit 38c37707fa
2 changed files with 13 additions and 9 deletions

View File

@ -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

View File

@ -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