Hello community,
here is the log from the commit of package gconf2-branding-openSUSE for
openSUSE:Factory checked in at 2017-07-11 08:34:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gconf2-branding-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gconf2-branding-openSUSE"
Tue Jul 11 08:34:49 2017 rev:78 rq:508190 version:42.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/gconf2-branding-openSUSE/gconf2-branding-SLED.changes
2015-10-30 21:51:11.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.gconf2-branding-openSUSE.new/gconf2-branding-SLED.changes
2017-07-11 08:34:49.855394751 +0200
@@ -1,0 +2,9 @@
+Tue Jul 4 14:51:33 UTC 2017 - [email protected]
+
+- do not build novell-sound-theme in the gconf2-branding-SLED build
+ to prevent duplicated binaries in openSUSE Leap. The
+ novell-sound-theme is taken from gconf2-branding-SLES sources on
+ both the SLED product and the SLES WE module. bsc#1046099
+- bump versions
+
+-------------------------------------------------------------------
gconf2-branding-SLES.changes: same change
gconf2-branding-openSUSE.changes: same change
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gconf2-branding-SLED.spec ++++++
--- /var/tmp/diff_new_pack.eA0JFG/_old 2017-07-11 08:34:50.647283029 +0200
+++ /var/tmp/diff_new_pack.eA0JFG/_new 2017-07-11 08:34:50.647283029 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gconf2-branding-SLED
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,15 +22,15 @@
%if %build_openSUSE
%define branding_name openSUSE
-%define pkg_version 42.1
+%define pkg_version 42.3
%endif # %%build_openSUSE
%if %build_SLED
%define branding_name SLED
-%define pkg_version 11
+%define pkg_version 12
%endif
%if %build_SLES
%define branding_name SLES
-%define pkg_version 11
+%define pkg_version 12
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
@@ -43,7 +43,7 @@
Url: http://projects.gnome.org/gconf/
Source: gconf2-branding_spec-prepare.sh
Source3: gconf2-branding-COPYING
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Novell sound theme
Source30: novell-sound-index.theme
Source31: novell-sound-desktop-login.ogg
@@ -60,7 +60,7 @@
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Sound theme
Requires: novell-sound-theme
%endif
@@ -71,11 +71,11 @@
This package provides SLED defaults for configurations based
on GConf database system.
-%if %build_SLED || %build_SLES
+%if %build_SLES
%package -n novell-sound-theme
Summary: Novell Sound Theme
-Group: System/GUI/GNOME
# the sound theme inherits from the freedesktop one
+Group: System/GUI/GNOME
Requires: sound-theme-freedesktop
%description -n novell-sound-theme
@@ -91,7 +91,7 @@
%install
#
# sound theme
-%if %build_SLED || %build_SLES
+%if %build_SLES
install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo
install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme
install -m0644 %{S:31}
$RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg
@@ -135,7 +135,7 @@
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%if %build_SLED || %build_SLES
+%if %build_SLES
%files -n novell-sound-theme
%defattr(-,root,root)
%doc COPYING
++++++ gconf2-branding-SLES.spec ++++++
--- /var/tmp/diff_new_pack.eA0JFG/_old 2017-07-11 08:34:50.671279644 +0200
+++ /var/tmp/diff_new_pack.eA0JFG/_new 2017-07-11 08:34:50.671279644 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gconf2-branding-SLES
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,15 +22,15 @@
%if %build_openSUSE
%define branding_name openSUSE
-%define pkg_version 42.1
+%define pkg_version 42.3
%endif # %%build_openSUSE
%if %build_SLED
%define branding_name SLED
-%define pkg_version 11
+%define pkg_version 12
%endif
%if %build_SLES
%define branding_name SLES
-%define pkg_version 11
+%define pkg_version 12
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
@@ -43,7 +43,7 @@
Url: http://projects.gnome.org/gconf/
Source: gconf2-branding_spec-prepare.sh
Source3: gconf2-branding-COPYING
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Novell sound theme
Source30: novell-sound-index.theme
Source31: novell-sound-desktop-login.ogg
@@ -60,7 +60,7 @@
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Sound theme
Requires: novell-sound-theme
%endif
@@ -71,11 +71,11 @@
This package provides SLES defaults for configurations based
on GConf database system.
-%if %build_SLED || %build_SLES
+%if %build_SLES
%package -n novell-sound-theme
Summary: Novell Sound Theme
-Group: System/GUI/GNOME
# the sound theme inherits from the freedesktop one
+Group: System/GUI/GNOME
Requires: sound-theme-freedesktop
%description -n novell-sound-theme
@@ -91,7 +91,7 @@
%install
#
# sound theme
-%if %build_SLED || %build_SLES
+%if %build_SLES
install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo
install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme
install -m0644 %{S:31}
$RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg
@@ -135,7 +135,7 @@
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%if %build_SLED || %build_SLES
+%if %build_SLES
%files -n novell-sound-theme
%defattr(-,root,root)
%doc COPYING
++++++ gconf2-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.eA0JFG/_old 2017-07-11 08:34:50.695276259 +0200
+++ /var/tmp/diff_new_pack.eA0JFG/_new 2017-07-11 08:34:50.695276259 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gconf2-branding-openSUSE
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -22,15 +22,15 @@
%if %build_openSUSE
%define branding_name openSUSE
-%define pkg_version 42.1
+%define pkg_version 42.3
%endif # %%build_openSUSE
%if %build_SLED
%define branding_name SLED
-%define pkg_version 11
+%define pkg_version 12
%endif
%if %build_SLES
%define branding_name SLES
-%define pkg_version 11
+%define pkg_version 12
%endif
# Do not edit this auto generated file! Edit gconf2-branding.spec.in.
@@ -43,7 +43,7 @@
Url: http://projects.gnome.org/gconf/
Source: gconf2-branding_spec-prepare.sh
Source3: gconf2-branding-COPYING
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Novell sound theme
Source30: novell-sound-index.theme
Source31: novell-sound-desktop-login.ogg
@@ -60,7 +60,7 @@
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Sound theme
Requires: novell-sound-theme
%endif
@@ -71,11 +71,11 @@
This package provides openSUSE defaults for configurations based
on GConf database system.
-%if %build_SLED || %build_SLES
+%if %build_SLES
%package -n novell-sound-theme
Summary: Novell Sound Theme
-Group: System/GUI/GNOME
# the sound theme inherits from the freedesktop one
+Group: System/GUI/GNOME
Requires: sound-theme-freedesktop
%description -n novell-sound-theme
@@ -91,7 +91,7 @@
%install
#
# sound theme
-%if %build_SLED || %build_SLES
+%if %build_SLES
install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo
install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme
install -m0644 %{S:31}
$RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg
@@ -135,7 +135,7 @@
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%if %build_SLED || %build_SLES
+%if %build_SLES
%files -n novell-sound-theme
%defattr(-,root,root)
%doc COPYING
++++++ gconf2-branding.changes.in ++++++
--- /var/tmp/diff_new_pack.eA0JFG/_old 2017-07-11 08:34:50.771265538 +0200
+++ /var/tmp/diff_new_pack.eA0JFG/_new 2017-07-11 08:34:50.771265538 +0200
@@ -1,4 +1,13 @@
-------------------------------------------------------------------
+Tue Jul 4 14:51:33 UTC 2017 - [email protected]
+
+- do not build novell-sound-theme in the gconf2-branding-SLED build
+ to prevent duplicated binaries in openSUSE Leap. The
+ novell-sound-theme is taken from gconf2-branding-SLES sources on
+ both the SLED product and the SLES WE module. bsc#1046099
+- bump versions
+
+-------------------------------------------------------------------
Mon Oct 12 15:34:23 UTC 2014 - [email protected]
- Bump version to 42.1, to prepare for next version of openSUSE.
++++++ gconf2-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.eA0JFG/_old 2017-07-11 08:34:50.795262152 +0200
+++ /var/tmp/diff_new_pack.eA0JFG/_new 2017-07-11 08:34:50.795262152 +0200
@@ -1,7 +1,7 @@
#
# spec file for package gconf2-branding-%{branding_name}
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2017 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
@@ -21,15 +21,15 @@
%if %build_openSUSE
%define branding_name openSUSE
-%define pkg_version 42.1
+%define pkg_version 42.3
%endif # %%build_openSUSE
%if %build_SLED
%define branding_name SLED
-%define pkg_version 11
+%define pkg_version 12
%endif
%if %build_SLES
%define branding_name SLES
-%define pkg_version 11
+%define pkg_version 12
%endif
Name: gconf2-branding-%{branding_name}
@@ -41,7 +41,7 @@
Url: http://projects.gnome.org/gconf/
Source: gconf2-branding_spec-prepare.sh
Source3: gconf2-branding-COPYING
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Novell sound theme
Source30: novell-sound-index.theme
Source31: novell-sound-desktop-login.ogg
@@ -58,7 +58,7 @@
#BRAND: gconf2-branding-openSUSE provides branding Look and Feel using
#BRAND: gconf schemas. All referenced files must be present in this
#BRAND: package or in required packages.
-%if %build_SLED || %build_SLES
+%if %build_SLES
# Sound theme
Requires: novell-sound-theme
%endif
@@ -69,7 +69,7 @@
This package provides %{branding_name} defaults for configurations based
on GConf database system.
-%if %build_SLED || %build_SLES
+%if %build_SLES
%package -n novell-sound-theme
Summary: Novell Sound Theme
Group: System/GUI/GNOME
@@ -89,7 +89,7 @@
%install
#
# sound theme
-%if %build_SLED || %build_SLES
+%if %build_SLES
install -d $RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo
install -m0644 %{S:30} $RPM_BUILD_ROOT%{_datadir}/sounds/novell/index.theme
install -m0644 %{S:31}
$RPM_BUILD_ROOT%{_datadir}/sounds/novell/stereo/desktop-login.ogg
@@ -133,7 +133,7 @@
%doc COPYING
%verify(not md5 size mtime) %{_sysconfdir}/gconf/gconf.xml.vendor/*
-%if %build_SLED || %build_SLES
+%if %build_SLES
%files -n novell-sound-theme
%defattr(-,root,root)
%doc COPYING
