Accepting request 582916 from GNOME:Factory

spec-cleaner (forwarded request 581432 from dimstar)

OBS-URL: https://build.opensuse.org/request/show/582916
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/hicolor-icon-theme-branding-openSUSE?expand=0&rev=25

hicolor-icon-theme-branding-openSUSE.changes

@@ -1,3 +1,28 @@
+-------------------------------------------------------------------
+Wed Feb 28 16:33:26 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
+-------------------------------------------------------------------
+Mon Oct 23 15:53:51 UTC 2015 - zaitor@opensuse.org
+
+- Bump version to 42.1, to prepare for next version of openSUSE.
+
+-------------------------------------------------------------------
+Sat Aug 23 16:23:51 UTC 2014 - zaitor@opensuse.org
+
+- Bump version to 13.2, to prepare for next version of openSUSE.
+
+-------------------------------------------------------------------
+Sun Sep  9 07:53:51 UTC 2013 - zaitor@opensuse.org
+
+- Bump version to 13.1, to prepare for next version of openSUSE.
+
+-------------------------------------------------------------------
+Wed Jan  9 14:03:37 UTC 2013 - aj@suse.de
+
+- Update version to 12.3
+
 -------------------------------------------------------------------
 Wed May 23 07:55:13 UTC 2012 - vuntz@opensuse.org
 

hicolor-icon-theme-branding-openSUSE.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package hicolor-icon-theme-branding-openSUSE
 #
-# 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,24 +18,22 @@
 
 %define         build_openSUSE 1
 %define         build_SLED 0
-
+%define hicolor_icon_theme_version %(rpm -q --qf '%%{version}' hicolor-icon-theme)
 # Do not edit this auto generated file! Edit hicolor-icon-theme-branding.spec.in.
 Name:           hicolor-icon-theme-branding-openSUSE
-Version:        12.2
+Version:        42.1
 Release:        0
 Summary:        Fallback Icon Theme -- openSUSE Icons
-License:        GPL-2.0+
+License:        GPL-2.0-or-later
 Group:          System/X11/Utilities
-Url:            http://icon-theme.freedesktop.org/wiki/HicolorTheme
+URL:            http://icon-theme.freedesktop.org/wiki/HicolorTheme
 Source0:        suse-icon.tar.bz2
 Source1:        COPYING
 BuildRequires:  hicolor-icon-theme
-%define hicolor_icon_theme_version %(rpm -q --qf '%%{version}' hicolor-icon-theme)
 Requires:       hicolor-icon-theme = %{hicolor_icon_theme_version}
-Provides:       hicolor-icon-theme-branding = %{hicolor_icon_theme_version}
-Conflicts:      otherproviders(hicolor-icon-theme-branding)
 Supplements:    packageand(hicolor-icon-theme:branding-openSUSE)
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Conflicts:      hicolor-icon-theme-branding
+Provides:       hicolor-icon-theme-branding = %{hicolor_icon_theme_version}
 BuildArch:      noarch
 
 %description
@@ -52,12 +50,9 @@ cp -a %{SOURCE1} .
 
 %install
 for size in 16 22 32 48; do
-  install -D -m 0644 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/distributor.png
+  install -D -m 0644 suse${size}.png %{buildroot}%{_datadir}/icons/hicolor/${size}x${size}/apps/distributor.png
 done
-install -D -m 0644 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/distributor.svg
-
-%clean
-rm -rf %{buildroot}
+install -D -m 0644 suse.svg %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/distributor.svg
 
 %post
 %icon_theme_cache_post
@@ -66,8 +61,7 @@ rm -rf %{buildroot}
 %icon_theme_cache_postun
 
 %files
-%defattr(-,root,root)
-%doc COPYING
+%license COPYING
 %{_datadir}/icons/hicolor/*/*/*.*
 
 %changelog

hicolor-icon-theme-branding.changes.in

