From 210f7090701dfdc291b8e4165b7d70f7d26bb6dd9b6abc6d372ec9c9cf361daa Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 16 Jan 2010 02:16:15 +0000 Subject: [PATCH] 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 --- epiphany-branding-SLED.changes | 4 ++-- epiphany-branding-SLED.spec | 6 +++--- epiphany-branding-openSUSE.changes | 4 ++-- epiphany-branding-openSUSE.spec | 4 ++-- epiphany-branding.changes | 4 ++-- epiphany-branding.spec.in | 6 +++--- pre_checkin.sh | 18 ++++++++++-------- 7 files changed, 24 insertions(+), 22 deletions(-) diff --git a/epiphany-branding-SLED.changes b/epiphany-branding-SLED.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding-SLED.changes +++ b/epiphany-branding-SLED.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - 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 openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-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 diff --git a/epiphany-branding-SLED.spec b/epiphany-branding-SLED.spec index c8e1976..686240f 100644 --- a/epiphany-branding-SLED.spec +++ b/epiphany-branding-SLED.spec @@ -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. # @@ -31,17 +31,17 @@ 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 # 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 +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: SLED-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding-openSUSE.changes b/epiphany-branding-openSUSE.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding-openSUSE.changes +++ b/epiphany-branding-openSUSE.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - 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 openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-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 diff --git a/epiphany-branding-openSUSE.spec b/epiphany-branding-openSUSE.spec index 68b0a43..9ad1eaf 100644 --- a/epiphany-branding-openSUSE.spec +++ b/epiphany-branding-openSUSE.spec @@ -31,17 +31,17 @@ 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 # 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! BuildRequires: epiphany-branding-upstream +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: openSUSE-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/epiphany-branding.changes b/epiphany-branding.changes index 1d3fbcf..36ba7b2 100644 --- a/epiphany-branding.changes +++ b/epiphany-branding.changes @@ -7,8 +7,8 @@ Fri Jan 15 03:58:43 CET 2010 - vuntz@opensuse.org - 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 openSUSE-release to get the - version of the distribution, to put in the user agent. +- Add BuildRequires on lsb-release and distribution-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 diff --git a/epiphany-branding.spec.in b/epiphany-branding.spec.in index d2ebb48..5c21b15 100644 --- a/epiphany-branding.spec.in +++ b/epiphany-branding.spec.in @@ -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. # @@ -30,17 +30,17 @@ 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 # 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 +BuildRequires: epiphany %if 0%{suse_version} > 1110 BuildRequires: lsb-release %else BuildRequires: lsb %endif -BuildRequires: %{branding_name}-release +BuildRequires: distribution-release %define distro_version %(lsb_release -r -s) %define epiphany_version %(rpm -q --qf '%%{version}-%%{release}' epiphany) Provides: epiphany-branding = %{epiphany_version} diff --git a/pre_checkin.sh b/pre_checkin.sh index 4ffacbe..8271b43 100644 --- a/pre_checkin.sh +++ b/pre_checkin.sh @@ -1,16 +1,18 @@ #!/bin/sh -if ! test -f epiphany-branding.spec.in ; then +NAME=epiphany + +if ! test -f ${NAME}-branding.spec.in ; then exit fi for variant in openSUSE SLED ; do - cp epiphany-branding.spec.in epiphany-branding-${variant}.spec - cp epiphany-branding.changes epiphany-branding-${variant}.changes - sed -i "s/%{branding_name}/${variant}/g" epiphany-branding-${variant}.spec - sed -i "s/\(%define *build_${variant} *\)0/\11/" epiphany-branding-${variant}.spec + cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec + cp ${NAME}-branding.changes ${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: *epiphany-branding-${variant}/i \ -# Do not edit this auto generated file! Edit epiphany-branding.spec.in. -" epiphany-branding-${variant}.spec + /^Name: *${NAME}-branding-${variant}/i \ +# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in. +" ${NAME}-branding-${variant}.spec done