Hello community,

here is the log from the commit of package gnome-menus-branding-openSUSE for 
openSUSE:Factory checked in at 2018-03-08 10:44:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/gnome-menus-branding-openSUSE (Old)
 and      /work/SRC/openSUSE:Factory/.gnome-menus-branding-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "gnome-menus-branding-openSUSE"

Thu Mar  8 10:44:07 2018 rev:37 rq:582735 version:42.1

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/gnome-menus-branding-openSUSE/gnome-menus-branding-SLED.changes
  2015-10-30 21:52:33.000000000 +0100
+++ 
/work/SRC/openSUSE:Factory/.gnome-menus-branding-openSUSE.new/gnome-menus-branding-SLED.changes
     2018-03-08 10:44:08.994173057 +0100
@@ -1,0 +2,5 @@
+Wed Feb 28 18:34:18 UTC 2018 - [email protected]
+
+- Modernize spec file using spec-cleaner.
+
+-------------------------------------------------------------------
gnome-menus-branding-openSUSE.changes: same change

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ gnome-menus-branding-SLED.spec ++++++
--- /var/tmp/diff_new_pack.QVV4LG/_old  2018-03-08 10:44:10.038135469 +0100
+++ /var/tmp/diff_new_pack.QVV4LG/_new  2018-03-08 10:44:10.042135325 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-menus-branding-SLED
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,15 +18,15 @@
 
 %define         build_openSUSE 0
 %define         build_SLED 1
-
+%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 # Do not edit this auto generated file! Edit gnome-menus-branding.spec.in.
 Name:           gnome-menus-branding-SLED
 Version:        42.1
 Release:        0
 Summary:        The GNOME Desktop Menu -- SLED Menus Definitions
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/GUI/GNOME
-Url:            http://www.gnome.org
+URL:            http://www.gnome.org
 Source:         gnome-menus-branding-COPYING
 # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch 
[email protected] -- Remove the desktop files with X-SuSE-YaST category from 
the Applications menu and explicitly add YaST launcher
 Patch0:         gnome-menus-branding-remove-X-SuSE-ControlCenter.patch
@@ -35,12 +35,10 @@
 # WARNING: As this package conflicts with gnome-menus-branding-SLED, you cannot
 #          reuse build root. You have to build in a clean build root every 
time!
 BuildRequires:  gnome-menus-branding-upstream
-%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 Requires:       gnome-menus = %{gnome_menus_version}
-Provides:       gnome-menus-branding = %{gnome_menus_version}
-Conflicts:      otherproviders(gnome-menus-branding)
 Supplements:    packageand(gnome-menus:branding-SLED)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Conflicts:      gnome-menus-branding
+Provides:       gnome-menus-branding = %{gnome_menus_version}
 BuildArch:      noarch
 
 %description
@@ -53,23 +51,20 @@
 
 %prep
 %setup -q -T -c %{name}-%{version}
