From 6eb459707205417f60c425771986334f41eb0793004c3e7d5f02c9a6ca34a3e6 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 16 May 2012 07:02:28 +0000 Subject: [PATCH] Accepting request 116303 from home:dimstar:branches:GNOME:Factory Add extensions.gnome.org to epiphany default bookmarks... OBS-URL: https://build.opensuse.org/request/show/116303 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=30 --- epiphany-branding-SLED.changes | 6 ++++++ epiphany-branding-SLED.spec | 9 ++++----- epiphany-branding-openSUSE.changes | 6 ++++++ epiphany-branding-openSUSE.spec | 9 ++++----- epiphany-branding.changes.in | 6 ++++++ epiphany-branding.spec.in | 6 +++--- opensuse-bookmarks.patch | 6 +++++- 7 files changed, 34 insertions(+), 14 deletions(-) diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index ca6fa6f..922cbc9 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 2 19:54:49 UTC 2012 - dimstar@opensuse.org + +- Add "GNOME Shell extensions" (https://extensions.gnome.org) to + openSUSE bookmarks. + ------------------------------------------------------------------- Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index 813f56c..031c643 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-SLED # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,12 +20,11 @@ %define build_SLED 1 # Do not edit this auto generated file! Edit epiphany-branding.spec.in. - Name: epiphany-branding-SLED -License: GPLv2+ Version: 12.1 -Release: 1 +Release: 0 Summary: GNOME Web Browser -- SLED default bookmarks and user agent string +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ Source0: COPYING @@ -37,8 +36,8 @@ Patch1: sled-bookmarks.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-SLED, you cannot # reuse build root. You have to build in a clean build root every time! -BuildRequires: epiphany-branding-upstream BuildRequires: epiphany +BuildRequires: epiphany-branding-upstream %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index ca6fa6f..922cbc9 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 2 19:54:49 UTC 2012 - dimstar@opensuse.org + +- Add "GNOME Shell extensions" (https://extensions.gnome.org) to + openSUSE bookmarks. + ------------------------------------------------------------------- Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 862b451..7668494 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -1,7 +1,7 @@ # # spec file for package epiphany-branding-openSUSE # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,12 +20,11 @@ %define build_SLED 0 # Do not edit this auto generated file! Edit epiphany-branding.spec.in. - Name: epiphany-branding-openSUSE -License: GPLv2+ Version: 12.1 -Release: 1 +Release: 0 Summary: GNOME Web Browser -- openSUSE default bookmarks and user agent string +License: GPL-2.0+ Group: Productivity/Networking/Web/Browsers Url: http://www.gnome.org/projects/epiphany/ Source0: COPYING @@ -37,8 +36,8 @@ Patch1: sled-bookmarks.patch # To be in sync with upstream defaults, do branding as a patch for upstream file. # WARNING: As this package conflicts with epiphany-branding-openSUSE, you cannot # reuse build root. You have to build in a clean build root every time! -BuildRequires: epiphany-branding-upstream BuildRequires: epiphany +BuildRequires: epiphany-branding-upstream %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else diff --git a/epiphany-branding.changes.in b/epiphany-branding.changes.in index ca6fa6f..922cbc9 100644 --- a/epiphany-branding.changes.in +++ b/epiphany-branding.changes.in @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 2 19:54:49 UTC 2012 - dimstar@opensuse.org + +- Add "GNOME Shell extensions" (https://extensions.gnome.org) to + openSUSE bookmarks. + ------------------------------------------------------------------- Thu Oct 13 12:50:53 UTC 2011 - vuntz@opensuse.org diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index 472b984..2b2bc57 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -1,7 +1,7 @@ # -# spec file for package epiphany-branding-%{branding_name} (Version 11.3) +# spec file for package epiphany-branding-%{branding_name} # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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,7 +20,7 @@ %define build_SLED 0 Name: epiphany-branding-%{branding_name} -License: GPLv2+ +License: GPL-2.0+ Version: 12.1 Release: 1 Summary: GNOME Web Browser -- %{branding_name} default bookmarks and user agent string diff --git a/opensuse-bookmarks.patch b/opensuse-bookmarks.patch index c85c6a1..ea29bc4 100644 --- a/opensuse-bookmarks.patch +++ b/opensuse-bookmarks.patch @@ -14,7 +14,7 @@ -@@ -16,4 +23,32 @@ +@@ -16,4 +23,36 @@ http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8 @@ -48,4 +48,8 @@ + Planet openSUSE + http://planet.opensuse.org + ++ ++ GNOME Shell Extensions ++ https://extensions.gnome.org ++ +