Accepting request 197875 from home:dimstar:branches:GNOME:Factory

- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against
  epiphany 3.9.90.

- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against
  epiphany 3.9.90.

OBS-URL: https://build.opensuse.org/request/show/197875
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=34
This commit is contained in:
Dominique Leuenberger 2013-09-07 22:17:46 +00:00 committed by Git OBS Bridge
parent 208e464853
commit 6dd0678294
8 changed files with 47 additions and 25 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against
epiphany 3.9.90.
-------------------------------------------------------------------
Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package epiphany-branding-SLED
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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
@ -33,7 +33,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch
BuildRequires: epiphany
BuildRequires: epiphany >= 3.9.90
# 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!

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against
epiphany 3.9.90.
-------------------------------------------------------------------
Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

View File

@ -1,7 +1,7 @@
#
# spec file for package epiphany-branding-openSUSE
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2013 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
@ -33,7 +33,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch
BuildRequires: epiphany
BuildRequires: epiphany >= 3.9.90
# 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!

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Sep 7 21:47:22 UTC 2013 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch against
epiphany 3.9.90.
-------------------------------------------------------------------
Wed May 23 07:43:47 UTC 2012 - vuntz@opensuse.org

View File

@ -32,7 +32,7 @@ Source1: branding.conf.in
Patch0: opensuse-bookmarks.patch
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
Patch1: sled-bookmarks.patch
BuildRequires: epiphany
BuildRequires: epiphany >= 3.9.90
# To be in sync with upstream defaults, do branding as a patch for upstream file.
# WARNING: As this package conflicts with epiphany-branding-%{branding_name}, you cannot
# reuse build root. You have to build in a clean build root every time!

View File

@ -1,9 +1,11 @@
--- default-bookmarks.rdf.old 2009-08-10 22:29:20.000000000 +0200
+++ default-bookmarks.rdf 2009-08-13 14:52:57.000000000 +0200
@@ -6,6 +6,13 @@
--- default-bookmarks.rdf.orig 2013-09-07 23:22:27.455672063 +0200
+++ default-bookmarks.rdf 2013-09-07 23:44:49.092161676 +0200
@@ -5,7 +5,14 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items>
<rdf:Seq>
<rdf:li rdf:resource="http://www.google.com"/>
- <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://www.opensuse.org"/>
+ <rdf:li rdf:resource="http://www.opensuse.org/documentation/"/>
+ <rdf:li rdf:resource="http://forums.opensuse.org"/>
@ -16,10 +18,10 @@
</channel>
@@ -16,4 +23,36 @@
<ephy:smartlink>http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8</ephy:smartlink>
<ephy:smartlink>http://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item>
-</rdf:RDF>
\ Pas de fin de ligne à la fin du fichier.
\ No newline at end of file
+ <item rdf:about="http://www.opensuse.org">
+ <title>openSUSE</title>
+ <link>http://www.opensuse.org</link>

View File

@ -1,19 +1,21 @@
--- default-bookmarks.rdf.old 2008-07-30 03:43:13.000000000 +0200
+++ default-bookmarks.rdf 2008-07-30 03:43:24.000000000 +0200
@@ -6,6 +6,7 @@
--- default-bookmarks.rdf.orig 2013-09-07 23:45:59.064825543 +0200
+++ default-bookmarks.rdf 2013-09-07 23:46:23.297055534 +0200
@@ -5,7 +5,8 @@
<link>http://www.gnome.org/projects/epiphany/</link>
<items>
<rdf:Seq>
<rdf:li rdf:resource="http://www.google.com"/>
- <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://duckduckgo.com"/>
+ <rdf:li rdf:resource="http://www.novell.com/documentation/"/>
</rdf:Seq>
</items>
</channel>
@@ -16,4 +17,8 @@
<ephy:smartlink>http://www.google.com/search?q=%s&amp;ie=UTF-8&amp;oe=UTF-8</ephy:smartlink>
<ephy:smartlink>http://duckduckgo.com/?q=%s&amp;t=epiphany</ephy:smartlink>
</item>
-</rdf:RDF>
\ Pas de fin de ligne à la fin du fichier.
\ No newline at end of file
+ <item rdf:about="http://www.novell.com/documentation/">
+ <title>Novell Documentation</title>
+ <link>http://www.novell.com/documentation/</link>