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
This commit is contained in:
Dominique Leuenberger 2011-07-06 17:07:45 +00:00 committed by Git OBS Bridge
parent 453d9506cf
commit 310ae5d8f0
2 changed files with 24 additions and 6 deletions

View File

@ -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 Tue Jul 5 15:04:55 CEST 2011 - vuntz@opensuse.org

View File

@ -21,7 +21,7 @@ Name: epiphany
Version: 3.1.3 Version: 3.1.3
Release: 1 Release: 1
License: GPLv2+ License: GPLv2+
Summary: GNOME Web Browser Based on the WebKit Rendering Engine Summary: GNOME Web Browser
Url: http://www.gnome.org/projects/epiphany/ Url: http://www.gnome.org/projects/epiphany/
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
Source: http://download.gnome.org/sources/epiphany/3.1/%{name}-%{version}.tar.bz2 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: translation-update-upstream
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gsettings-desktop-schemas)
Requires: %{name}-branding Requires: %{name}-branding = %{version}
Requires: NetworkManager Requires: NetworkManager
Requires: gnome-icon-theme Requires: gnome-icon-theme
Requires: iso-codes Requires: iso-codes
@ -63,7 +63,7 @@ simplicity and standards compliance.
%package devel %package devel
License: GPLv2+ License: GPLv2+
Summary: GNOME Web Browser based on the WebKit Rendering Engine Summary: GNOME Web Browser
Group: Development/Libraries/GNOME Group: Development/Libraries/GNOME
Requires: %{name} = %{version} Requires: %{name} = %{version}
Provides: %{name}-doc = %{version} Provides: %{name}-doc = %{version}
@ -75,17 +75,23 @@ simplicity and standards compliance.
%package branding-upstream %package branding-upstream
License: GPLv2+ License: GPLv2+
Summary: Upstream branding of Epiphany Summary: GNOME Web Browser -- Upstream default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
Supplements: packageand(%{name}:branding-upstream) Requires: %{name} = %{version}
Provides: %{name}-branding = %{version} Provides: %{name}-branding = %{version}
Conflicts: otherproviders(%{name}-branding) Conflicts: otherproviders(%{name}-branding)
Supplements: packageand(%{name}:branding-upstream)
BuildArch: noarch
#BRAND: Provide a few files - #BRAND: Provide a few files -
#BRAND: /usr/share/epiphany/default-bookmarks.rdf #BRAND: /usr/share/epiphany/default-bookmarks.rdf
#BRAND: the default bookmarks #BRAND: the default bookmarks
%description branding-upstream %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 %lang_package
%prep %prep