From 310ae5d8f0ab1117bd0b9d4c83ab934591397fb84671ccf9e36b10a49b5a43fe Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dimstar@opensuse.org>
Date: Wed, 6 Jul 2011 17:07:45 +0000
Subject: [PATCH] Accepting request 75545 from
 home:vuntz:branches:GNOME:Factory

Some branding cleanups

OBS-URL: https://build.opensuse.org/request/show/75545
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany?expand=0&rev=103
---
 epiphany.changes | 12 ++++++++++++
 epiphany.spec    | 18 ++++++++++++------
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/epiphany.changes b/epiphany.changes
index 0a29eec..f6a08ef 100644
--- a/epiphany.changes
+++ b/epiphany.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Jul  6 16:31:22 CEST 2011 - vuntz@opensuse.org
+
+- Change branding-upstream subpackage:
+  + Add Requires for epiphany since the branding package is useless
+    without it.
+  + Update summary and description.
+  + Make noarch.
+- Update summaries in other subpackages.
+- Change branding Requires in main subpackage to be "= %{version}"
+  since it has to be versioned.
+
 -------------------------------------------------------------------
 Tue Jul  5 15:04:55 CEST 2011 - vuntz@opensuse.org
 
diff --git a/epiphany.spec b/epiphany.spec
index 1a3b6dc..cdd7006 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -21,7 +21,7 @@ Name:           epiphany
 Version:        3.1.3
 Release:        1
 License:        GPLv2+
-Summary:        GNOME Web Browser Based on the WebKit Rendering Engine
+Summary:        GNOME Web Browser
 Url:            http://www.gnome.org/projects/epiphany/
 Group:          Productivity/Networking/Web/Browsers
 Source:         http://download.gnome.org/sources/epiphany/3.1/%{name}-%{version}.tar.bz2
@@ -48,7 +48,7 @@ BuildRequires:  mozilla-nss-devel
 BuildRequires:  translation-update-upstream
 BuildRequires:  update-desktop-files
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
-Requires:       %{name}-branding
+Requires:       %{name}-branding = %{version}
 Requires:       NetworkManager
 Requires:       gnome-icon-theme
 Requires:       iso-codes
@@ -63,7 +63,7 @@ simplicity and standards compliance.
 
 %package devel
 License:        GPLv2+
-Summary:        GNOME Web Browser based on the WebKit Rendering Engine
+Summary:        GNOME Web Browser
 Group:          Development/Libraries/GNOME
 Requires:       %{name} = %{version}
 Provides:       %{name}-doc = %{version}
@@ -75,17 +75,23 @@ simplicity and standards compliance.
 
 %package branding-upstream
 License:        GPLv2+
-Summary:        Upstream branding of Epiphany
+Summary:        GNOME Web Browser -- Upstream default bookmarks and user agent string
 Group:          Productivity/Networking/Web/Browsers
-Supplements:    packageand(%{name}:branding-upstream)
+Requires:       %{name} = %{version}
 Provides:       %{name}-branding = %{version}
 Conflicts:      otherproviders(%{name}-branding)
+Supplements:    packageand(%{name}:branding-upstream)
+BuildArch:      noarch
 #BRAND: Provide a few files -
 #BRAND: /usr/share/epiphany/default-bookmarks.rdf
 #BRAND:  the default bookmarks
 
 %description branding-upstream
-This package provides upstream Look and Feel for Epiphany.
+Epiphany is a Web Browser for the GNOME Desktop. Its principles are
+simplicity and standards compliance.
+
+This package provides the upstream default bookmarks and user agent
+string.
 
 %lang_package
 %prep