OBS User unknown 2009-08-07 23:11:56 +00:00 committed by Git OBS Bridge
parent 228dbaef03
commit 988dd6b4ba
2 changed files with 12 additions and 21 deletions

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
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 Tue Nov 4 13:48:43 CET 2008 - vuntz@novell.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package epiphany-branding-openSUSE (Version 11.1) # spec file for package epiphany-branding-openSUSE (Version 11.2)
# #
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -20,14 +20,14 @@
Name: epiphany-branding-openSUSE Name: epiphany-branding-openSUSE
License: GPL v2 or later License: GPL v2 or later
Version: 11.1 Version: 11.2
Release: 1 Release: 1
Summary: openSUSE branding of epiphany Summary: openSUSE branding of epiphany
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
# 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
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Provides: epiphany-branding = 2.22.2 Provides: epiphany-branding = 2.27.4
Conflicts: otherproviders(epiphany-branding) Conflicts: otherproviders(epiphany-branding)
Supplements: packageand(epiphany:branding-openSUSE) Supplements: packageand(epiphany:branding-openSUSE)
BuildArch: noarch BuildArch: noarch
@ -50,14 +50,9 @@ cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
%build %build
%install %install
install -d $RPM_BUILD_ROOT/%{_datadir}/epiphany/chrome/branding install -d $RPM_BUILD_ROOT/%{_datadir}/epiphany
# custom bookmarks # custom bookmarks
install -m0644 default-bookmarks.rdf $RPM_BUILD_ROOT/%{_datadir}/epiphany install -m0644 default-bookmarks.rdf $RPM_BUILD_ROOT/%{_datadir}/epiphany
# chrome branding
sed "s;\(vendorShortName *\)\"GNOME\";\1\"openSUSE\";" %{_datadir}/epiphany/chrome/branding/brand.dtd > brand.dtd
install -m0644 brand.dtd $RPM_BUILD_ROOT/%{_datadir}/epiphany/chrome/branding
sed "s;vendorShortName=GNOME;vendorShortName=openSUSE;" %{_datadir}/epiphany/chrome/branding/brand.properties > brand.properties
install -m0644 brand.properties $RPM_BUILD_ROOT/%{_datadir}/epiphany/chrome/branding
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -65,16 +60,5 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_datadir}/epiphany/default-bookmarks.rdf %{_datadir}/epiphany/default-bookmarks.rdf
%{_datadir}/epiphany/chrome/branding/*
%changelog %changelog
* Tue Nov 04 2008 vuntz@novell.com
- Bump version to 11.1. Part of bnc#440849.
* Mon Oct 06 2008 sbrabec@suse.cz
- Conflict with other branding providers (FATE#304881).
* Thu Sep 11 2008 vuntz@novell.com
- Add more openSUSE bookmarks.
- Clean up spec file.
* Tue Jul 29 2008 vuntz@novell.com
- New package.
- Add openSUSE documentation bookmark. (fate#305003)