commit epiphany-branding-openSUSE for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package epiphany-branding-openSUSE for openSUSE:Factory checked in at 2016-01-28 17:22:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/epiphany-branding-openSUSE (Old) and /work/SRC/openSUSE:Factory/.epiphany-branding-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "epiphany-branding-openSUSE" Changes: -------- --- /work/SRC/openSUSE:Factory/epiphany-branding-openSUSE/epiphany-branding-SLED.changes 2015-10-30 13:43:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.epiphany-branding-openSUSE.new/epiphany-branding-SLED.changes 2016-01-28 17:22:44.000000000 +0100 @@ -1,0 +2,14 @@ +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. + +------------------------------------------------------------------- epiphany-branding-openSUSE.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ epiphany-branding-SLED.spec ++++++ --- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100 +++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100 @@ -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 @@ # 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 %{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.spec: same change ++++++ epiphany-branding.changes.in ++++++ --- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100 +++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +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. ++++++ epiphany-branding.spec.in ++++++ --- /var/tmp/diff_new_pack.bLCwb7/_old 2016-01-28 17:22:45.000000000 +0100 +++ /var/tmp/diff_new_pack.bLCwb7/_new 2016-01-28 17:22:45.000000000 +0100 @@ -37,13 +37,6 @@ # 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 %{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
participants (1)
-
root@hilbert.suse.de