Accepting request 75711 from GNOME:Factory

Pushing G:F, including GNOME 3.1.3

OBS-URL: https://build.opensuse.org/request/show/75711
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=17
This commit is contained in:
Sascha Peilicke 2011-07-11 10:42:18 +00:00 committed by Git OBS Bridge
commit 870d0f7914
6 changed files with 60 additions and 17 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

View File

@ -1,7 +1,7 @@
#
# spec file for package epiphany-branding-SLED
# spec file for package epiphany-branding-SLED (Version 11.3)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,13 +20,13 @@
%define build_SLED 1
# Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-SLED
License: GPLv2+
Version: 11.4
Release: 2
Summary: SLED branding of epiphany
Version: 12.1
Release: 1
Summary: GNOME Web Browser -- SLED default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers
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
@ -46,6 +46,7 @@ BuildRequires: lsb
BuildRequires: suse-release
%define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-SLED)
@ -53,7 +54,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%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
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

View File

@ -1,7 +1,7 @@
#
# spec file for package epiphany-branding-openSUSE
# spec file for package epiphany-branding-openSUSE (Version 11.3)
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -20,13 +20,13 @@
%define build_SLED 0
# Do not edit this auto generated file! Edit epiphany-branding.spec.in.
Name: epiphany-branding-openSUSE
License: GPLv2+
Version: 11.4
Release: 2
Summary: openSUSE branding of epiphany
Version: 12.1
Release: 1
Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string
Group: Productivity/Networking/Web/Browsers
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
@ -46,6 +46,7 @@ BuildRequires: lsb
BuildRequires: suse-release
%define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-openSUSE)
@ -53,7 +54,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%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
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

View File

@ -21,10 +21,11 @@
Name: epiphany-branding-%{branding_name}
License: GPLv2+
Version: 11.4
Version: 12.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
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
@ -44,6 +45,7 @@ BuildRequires: lsb
BuildRequires: suse-release
%define distro_version %(lsb_release -r -s)
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
Requires: epiphany = %{epiphany_version}
Provides: epiphany-branding = %{epiphany_version}
Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-%{branding_name})
@ -51,7 +53,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
%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
cp -a %{_datadir}/epiphany/default-bookmarks.rdf .