Accepting request 461072 from GNOME:Factory

Scripted push of project GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/461072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=38
This commit is contained in:
Dominique Leuenberger 2017-03-22 21:58:10 +00:00 committed by Git OBS Bridge
commit 1068dfb844
3 changed files with 14 additions and 12 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Dec 5 10:05:23 UTC 2016 - dimstar@opensuse.org
- Rebase opensuse-bookmarks.patch for epiphany 3.23.2.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Dec 5 10:05:22 UTC 2016 - fcrozat@suse.com Mon Dec 5 10:05:22 UTC 2016 - fcrozat@suse.com

View File

@ -27,7 +27,7 @@ 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
Patch0: opensuse-bookmarks.patch Patch0: opensuse-bookmarks.patch
BuildRequires: epiphany >= 3.20.0 BuildRequires: epiphany >= 3.23.2
# To be in sync with upstream defaults, do branding as a patch for upstream file. # 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 # 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! # reuse build root. You have to build in a clean build root every time!

View File

@ -1,11 +1,11 @@
Index: BUILD/default-bookmarks.rdf Index: epiphany-branding-openSUSE/test/default-bookmarks.rdf
=================================================================== ===================================================================
--- default-bookmarks.rdf --- default-bookmarks.rdf
+++ default-bookmarks.rdf +++ default-bookmarks.rdf
@@ -7,6 +7,13 @@ @@ -6,6 +6,13 @@
<items>
<rdf:Seq> <rdf:Seq>
<rdf:li rdf:resource="https://www.gnome.org/"/> <rdf:li rdf:resource="https://www.gnome.org/"/>
<rdf:li rdf:resource="https://webkit.org/"/>
+ <rdf:li rdf:resource="http://www.opensuse.org"/> + <rdf:li rdf:resource="http://www.opensuse.org"/>
+ <rdf:li rdf:resource="http://www.opensuse.org/documentation/"/> + <rdf:li rdf:resource="http://www.opensuse.org/documentation/"/>
+ <rdf:li rdf:resource="http://forums.opensuse.org"/> + <rdf:li rdf:resource="http://forums.opensuse.org"/>
@ -16,12 +16,10 @@ Index: BUILD/default-bookmarks.rdf
</rdf:Seq> </rdf:Seq>
</items> </items>
</channel> </channel>
@@ -18,4 +25,36 @@ @@ -13,4 +20,36 @@
<title>WebKit</title> <title>GNOME</title>
<link>https://webkit.org/</link> <link>https://www.gnome.org/</link>
</item> </item>
-</rdf:RDF>
\ No newline at end of file
+<item rdf:about="http://www.opensuse.org"> +<item rdf:about="http://www.opensuse.org">
+ <title>openSUSE</title> + <title>openSUSE</title>
+ <link>http://www.opensuse.org</link> + <link>http://www.opensuse.org</link>
@ -54,5 +52,4 @@ Index: BUILD/default-bookmarks.rdf
+ <title>GNOME Shell Extensions</title> + <title>GNOME Shell Extensions</title>
+ <link>https://extensions.gnome.org</link> + <link>https://extensions.gnome.org</link>
+ </item> + </item>
+</rdf:RDF> </rdf:RDF>