@@ -1,43 +0,0 @@
--------------------------------------------------------------------
-Wed May 23 07:55:13 UTC 2012 - vuntz@opensuse.org
-
-- Bump version to 12.2, to prepare for next version of openSUSE.
-
--------------------------------------------------------------------
-Thu Oct 13 13:00:57 UTC 2011 - vuntz@opensuse.org
-
-- Remove %{release} from the hicolor-icon-theme versioned Requires,
-  to not have to rebuild this package each time hicolor-icon-theme
-  rebuilds to keep it installable.
-
--------------------------------------------------------------------
-Wed Jul  6 15:53:20 CEST 2011 - vuntz@opensuse.org
-
-- Bump version to 12.1.
-- Add a Requires for hicolor-icon-theme, since the branding package
-  is useless without it.
-- Update summary and description.
-- Add Url tag.
-
--------------------------------------------------------------------
-Sun Feb 13 12:26:37 CET 2011 - vuntz@opensuse.org
-
-- Call relevant macros in %post/%postun:
-  + %icon_theme_cache_post/postun because the package ships themed
-    icons.
-
--------------------------------------------------------------------
-Fri Oct  8 11:51:50 CEST 2010 - vuntz@opensuse.org
-
-- Bump version to 11.4.
-
--------------------------------------------------------------------
-Fri May 14 01:07:49 CEST 2010 - ro@suse.de
-
-- rename changes file template to changes.in 
-
--------------------------------------------------------------------
-Fri Feb 12 13:34:23 CET 2010 - vuntz@opensuse.org
-
-- New package, to get a distributor logo installed in hicolor.
-

hicolor-icon-theme-branding.spec.in

@@ -1,72 +0,0 @@
-#
-# spec file for package hicolor-icon-theme-branding-%{branding_name}
-#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
-
-
-%define         build_openSUSE 0
-%define         build_SLED 0
-
-Name:           hicolor-icon-theme-branding-%{branding_name}
-License:        GPL-2.0+
-Version:        12.2
-Release:        0
-Summary:        Fallback Icon Theme -- %{branding_name} Icons
-Group:          System/X11/Utilities
-Url:            http://icon-theme.freedesktop.org/wiki/HicolorTheme
-Source0:        suse-icon.tar.bz2
-Source1:        COPYING
-BuildRequires:  hicolor-icon-theme
-%define hicolor_icon_theme_version %(rpm -q --qf '%%{version}' hicolor-icon-theme)
-Requires:       hicolor-icon-theme = %{hicolor_icon_theme_version}
-Provides:       hicolor-icon-theme-branding = %{hicolor_icon_theme_version}
-Conflicts:      otherproviders(hicolor-icon-theme-branding)
-Supplements:    packageand(hicolor-icon-theme:branding-%{branding_name})
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildArch:      noarch
-
-%description
-This is the default fallback theme used by implementations of the icon
-theme specification.
-
-This package provides %{branding_name} icons for hicolor-icon-theme.
-
-%prep
-%setup -q -c %{name}-%{version}
-cp -a %{SOURCE1} .
-
-%build
-
-%install
-for size in 16 22 32 48; do
-  install -D -m 0644 suse${size}.png $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/${size}x${size}/apps/distributor.png
-done
-install -D -m 0644 suse.svg $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/scalable/apps/distributor.svg
-
-%clean
-rm -rf %{buildroot}
-
-%post
-%icon_theme_cache_post
-
-%postun
-%icon_theme_cache_postun
-
-%files
-%defattr(-,root,root)
-%doc COPYING
-%{_datadir}/icons/hicolor/*/*/*.*
-
-%changelog

pre_checkin.sh

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-NAME=hicolor-icon-theme
-
-if ! test -f ${NAME}-branding.spec.in ; then
-    exit
-fi
-
-for variant in openSUSE ; do
-    cp ${NAME}-branding.spec.in ${NAME}-branding-${variant}.spec
-    cp ${NAME}-branding.changes.in ${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: *${NAME}-branding-${variant}/i \
-# Do not edit this auto generated file! Edit ${NAME}-branding.spec.in.
-" ${NAME}-branding-${variant}.spec
-done