-cp -a %{S:0} COPYING
+cp -a %{SOURCE0} COPYING
 # We will base menus on upstream menus:
 cp -a %{_sysconfdir}/xdg/menus/*.menu .
-%patch0 -p0
+%patch0
 
 %build
 
 %install
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus
-install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d %{buildroot}%{_sysconfdir}/xdg/menus
+install -m0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
 
 %files
-%defattr (-, root, root)
-%doc COPYING
+%license COPYING
+
 %{_sysconfdir}/xdg/menus/gnome-applications.menu
 
 %changelog

++++++ gnome-menus-branding-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.QVV4LG/_old  2018-03-08 10:44:10.066134461 +0100
+++ /var/tmp/diff_new_pack.QVV4LG/_new  2018-03-08 10:44:10.066134461 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package gnome-menus-branding-openSUSE
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,15 +18,15 @@
 
 %define         build_openSUSE 1
 %define         build_SLED 0
-
+%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 # Do not edit this auto generated file! Edit gnome-menus-branding.spec.in.
 Name:           gnome-menus-branding-openSUSE
 Version:        42.1
 Release:        0
 Summary:        The GNOME Desktop Menu -- openSUSE Menus Definitions
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/GUI/GNOME
-Url:            http://www.gnome.org
+URL:            http://www.gnome.org
 Source:         gnome-menus-branding-COPYING
 # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch 
[email protected] -- Remove the desktop files with X-SuSE-YaST category from 
the Applications menu and explicitly add YaST launcher
 Patch0:         gnome-menus-branding-remove-X-SuSE-ControlCenter.patch
@@ -35,12 +35,10 @@
 # WARNING: As this package conflicts with gnome-menus-branding-openSUSE, you 
cannot
 #          reuse build root. You have to build in a clean build root every 
time!
 BuildRequires:  gnome-menus-branding-upstream
-%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 Requires:       gnome-menus = %{gnome_menus_version}
-Provides:       gnome-menus-branding = %{gnome_menus_version}
-Conflicts:      otherproviders(gnome-menus-branding)
 Supplements:    packageand(gnome-menus:branding-openSUSE)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Conflicts:      gnome-menus-branding
+Provides:       gnome-menus-branding = %{gnome_menus_version}
 BuildArch:      noarch
 
 %description
@@ -53,23 +51,20 @@
 
 %prep
 %setup -q -T -c %{name}-%{version}
-cp -a %{S:0} COPYING
+cp -a %{SOURCE0} COPYING
 # We will base menus on upstream menus:
 cp -a %{_sysconfdir}/xdg/menus/*.menu .
-%patch0 -p0
+%patch0
 
 %build
 
 %install
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus
-install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d %{buildroot}%{_sysconfdir}/xdg/menus
+install -m0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
 
 %files
-%defattr (-, root, root)
-%doc COPYING
+%license COPYING
+
 %{_sysconfdir}/xdg/menus/gnome-applications.menu
 
 %changelog

++++++ gnome-menus-branding.changes.in ++++++
--- /var/tmp/diff_new_pack.QVV4LG/_old  2018-03-08 10:44:10.130132157 +0100
+++ /var/tmp/diff_new_pack.QVV4LG/_new  2018-03-08 10:44:10.134132013 +0100
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Wed Feb 28 18:34:18 UTC 2018 - [email protected]
+
+- Modernize spec file using spec-cleaner.
+
+-------------------------------------------------------------------
 Mon Oct 12 16:00:12 UTC 2015 - [email protected]
 
 - Bump version to 42.1, to prepare for next version of openSUSE.
@@ -17,7 +22,7 @@
 -------------------------------------------------------------------
 Sun Sep  8 07:43:12 UTC 2013 - [email protected]
 
-- Bump version to 13.1, to prepare for next version of openSUSE. 
+- Bump version to 13.1, to prepare for next version of openSUSE.
 
 -------------------------------------------------------------------
 Wed Mar  6 15:43:24 UTC 2013 - [email protected]

++++++ gnome-menus-branding.spec.in ++++++
--- /var/tmp/diff_new_pack.QVV4LG/_old  2018-03-08 10:44:10.158131149 +0100
+++ /var/tmp/diff_new_pack.QVV4LG/_new  2018-03-08 10:44:10.158131149 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package gnome-menus-branding-%{branding_name}
+# spec file for package gnome-menus-branding.spec
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 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
@@ -18,14 +18,14 @@
 
 %define         build_openSUSE 0
 %define         build_SLED 0
-
+%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 Name:           gnome-menus-branding-%{branding_name}
 Version:        42.1
 Release:        0
-Group:          System/GUI/GNOME
-License:        LGPL-2.1+
 Summary:        The GNOME Desktop Menu -- %{branding_name} Menus Definitions
-Url:            http://www.gnome.org
+License:        LGPL-2.1-or-later
+Group:          System/GUI/GNOME
+URL:            http://www.gnome.org
 Source:         gnome-menus-branding-COPYING
 # PATCH-FIX-OPENSUSE gnome-menus-branding-remove-X-SuSE-ControlCenter.patch 
[email protected] -- Remove the desktop files with X-SuSE-YaST category from 
the Applications menu and explicitly add YaST launcher
 Patch0:         gnome-menus-branding-remove-X-SuSE-ControlCenter.patch
@@ -34,12 +34,10 @@
 # WARNING: As this package conflicts with 
gnome-menus-branding-%{branding_name}, you cannot
 #          reuse build root. You have to build in a clean build root every 
time!
 BuildRequires:  gnome-menus-branding-upstream
-%define gnome_menus_version %(rpm -q --qf '%%{version}' gnome-menus)
 Requires:       gnome-menus = %{gnome_menus_version}
-Provides:       gnome-menus-branding = %{gnome_menus_version}
-Conflicts:      otherproviders(gnome-menus-branding)
 Supplements:    packageand(gnome-menus:branding-%{branding_name})
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Conflicts:      gnome-menus-branding
+Provides:       gnome-menus-branding = %{gnome_menus_version}
 BuildArch:      noarch
 
 %description
@@ -52,23 +50,20 @@
 
 %prep
 %setup -q -T -c %{name}-%{version}
-cp -a %{S:0} COPYING
+cp -a %{SOURCE0} COPYING
 # We will base menus on upstream menus:
 cp -a %{_sysconfdir}/xdg/menus/*.menu .
-%patch0 -p0
+%patch0
 
 %build
 
 %install
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus
-install -m0644 *.menu $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus/
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+install -d %{buildroot}%{_sysconfdir}/xdg/menus
+install -m0644 *.menu %{buildroot}%{_sysconfdir}/xdg/menus/
 
 %files
-%defattr (-, root, root)
-%doc COPYING
+%license COPYING
+
 %{_sysconfdir}/xdg/menus/gnome-applications.menu
 
 %changelog


Reply via email to