From f511e17bfd5c5bce568d31e763a57de724bd2adbbdc332d2bf5db86ff129a804 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@opensuse.org>
Date: Thu, 13 Oct 2011 13:27:05 +0000
Subject: [PATCH] Accepting request 87681 from
 home:vuntz:branches:GNOME:Factory

Be less strict in requires

OBS-URL: https://build.opensuse.org/request/show/87681
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=28
---
 epiphany-branding-SLED.changes     |  7 +++++++
 epiphany-branding-SLED.spec        |  2 +-
 epiphany-branding-openSUSE.changes |  7 +++++++
 epiphany-branding-openSUSE.spec    |  2 +-
 epiphany-branding.changes.in       | 13 +++++++++++++
 epiphany-branding.spec.in          |  5 +----
 6 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes
index 95ef63d..ca6fa6f 100644
--- a/epiphany-branding-SLED.changes
+++ b/epiphany-branding-SLED.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org
+
+- Remove %{release} from the epiphany versioned Requires, to not
+  have to rebuild this package each time epiphany rebuilds to keep
+  it installable.
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec
index 96cbebc..813f56c 100644
--- a/epiphany-branding-SLED.spec
+++ b/epiphany-branding-SLED.spec
@@ -46,7 +46,7 @@ BuildRequires:  lsb
 %endif
 BuildRequires:  suse-release
 %define distro_version %(lsb_release -r -s)
-%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
+%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
 Conflicts:      otherproviders(epiphany-branding)
diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes
index 95ef63d..ca6fa6f 100644
--- a/epiphany-branding-openSUSE.changes
+++ b/epiphany-branding-openSUSE.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org
+
+- Remove %{release} from the epiphany versioned Requires, to not
+  have to rebuild this package each time epiphany rebuilds to keep
+  it installable.
+
 -------------------------------------------------------------------
 Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
 
diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec
index 617a981..862b451 100644
--- a/epiphany-branding-openSUSE.spec
+++ b/epiphany-branding-openSUSE.spec
@@ -46,7 +46,7 @@ BuildRequires:  lsb
 %endif
 BuildRequires:  suse-release
 %define distro_version %(lsb_release -r -s)
-%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
+%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
 Conflicts:      otherproviders(epiphany-branding)
diff --git a/epiphany-branding.changes.in b/epiphany-branding.changes.in
index 0ecc595..ca6fa6f 100644
--- a/epiphany-branding.changes.in
+++ b/epiphany-branding.changes.in
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org
+
+- Remove %{release} from the epiphany versioned Requires, to not
+  have to rebuild this package each time epiphany rebuilds to keep
+  it installable.
+
+-------------------------------------------------------------------
+Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
+
+- Remove redundant/obsolete tags/sections from specfile
+  (cf. packaging guidelines)
+
 -------------------------------------------------------------------
 Wed Jul  6 16:27:30 CEST 2011 - vuntz@opensuse.org
 
diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in
index fa7e487..472b984 100644
--- a/epiphany-branding.spec.in
+++ b/epiphany-branding.spec.in
@@ -44,7 +44,7 @@ BuildRequires:  lsb
 %endif
 BuildRequires:  suse-release
 %define distro_version %(lsb_release -r -s)
-%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
+%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
 Conflicts:      otherproviders(epiphany-branding)
@@ -78,9 +78,6 @@ install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default
 # user agent
 install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf
 
-%clean
-rm -rf %{buildroot}
-
 %files
 %defattr(-,root,root)
 %doc COPYING