Accepting request 393325 from GNOME:Factory
Yet a supersede, sorry for the spam people - this wil be the last one I hope. OBS-URL: https://build.opensuse.org/request/show/393325 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=35
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
b12e83817c
@ -1,148 +0,0 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Fri Feb 12 16:16:03 UTC 2016 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Patch tagging: use valid tags.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sat Jan 22 18:30:00 UTC 2016 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Make build not rely on lsb and opensuse-release (no constant
|
|
||||||
rebuild in Tumbleweed):
|
|
||||||
+ Drop lsb/lsb-release BuildRequires.
|
|
||||||
+ Drop opensuse-release BuildRequires.
|
|
||||||
+ Use %{suse_version} in build section to inject proper values
|
|
||||||
into branding.conf. On Tumbleweed we no longer use the snapshot
|
|
||||||
version (which is anyway useless) but simply inject
|
|
||||||
'Tumbleweed'. We currently detect openSUSE 13.1, 13.2,
|
|
||||||
Leap 42.1, SLE12 and Tumbleweed systems. All others will have
|
|
||||||
'SUSE/undef' in the browsers user agent string.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Oct 12 15:23:23 UTC 2015 - zaitor@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 42.1, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Apr 3 23:13:23 UTC 2014 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 13.2, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Jan 19 19:46:33 UTC 2014 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
|
|
||||||
Epiphany 3.11.3.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Dec 23 15:09:29 UTC 2013 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
|
|
||||||
Epiphany 3.11.2.
|
|
||||||
- Update COPYING based on latest published GPL-2.0 text:
|
|
||||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 13.1, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Bump version to 12.2, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Remove %{release} from the epiphany versioned Requires, to not
|
|
||||||
have to rebuild this package each time epiphany rebuilds to keep
|
|
||||||
it installable.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
|
|
||||||
|
|
||||||
- Remove redundant/obsolete tags/sections from specfile
|
|
||||||
(cf. packaging guidelines)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Update the Planet bookmark to point to Planet openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Oct 8 11:42:42 CEST 2010 - vuntz@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 11.4.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org
|
|
||||||
|
|
||||||
- Merge openSUSE and SLED branding packaging, and generate the
|
|
||||||
packages from the same sources.
|
|
||||||
- Change version to 11.3.
|
|
||||||
- Add COPYING file.
|
|
||||||
- Add branding.conf.in: with a recent epiphany, we can change the
|
|
||||||
user agent with a simple file.
|
|
||||||
- Add BuildRequires on lsb-release and suse-release to get the
|
|
||||||
version of the distribution, to put in the user agent.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
|
||||||
|
|
||||||
- make patch0 usage consistent
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Respin opensuse-bookmarks.patch to apply to latest epiphany.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Update for epiphany webkit change: the user agent isn't set here
|
|
||||||
anymore (it's set in gconf2-branding).
|
|
||||||
- Bump version to 11.2.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Bump version to 11.1. Part of bnc#440849.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz
|
|
||||||
|
|
||||||
- Conflict with other branding providers (FATE#304881).
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Add more openSUSE bookmarks.
|
|
||||||
- Clean up spec file.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- New package.
|
|
||||||
- Add openSUSE documentation bookmark. (fate#305003)
|
|
||||||
|
|
||||||
@ -1,102 +0,0 @@
|
|||||||
#
|
|
||||||
# spec file for package epiphany-branding-SLED
|
|
||||||
#
|
|
||||||
# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
|
|
||||||
#
|
|
||||||
# All modifications and additions to the file contributed by third parties
|
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
|
||||||
# upon. The license for this file, and modifications and additions to the
|
|
||||||
# file, is the same license as for the pristine package itself (unless the
|
|
||||||
# license for the pristine package is not an Open Source License, in which
|
|
||||||
# case the license is the MIT License). An "Open Source License" is a
|
|
||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
|
||||||
# published by the Open Source Initiative.
|
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
%define build_openSUSE 0
|
|
||||||
%define build_SLED 1
|
|
||||||
|
|
||||||
# Do not edit this auto generated file! Edit epiphany-branding.spec.in.
|
|
||||||
Name: epiphany-branding-SLED
|
|
||||||
Version: 42.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
|
|
||||||
Source1: branding.conf.in
|
|
||||||
# PATCH-FEATURE-OPENSUSE opensuse-bookmarks.patch vuntz@novell.com -- Add openSUSE bookmarks
|
|
||||||
Patch0: opensuse-bookmarks.patch
|
|
||||||
# PATCH-FEATURE-SLE sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
|
||||||
Patch1: sled-bookmarks.patch
|
|
||||||
BuildRequires: epiphany >= 3.11.3
|
|
||||||
# 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 >= 3.11.2
|
|
||||||
%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
|
|
||||||
Requires: epiphany = %{epiphany_version}
|
|
||||||
Provides: epiphany-branding = %{epiphany_version}
|
|
||||||
Conflicts: otherproviders(epiphany-branding)
|
|
||||||
Supplements: packageand(epiphany:branding-SLED)
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
|
||||||
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 .
|
|
||||||
%if %build_openSUSE
|
|
||||||
%patch0
|
|
||||||
%endif
|
|
||||||
%if %build_SLED
|
|
||||||
%patch1
|
|
||||||
%endif
|
|
||||||
cp -a %{SOURCE0} .
|
|
||||||
|
|
||||||
%build
|
|
||||||
case "%{?suse_version}" in
|
|
||||||
1330)
|
|
||||||
DISTRO="Tumbleweed"
|
|
||||||
;;
|
|
||||||
1320)
|
|
||||||
DISTRO="13.2"
|
|
||||||
;;
|
|
||||||
1315)
|
|
||||||
%if %{?is_opensuse}
|
|
||||||
DISTRO="Leap 42.1"
|
|
||||||
%else
|
|
||||||
DISTRO="SLE12"
|
|
||||||
%endif
|
|
||||||
;;
|
|
||||||
1310)
|
|
||||||
DISTRO="13.1"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
DISTRO="undef"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
sed "s,@distroversion@,$DISTRO,g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
|
|
||||||
|
|
||||||
%install
|
|
||||||
# custom bookmarks
|
|
||||||
install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf
|
|
||||||
# user agent
|
|
||||||
install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc COPYING
|
|
||||||
%{_datadir}/epiphany/default-bookmarks.rdf
|
|
||||||
%{_datadir}/epiphany/branding.conf
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon May 2 11:59:23 UTC 2016 - zaitor@opensuse.org
|
||||||
|
|
||||||
|
- Drop epiphany-branding-SLED subpackage:
|
||||||
|
+ Remove sled-bookmarks.patch, pre_checkin.sh,
|
||||||
|
epiphany-branding-SLED.changes, epiphany-branding.changes.in
|
||||||
|
and epiphany-branding-SLED.spec.
|
||||||
|
+ Clean epiphany-branding-openSUSE.spec for all references to the
|
||||||
|
previous package.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Feb 12 16:16:03 UTC 2016 - dimstar@opensuse.org
|
Fri Feb 12 16:16:03 UTC 2016 - dimstar@opensuse.org
|
||||||
|
|
||||||
|
|||||||
@ -16,10 +16,6 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
%define build_openSUSE 1
|
|
||||||
%define build_SLED 0
|
|
||||||
|
|
||||||
# Do not edit this auto generated file! Edit epiphany-branding.spec.in.
|
|
||||||
Name: epiphany-branding-openSUSE
|
Name: epiphany-branding-openSUSE
|
||||||
Version: 42.1
|
Version: 42.1
|
||||||
Release: 0
|
Release: 0
|
||||||
@ -31,9 +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
|
||||||
# PATCH-FEATURE-SLE sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
BuildRequires: epiphany >= 3.20.0
|
||||||
Patch1: sled-bookmarks.patch
|
|
||||||
BuildRequires: epiphany >= 3.11.3
|
|
||||||
# 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!
|
||||||
@ -55,12 +49,7 @@ agent string.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
|
cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
|
||||||
%if %build_openSUSE
|
|
||||||
%patch0
|
%patch0
|
||||||
%endif
|
|
||||||
%if %build_SLED
|
|
||||||
%patch1
|
|
||||||
%endif
|
|
||||||
cp -a %{SOURCE0} .
|
cp -a %{SOURCE0} .
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
|||||||
@ -1,148 +0,0 @@
|
|||||||
-------------------------------------------------------------------
|
|
||||||
Fri Feb 12 16:16:03 UTC 2016 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Patch tagging: use valid tags.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sat Jan 22 18:30:00 UTC 2016 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Make build not rely on lsb and opensuse-release (no constant
|
|
||||||
rebuild in Tumbleweed):
|
|
||||||
+ Drop lsb/lsb-release BuildRequires.
|
|
||||||
+ Drop opensuse-release BuildRequires.
|
|
||||||
+ Use %{suse_version} in build section to inject proper values
|
|
||||||
into branding.conf. On Tumbleweed we no longer use the snapshot
|
|
||||||
version (which is anyway useless) but simply inject
|
|
||||||
'Tumbleweed'. We currently detect openSUSE 13.1, 13.2,
|
|
||||||
Leap 42.1, SLE12 and Tumbleweed systems. All others will have
|
|
||||||
'SUSE/undef' in the browsers user agent string.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Oct 12 15:23:23 UTC 2015 - zaitor@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 42.1, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Apr 3 23:13:23 UTC 2014 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 13.2, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Jan 19 19:46:33 UTC 2014 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
|
|
||||||
Epiphany 3.11.3.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Dec 23 15:09:29 UTC 2013 - dimstar@opensuse.org
|
|
||||||
|
|
||||||
- Rebase opensuse-bookmarks.patch and sled-bookmarks.patch for
|
|
||||||
Epiphany 3.11.2.
|
|
||||||
- Update COPYING based on latest published GPL-2.0 text:
|
|
||||||
http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Sep 8 07:14:25 UTC 2013 - zaitor@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 13.1, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Bump version to 12.2, to prepare for next version of openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Remove %{release} from the epiphany versioned Requires, to not
|
|
||||||
have to rebuild this package each time epiphany rebuilds to keep
|
|
||||||
it installable.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Sun Sep 18 17:17:12 UTC 2011 - jengelh@medozas.de
|
|
||||||
|
|
||||||
- Remove redundant/obsolete tags/sections from specfile
|
|
||||||
(cf. packaging guidelines)
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
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
|
|
||||||
|
|
||||||
- Update the Planet bookmark to point to Planet openSUSE.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Oct 8 11:42:42 CEST 2010 - vuntz@opensuse.org
|
|
||||||
|
|
||||||
- Bump version to 11.4.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org
|
|
||||||
|
|
||||||
- Merge openSUSE and SLED branding packaging, and generate the
|
|
||||||
packages from the same sources.
|
|
||||||
- Change version to 11.3.
|
|
||||||
- Add COPYING file.
|
|
||||||
- Add branding.conf.in: with a recent epiphany, we can change the
|
|
||||||
user agent with a simple file.
|
|
||||||
- Add BuildRequires on lsb-release and suse-release to get the
|
|
||||||
version of the distribution, to put in the user agent.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
|
||||||
|
|
||||||
- make patch0 usage consistent
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Aug 13 14:55:52 CEST 2009 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Respin opensuse-bookmarks.patch to apply to latest epiphany.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Aug 3 23:10:28 CEST 2009 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Update for epiphany webkit change: the user agent isn't set here
|
|
||||||
anymore (it's set in gconf2-branding).
|
|
||||||
- Bump version to 11.2.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Bump version to 11.1. Part of bnc#440849.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Mon Oct 6 15:56:53 CEST 2008 - sbrabec@suse.cz
|
|
||||||
|
|
||||||
- Conflict with other branding providers (FATE#304881).
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Thu Sep 11 02:18:59 CEST 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- Add more openSUSE bookmarks.
|
|
||||||
- Clean up spec file.
|
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
|
||||||
Tue Jul 29 16:00:03 CEST 2008 - vuntz@novell.com
|
|
||||||
|
|
||||||
- New package.
|
|
||||||
- Add openSUSE documentation bookmark. (fate#305003)
|
|
||||||
|
|
||||||
@ -1,101 +0,0 @@
|
|||||||
#
|
|
||||||
# spec file for package epiphany-branding-%{branding_name}
|
|
||||||
#
|
|
||||||
# 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
|
|
||||||
# upon. The license for this file, and modifications and additions to the
|
|
||||||
# file, is the same license as for the pristine package itself (unless the
|
|
||||||
# license for the pristine package is not an Open Source License, in which
|
|
||||||
# case the license is the MIT License). An "Open Source License" is a
|
|
||||||
# license that conforms to the Open Source Definition (Version 1.9)
|
|
||||||
# published by the Open Source Initiative.
|
|
||||||
|
|
||||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
|
||||||
#
|
|
||||||
|
|
||||||
|
|
||||||
%define build_openSUSE 0
|
|
||||||
%define build_SLED 0
|
|
||||||
|
|
||||||
Name: epiphany-branding-%{branding_name}
|
|
||||||
Version: 42.1
|
|
||||||
Release: 0
|
|
||||||
Summary: GNOME Web Browser -- %{branding_name} default bookmarks and user agent string
|
|
||||||
License: GPL-2.0+
|
|
||||||
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
|
|
||||||
Patch0: opensuse-bookmarks.patch
|
|
||||||
# PATCH-FEATURE-SLE sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
|
||||||
Patch1: sled-bookmarks.patch
|
|
||||||
BuildRequires: epiphany >= 3.11.3
|
|
||||||
# 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!
|
|
||||||
BuildRequires: epiphany-branding-upstream >= 3.11.2
|
|
||||||
%define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
|
|
||||||
Requires: epiphany = %{epiphany_version}
|
|
||||||
Provides: epiphany-branding = %{epiphany_version}
|
|
||||||
Conflicts: otherproviders(epiphany-branding)
|
|
||||||
Supplements: packageand(epiphany:branding-%{branding_name})
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
|
||||||
BuildArch: noarch
|
|
||||||
|
|
||||||
%description
|
|
||||||
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 .
|
|
||||||
%if %build_openSUSE
|
|
||||||
%patch0
|
|
||||||
%endif
|
|
||||||
%if %build_SLED
|
|
||||||
%patch1
|
|
||||||
%endif
|
|
||||||
cp -a %{SOURCE0} .
|
|
||||||
|
|
||||||
%build
|
|
||||||
case "%{?suse_version}" in
|
|
||||||
1330)
|
|
||||||
DISTRO="Tumbleweed"
|
|
||||||
;;
|
|
||||||
1320)
|
|
||||||
DISTRO="13.2"
|
|
||||||
;;
|
|
||||||
1315)
|
|
||||||
%if %{?is_opensuse}
|
|
||||||
DISTRO="Leap 42.1"
|
|
||||||
%else
|
|
||||||
DISTRO="SLE12"
|
|
||||||
%endif
|
|
||||||
;;
|
|
||||||
1310)
|
|
||||||
DISTRO="13.1"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
DISTRO="undef"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
sed "s,@distroversion@,$DISTRO,g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
|
|
||||||
|
|
||||||
%install
|
|
||||||
# custom bookmarks
|
|
||||||
install -D -m0644 default-bookmarks.rdf %{buildroot}%{_datadir}/epiphany/default-bookmarks.rdf
|
|
||||||
# user agent
|
|
||||||
install -D -m0644 branding.conf %{buildroot}%{_datadir}/epiphany/branding.conf
|
|
||||||
|
|
||||||
%files
|
|
||||||
%defattr(-,root,root)
|
|
||||||
%doc COPYING
|
|
||||||
%{_datadir}/epiphany/default-bookmarks.rdf
|
|
||||||
%{_datadir}/epiphany/branding.conf
|
|
||||||
|
|
||||||
%changelog
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
NAME=epiphany
|
|
||||||
|
|
||||||
if ! test -f ${NAME}-branding.spec.in ; then
|
|
||||||
exit
|
|
||||||
fi
|
|
||||||
|
|
||||||
for variant in openSUSE SLED ; do
|
|
||||||
cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec
|
|
||||||
cp ${NAME}-branding.changes.in ${NAME}-branding-${variant}.changes
|
|
||||||
sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec
|
|
||||||
sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec
|
|
||||||
sed -i "
|
|
||||||
/^Name: *${NAME}-branding-${variant}/i \
|
|
||||||
# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in.
|
|
||||||
" ${NAME}-branding-${variant}.spec
|
|
||||||
done
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
--- default-bookmarks.rdf.orig 2014-01-19 20:45:17.806719689 +0100
|
|
||||||
+++ default-bookmarks.rdf 2014-01-19 20:45:50.762976690 +0100
|
|
||||||
@@ -6,6 +6,7 @@
|
|
||||||
<items>
|
|
||||||
<rdf:Seq>
|
|
||||||
<rdf:li rdf:resource="https://duckduckgo.com"/>
|
|
||||||
+ <rdf:li rdf:resource="http://www.novell.com/documentation/"/>
|
|
||||||
</rdf:Seq>
|
|
||||||
</items>
|
|
||||||
</channel>
|
|
||||||
@@ -16,4 +17,8 @@
|
|
||||||
|
|
||||||
<ephy:smartlink>https://duckduckgo.com/?q=%s&t=epiphany</ephy:smartlink>
|
|
||||||
</item>
|
|
||||||
-</rdf:RDF>
|
|
||||||
\ 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>
|
|
||||||
+ </item>
|
|
||||||
+</rdf:RDF>
|
|
||||||
Loading…
Reference in New Issue
Block a user