Accepting request 29778 from home:vuntz:branches:GNOME:Factory
Copy from home:vuntz:branches:GNOME:Factory/epiphany-branding-openSUSE via accept of submit request 29778 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/29778 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/epiphany-branding-openSUSE?expand=0&rev=16
This commit is contained in:
parent
9a79e22a90
commit
210f709070
@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org
|
|||||||
- Add COPYING file.
|
- Add COPYING file.
|
||||||
- Add branding.conf.in: with a recent epiphany, we can change the
|
- Add branding.conf.in: with a recent epiphany, we can change the
|
||||||
user agent with a simple file.
|
user agent with a simple file.
|
||||||
- Add BuildRequires on lsb-release and openSUSE-release to get the
|
- Add BuildRequires on lsb-release and distribution-release to get
|
||||||
version of the distribution, to put in the user agent.
|
the version of the distribution, to put in the user agent.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package epiphany-branding-openSUSE (Version 11.3)
|
# spec file for package epiphany-branding-SLED (Version 11.3)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -31,17 +31,17 @@ Source1: branding.conf.in
|
|||||||
Patch0: opensuse-bookmarks.patch
|
Patch0: opensuse-bookmarks.patch
|
||||||
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
||||||
Patch1: sled-bookmarks.patch
|
Patch1: sled-bookmarks.patch
|
||||||
BuildRequires: epiphany
|
|
||||||
# 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-SLED, you cannot
|
# 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!
|
# reuse build root. You have to build in a clean build root every time!
|
||||||
BuildRequires: epiphany-branding-upstream
|
BuildRequires: epiphany-branding-upstream
|
||||||
|
BuildRequires: epiphany
|
||||||
%if 0%{suse_version} > 1110
|
%if 0%{suse_version} > 1110
|
||||||
BuildRequires: lsb-release
|
BuildRequires: lsb-release
|
||||||
%else
|
%else
|
||||||
BuildRequires: lsb
|
BuildRequires: lsb
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: SLED-release
|
BuildRequires: distribution-release
|
||||||
%define distro_version %(lsb_release -r -s)
|
%define distro_version %(lsb_release -r -s)
|
||||||
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
||||||
Provides: epiphany-branding = %{epiphany_version}
|
Provides: epiphany-branding = %{epiphany_version}
|
||||||
|
@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org
|
|||||||
- Add COPYING file.
|
- Add COPYING file.
|
||||||
- Add branding.conf.in: with a recent epiphany, we can change the
|
- Add branding.conf.in: with a recent epiphany, we can change the
|
||||||
user agent with a simple file.
|
user agent with a simple file.
|
||||||
- Add BuildRequires on lsb-release and openSUSE-release to get the
|
- Add BuildRequires on lsb-release and distribution-release to get
|
||||||
version of the distribution, to put in the user agent.
|
the version of the distribution, to put in the user agent.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
||||||
|
@ -31,17 +31,17 @@ Source1: branding.conf.in
|
|||||||
Patch0: opensuse-bookmarks.patch
|
Patch0: opensuse-bookmarks.patch
|
||||||
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
||||||
Patch1: sled-bookmarks.patch
|
Patch1: sled-bookmarks.patch
|
||||||
BuildRequires: epiphany
|
|
||||||
# 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!
|
||||||
BuildRequires: epiphany-branding-upstream
|
BuildRequires: epiphany-branding-upstream
|
||||||
|
BuildRequires: epiphany
|
||||||
%if 0%{suse_version} > 1110
|
%if 0%{suse_version} > 1110
|
||||||
BuildRequires: lsb-release
|
BuildRequires: lsb-release
|
||||||
%else
|
%else
|
||||||
BuildRequires: lsb
|
BuildRequires: lsb
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: openSUSE-release
|
BuildRequires: distribution-release
|
||||||
%define distro_version %(lsb_release -r -s)
|
%define distro_version %(lsb_release -r -s)
|
||||||
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
||||||
Provides: epiphany-branding = %{epiphany_version}
|
Provides: epiphany-branding = %{epiphany_version}
|
||||||
|
@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org
|
|||||||
- Add COPYING file.
|
- Add COPYING file.
|
||||||
- Add branding.conf.in: with a recent epiphany, we can change the
|
- Add branding.conf.in: with a recent epiphany, we can change the
|
||||||
user agent with a simple file.
|
user agent with a simple file.
|
||||||
- Add BuildRequires on lsb-release and openSUSE-release to get the
|
- Add BuildRequires on lsb-release and distribution-release to get
|
||||||
version of the distribution, to put in the user agent.
|
the version of the distribution, to put in the user agent.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
Wed Aug 26 12:53:54 CEST 2009 - mls@suse.de
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# spec file for package epiphany-branding-openSUSE (Version 11.3)
|
# spec file for package epiphany-branding-%{branding_name} (Version 11.3)
|
||||||
#
|
#
|
||||||
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||||
#
|
#
|
||||||
@ -30,17 +30,17 @@ Source1: branding.conf.in
|
|||||||
Patch0: opensuse-bookmarks.patch
|
Patch0: opensuse-bookmarks.patch
|
||||||
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
# PATCH-FEATURE-SLED sled-bookmarks.patch vuntz@novell.com -- Add SLED bookmarks
|
||||||
Patch1: sled-bookmarks.patch
|
Patch1: sled-bookmarks.patch
|
||||||
BuildRequires: epiphany
|
|
||||||
# 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-%{branding_name}, you cannot
|
# 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!
|
# reuse build root. You have to build in a clean build root every time!
|
||||||
BuildRequires: epiphany-branding-upstream
|
BuildRequires: epiphany-branding-upstream
|
||||||
|
BuildRequires: epiphany
|
||||||
%if 0%{suse_version} > 1110
|
%if 0%{suse_version} > 1110
|
||||||
BuildRequires: lsb-release
|
BuildRequires: lsb-release
|
||||||
%else
|
%else
|
||||||
BuildRequires: lsb
|
BuildRequires: lsb
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: %{branding_name}-release
|
BuildRequires: distribution-release
|
||||||
%define distro_version %(lsb_release -r -s)
|
%define distro_version %(lsb_release -r -s)
|
||||||
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
%define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany)
|
||||||
Provides: epiphany-branding = %{epiphany_version}
|
Provides: epiphany-branding = %{epiphany_version}
|
||||||
|
@ -1,16 +1,18 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if ! test -f epiphany-branding.spec.in ; then
|
NAME=epiphany
|
||||||
|
|
||||||
|
if ! test -f ${NAME}-branding.spec.in ; then
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for variant in openSUSE SLED ; do
|
for variant in openSUSE SLED ; do
|
||||||
cp epiphany-branding.spec.in epiphany-branding-${variant}.spec
|
cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec
|
||||||
cp epiphany-branding.changes epiphany-branding-${variant}.changes
|
cp ${NAME}-branding.changes ${NAME}-branding-${variant}.changes
|
||||||
sed -i "s/%{branding_name}/${variant}/g" epiphany-branding-${variant}.spec
|
sed -i "s/%{branding_name}/${variant}/g" ${NAME}-branding-${variant}.spec
|
||||||
sed -i "s/\(%define *build_${variant} *\)0/\11/" epiphany-branding-${variant}.spec
|
sed -i "s/\(%define *build_${variant} *\)0/\11/" ${NAME}-branding-${variant}.spec
|
||||||
sed -i "
|
sed -i "
|
||||||
/^Name: *epiphany-branding-${variant}/i \
|
/^Name: *${NAME}-branding-${variant}/i \
|
||||||
# Do not edit this auto generated file! Edit epiphany-branding.spec.in.
|
# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in.
|
||||||
" epiphany-branding-${variant}.spec
|
" ${NAME}-branding-${variant}.spec
|
||||||
done
|
done
|
||||||
|
Loading…
Reference in New Issue
Block a user