Accepting request 75546 from home:vuntz:branches:GNOME:Factory

Some branding cleanups

OBS-URL: https://build.opensuse.org/request/show/75546
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=24
This commit is contained in:
Dominique Leuenberger 2011-07-06 17:06:16 +00:00 committed by Git OBS Bridge
parent 36313e8bce
commit e653ea9e6f
6 changed files with 54 additions and 9 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jul 6 16:27:30 CEST 2011 - vuntz@opensuse.org
- Bump version to 12.1.
- Add a Requires for epiphany, since the branding package is
useless without it.
- Update summary and description.
- Add Url tag.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org

View File

@ -22,10 +22,11 @@
# Do not edit this auto generated file! Edit epiphany-branding.spec.in. # Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-SLED Name: epiphany-branding-SLED
License: GPLv2+ License: GPLv2+
Version: 11.4 Version: 12.1
Release: 1 Release: 1
Summary: SLED branding of epiphany Summary: GNOME Web Browser -- SLED default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
Source0: COPYING Source0: COPYING
Source1: branding.conf.in Source1: branding.conf.in
# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks
@ -45,6 +46,7 @@ BuildRequires: lsb
BuildRequires: suse-release BuildRequires: suse-release
%define distro_version %(lsb_release -r -s) %define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version} Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding) Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-SLED) Supplements: packageand(epiphany:branding-SLED)
@ -52,7 +54,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
This package provides SLED 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 SLED default bookmarks and user
agent string.
%prep %prep
cp -a %{_datadir}/epiphany/default-bookmarks.rdf . cp -a %{_datadir}/epiphany/default-bookmarks.rdf .

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jul 6 16:27:30 CEST 2011 - vuntz@opensuse.org
- Bump version to 12.1.
- Add a Requires for epiphany, since the branding package is
useless without it.
- Update summary and description.
- Add Url tag.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org

View File

@ -22,10 +22,11 @@
# Do not edit this auto generated file! Edit epiphany-branding.spec.in. # Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-openSUSE Name: epiphany-branding-openSUSE
License: GPLv2+ License: GPLv2+
Version: 11.4 Version: 12.1
Release: 1 Release: 1
Summary: openSUSE branding of epiphany Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
Source0: COPYING Source0: COPYING
Source1: branding.conf.in Source1: branding.conf.in
# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks
@ -45,6 +46,7 @@ BuildRequires: lsb
BuildRequires: suse-release BuildRequires: suse-release
%define distro_version %(lsb_release -r -s) %define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version} Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding) Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-openSUSE) Supplements: packageand(epiphany:branding-openSUSE)
@ -52,7 +54,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
This package provides openSUSE 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 openSUSE default bookmarks and user
agent string.
%prep %prep
cp -a %{_datadir}/epiphany/default-bookmarks.rdf . cp -a %{_datadir}/epiphany/default-bookmarks.rdf .

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Wed Jul 6 16:27:30 CEST 2011 - vuntz@opensuse.org
- Bump version to 12.1.
- Add a Requires for epiphany, since the branding package is
useless without it.
- Update summary and description.
- Add Url tag.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org Sun Jan 9 23:11:01 CET 2011 - vuntz@opensuse.org

View File

@ -21,10 +21,11 @@
Name: epiphany-branding-%{branding_name} Name: epiphany-branding-%{branding_name}
License: GPLv2+ License: GPLv2+
Version: 11.4 Version: 12.1
Release: 1 Release: 1
Summary: %{branding_name} branding of epiphany Summary: GNOME Web Browser -- %{branding_name} default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
Url: http://www.gnome.org/projects/epiphany/
Source0: COPYING Source0: COPYING
Source1: branding.conf.in Source1: branding.conf.in
# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks # PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks
@ -44,6 +45,7 @@ BuildRequires: lsb
BuildRequires: suse-release BuildRequires: suse-release
%define distro_version %(lsb_release -r -s) %define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version} Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding) Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-%{branding_name}) Supplements: packageand(epiphany:branding-%{branding_name})
@ -51,7 +53,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch BuildArch: noarch
%description %description
This package provides %{branding_name} 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 %{branding_name} default bookmarks and user
agent string.
%prep %prep
cp -a %{_datadir}/epiphany/default-bookmarks.rdf . cp -a %{_datadir}/epiphany/default-bookmarks.rdf .