Accepting request 355503 from GNOME:Factory

1

OBS-URL: https://build.opensuse.org/request/show/355503
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/epiphany-branding-openSUSE?expand=0&rev=33

epiphany-branding-SLED.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
 

epiphany-branding-SLED.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package epiphany-branding-SLED
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -38,13 +38,6 @@ BuildRequires:  epiphany >= 3.11.3
 # 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
-%if 0%{suse_version} > 1110
-BuildRequires:  lsb-release
-%else
-BuildRequires:  lsb
-%endif
-BuildRequires:  suse-release
-%define distro_version %(lsb_release -r -s)
 %define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
@@ -71,7 +64,28 @@ cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
 cp -a %{SOURCE0} .
 
 %build
-sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
+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

epiphany-branding-openSUSE.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
 

epiphany-branding-openSUSE.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package epiphany-branding-openSUSE
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# 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
@@ -38,13 +38,6 @@ BuildRequires:  epiphany >= 3.11.3
 # 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 >= 3.11.2
-%if 0%{suse_version} > 1110
-BuildRequires:  lsb-release
-%else
-BuildRequires:  lsb
-%endif
-BuildRequires:  suse-release
-%define distro_version %(lsb_release -r -s)
 %define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
@@ -71,7 +64,28 @@ cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
 cp -a %{SOURCE0} .
 
 %build
-sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
+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

epiphany-branding.changes.in

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+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
 

epiphany-branding.spec.in

@@ -37,13 +37,6 @@ BuildRequires:  epiphany >= 3.11.3
 # 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
-%if 0%{suse_version} > 1110
-BuildRequires:  lsb-release
-%else
-BuildRequires:  lsb
-%endif
-BuildRequires:  suse-release
-%define distro_version %(lsb_release -r -s)
 %define epiphany_version %(rpm -q --qf '%%{version}' epiphany)
 Requires:       epiphany = %{epiphany_version}
 Provides:       epiphany-branding = %{epiphany_version}
@@ -70,7 +63,28 @@ cp -a %{_datadir}/epiphany/default-bookmarks.rdf .
 cp -a %{SOURCE0} .
 
 %build
-sed "s,@distroversion@,%{distro_version},g;s,@pkgversion@,%{epiphany_version},g" %{SOURCE1} > branding.conf
+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