Hello community,
here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2019-11-11 21:38:10
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old)
and /work/SRC/openSUSE:Factory/.spec-cleaner.new.2990 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner"
Mon Nov 11 21:38:10 2019 rev:60 rq:747377 version:1.1.6
Changes:
--------
--- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2019-09-26 20:43:57.582105525 +0200
+++ /work/SRC/openSUSE:Factory/.spec-cleaner.new.2990/spec-cleaner.changes 2019-11-11 21:38:11.584648635 +0100
@@ -1,0 +2,12 @@
+Mon Nov 11 14:39:28 UTC 2019 - Kristyna Streitova
+
+- Update to 1.1.6 bsc#1099674:
+ * Do not remove groups by default. Now, groups are kept untouched
+ by default. Introduce a new option '--remove-groups' that
+ removes Group tags from the specfile. Remove '--preserve_groups'
+ option.
+ * Say goodbye to setup.py test usage as it is deprecated
+ * Update the copyring and SUSE header string wrt #264
+ * Ignore hpc_configure macro from bracketing
+
+-------------------------------------------------------------------
Old:
----
spec-cleaner-1.1.5.tar.gz
New:
----
spec-cleaner-1.1.6.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spec-cleaner.spec ++++++
--- /var/tmp/diff_new_pack.EwvKkZ/_old 2019-11-11 21:38:12.012649059 +0100
+++ /var/tmp/diff_new_pack.EwvKkZ/_new 2019-11-11 21:38:12.016649063 +0100
@@ -18,7 +18,7 @@
Name: spec-cleaner
-Version: 1.1.5
+Version: 1.1.6
Release: 0
Summary: .spec file cleaner
License: BSD-3-Clause
++++++ spec-cleaner-1.1.5.tar.gz -> spec-cleaner-1.1.6.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/AUTHORS new/spec-cleaner-spec-cleaner-1.1.6/AUTHORS
--- old/spec-cleaner-spec-cleaner-1.1.5/AUTHORS 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/AUTHORS 2019-11-11 15:21:21.000000000 +0100
@@ -1,7 +1,8 @@
-Martin Pluskal
-Michal Hrusecky
-Pavol Rusnak
-Petr Uzel
-Tomas Cech
-Tomas Chvatal
-Vincent Untz
+Kristyna Streitova
+Martin Pluskal
+Michal Hrusecky
+Pavol Rusnak
+Petr Uzel
+Tomas Cech
+Tomas Chvatal
+Vincent Untz
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/README.md new/spec-cleaner-spec-cleaner-1.1.6/README.md
--- old/spec-cleaner-spec-cleaner-1.1.5/README.md 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/README.md 2019-11-11 15:21:21.000000000 +0100
@@ -178,7 +178,7 @@
CECILL-2.1 | CeCILL Free Software License Agreement v2.1
CECILL-B | CeCILL-B Free Software License Agreement
CECILL-C | CeCILL-C Free Software License Agreement
-CERN-OHL-1.1 | CERN Open Hardware License v1.1
+CERN-OHL-1.1 | CERN Open Hardware Licence v1.1
CERN-OHL-1.2 | CERN Open Hardware Licence v1.2
ClArtistic | Clarified Artistic License
CNRI-Jython | CNRI Jython License
@@ -210,6 +210,7 @@
EPL-1.0 | Eclipse Public License 1.0
EPL-2.0 | Eclipse Public License 2.0
ErlPL-1.1 | Erlang Public License v1.1
+etalab-2.0 | Etalab Open License 2.0
EUDatagrid | EU DataGrid Software License
EUPL-1.0 | European Union Public License 1.0
EUPL-1.1 | European Union Public License 1.1
@@ -285,7 +286,7 @@
LPPL-1.3a | LaTeX Project Public License v1.3a
LPPL-1.3c | LaTeX Project Public License v1.3c
MakeIndex | MakeIndex License
-MirOS | MirOS License
+MirOS | The MirOS Licence
MIT | MIT License
MIT-0 | MIT No Attribution
MIT-advertising | Enlightenment License (e16)
@@ -302,6 +303,7 @@
MS-PL | Microsoft Public License
MS-RL | Microsoft Reciprocal License
MTLL | Matrix Template Library License
+MulanPSL-1.0 | Mulan Permissive Software License, Version 1
Multics | Multics License
Mup | Mup License
NASA-1.3 | NASA Open Source Agreement 1.3
@@ -328,6 +330,7 @@
ODC-By-1.0 | Open Data Commons Attribution License v1.0
OFL-1.0 | SIL Open Font License 1.0
OFL-1.1 | SIL Open Font License 1.1
+OGL-Canada-2.0 | Open Government Licence - Canada
OGL-UK-1.0 | Open Government Licence v1.0
OGL-UK-2.0 | Open Government Licence v2.0
OGL-UK-3.0 | Open Government Licence v3.0
@@ -397,6 +400,8 @@
Spencer-94 | Spencer License 94
Spencer-99 | Spencer License 99
SPL-1.0 | Sun Public License v1.0
+SSH-OpenSSH | SSH OpenSSH license
+SSH-short | SSH short notice
SSPL-1.0 | Server Side Public License, v 1
SugarCRM-1.1.3 | SugarCRM Public License v1.1.3
SWL | Scheme Widget Library (SWL) Software License Agreement
@@ -408,6 +413,7 @@
TOSL | Trusster Open Source License
TU-Berlin-1.0 | Technische Universitaet Berlin License 1.0
TU-Berlin-2.0 | Technische Universitaet Berlin License 2.0
+UCL-1.0 | Upstream Compatibility License v1.0
Unicode-DFS-2015 | Unicode License Agreement - Data Files and Software (2015)
Unicode-DFS-2016 | Unicode License Agreement - Data Files and Software (2016)
Unicode-TOU | Unicode Terms of Use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-1.1.6/data/excludes-bracketing.txt
--- old/spec-cleaner-spec-cleaner-1.1.5/data/excludes-bracketing.txt 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/data/excludes-bracketing.txt 2019-11-11 15:21:21.000000000 +0100
@@ -53,6 +53,7 @@
global
gpg_verify
hpc_setup
+hpc_configure
hpc_write_modules_files
icon_theme_cache_post[^\s]*
icon_theme_cache_create_ghost
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/data/licenses_changes.txt new/spec-cleaner-spec-cleaner-1.1.6/data/licenses_changes.txt
--- old/spec-cleaner-spec-cleaner-1.1.5/data/licenses_changes.txt 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/data/licenses_changes.txt 2019-11-11 15:21:21.000000000 +0100
@@ -645,6 +645,8 @@
MirOS+ MirOS+
Motosoto Motosoto
Motosoto+ Motosoto+
+MulanPSL-1.0 MulanPSL-1.0
+MulanPSL-1.0+ MulanPSL-1.0+
Multics Multics
Multics+ Multics+
Mup Mup
@@ -704,6 +706,8 @@
OFL-1.1 SIL Open Font License
OFL-1.1 SIL Open Font License 1.1
OFL-1.1+ OFL-1.1+
+OGL-Canada-2.0 OGL-Canada-2.0
+OGL-Canada-2.0+ OGL-Canada-2.0+
OGL-UK-1.0 OGL-UK-1.0
OGL-UK-1.0+ OGL-UK-1.0+
OGL-UK-2.0 OGL-UK-2.0
@@ -841,6 +845,10 @@
SNIA+ SNIA+
SPL-1.0 SPL-1.0
SPL-1.0+ SPL-1.0+
+SSH-OpenSSH SSH-OpenSSH
+SSH-OpenSSH+ SSH-OpenSSH+
+SSH-short SSH-short
+SSH-short+ SSH-short+
SSPL-1.0 SSPL-1.0
SSPL-1.0+ SSPL-1.0+
SUSE-Arphic SUSE-Arphic
@@ -1123,6 +1131,8 @@
TU-Berlin-1.0+ TU-Berlin-1.0+
TU-Berlin-2.0 TU-Berlin-2.0
TU-Berlin-2.0+ TU-Berlin-2.0+
+UCL-1.0 UCL-1.0
+UCL-1.0+ UCL-1.0+
UPL-1.0 UPL-1.0
UPL-1.0+ UPL-1.0+
Unicode http://www.unicode.org/copyright.html
@@ -1216,6 +1226,8 @@
dvipdfm+ dvipdfm+
eGenix eGenix
eGenix+ eGenix+
+etalab-2.0 etalab-2.0
+etalab-2.0+ etalab-2.0+
gSOAP-1.3b gSOAP-1.3b
gSOAP-1.3b+ gSOAP-1.3b+
gnuplot gnuplot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/devel-requirements.pip new/spec-cleaner-spec-cleaner-1.1.6/devel-requirements.pip
--- old/spec-cleaner-spec-cleaner-1.1.5/devel-requirements.pip 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/devel-requirements.pip 2019-11-11 15:21:21.000000000 +0100
@@ -1,5 +1,5 @@
# Pip Requirement file for development
pytest
-pytest-runner
pytest-cov
+pytest-xdist
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/setup.py new/spec-cleaner-spec-cleaner-1.1.6/setup.py
--- old/spec-cleaner-spec-cleaner-1.1.5/setup.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/setup.py 2019-11-11 15:21:21.000000000 +0100
@@ -28,7 +28,6 @@
],
platforms=['Linux'],
keywords=['SUSE', 'RPM', '.spec', 'cleaner'],
- setup_requires=['pytest-runner'],
tests_require=['pytest', 'pytest-cov', 'pytest-xdist'],
packages=['spec_cleaner'],
data_files=[('lib/obs/service/', glob('obs/*')), ('share/spec-cleaner', glob('data/*'))],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/__init__.py
--- old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/__init__.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/__init__.py 2019-11-11 15:21:21.000000000 +0100
@@ -14,7 +14,7 @@
from .rpmexception import RpmException, RpmWrongArgs
-__version__ = '1.1.5'
+__version__ = '1.1.6'
def process_args(argv: List[str]) -> Dict[str, Any]:
@@ -60,7 +60,7 @@
)
parser.add_argument('--no-copyright', action='store_true', help='do not include official SUSE copyright hear and just keep what is present')
parser.add_argument('--libexecdir', action='store_true', help='convert /usr/lib to %%{_libexecdir}')
- parser.add_argument('--preserve-groups', action='store_true', help='validate group tags instead of removing them')
+ parser.add_argument('--remove-groups', action='store_true', help='remove groups from the specfile.')
parser.add_argument(
'--copyright-year',
metavar='YYYY',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcleaner.py
--- old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmcleaner.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcleaner.py 2019-11-11 15:21:21.000000000 +0100
@@ -92,10 +92,10 @@
if self.options['perl']:
self.options['perl_conversions'] = read_perl_changes()
self.options['license_conversions'] = read_licenses_changes()
- if self.options['preserve_groups']:
- self.options['allowed_groups'] = read_group_changes()
- else:
+ if self.options['remove_groups']:
self.options['allowed_groups'] = None
+ else:
+ self.options['allowed_groups'] = read_group_changes()
self.options['reg'] = Regexp(self.options['unbrace_keywords'])
# If gvim is used for the diff then run it in foreground mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmcopyright.py new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcopyright.py
--- old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmcopyright.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcopyright.py 2019-11-11 15:21:21.000000000 +0100
@@ -36,7 +36,7 @@
)
def _create_default_copyright(self):
- self.my_copyright = '# Copyright (c) {0} SUSE LINUX GmbH, Nuernberg, Germany.'.format(self.year)
+ self.my_copyright = '# Copyright (c) {0} SUSE LLC'.format(self.year)
def _add_copyright(self):
self._create_default_copyright()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmpreamble.py
--- old/spec-cleaner-spec-cleaner-1.1.5/spec_cleaner/rpmpreamble.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmpreamble.py 2019-11-11 15:21:21.000000000 +0100
@@ -60,6 +60,8 @@
self.tex = options['tex']
# are we supposed to keep empty lines intact?
self.keep_space = options['keep_space']
+ # do we want to remove groups from the specfile?
+ self.remove_groups = options['remove_groups']
# dict of license replacement options
self.license_conversions = options['license_conversions']
# dict of pkgconfig and other conversions
@@ -557,18 +559,19 @@
return
elif self.reg.re_group.match(line):
- # if we do not have list of groups we are removing them in non
- # minimal mode
- if not self.minimal and not self.allowed_groups:
+ # remove groups if requested
+ if not self.minimal and self.remove_groups:
return
- # otherwise we scan up and warn if the group does not match allowed
- # list of groups
+ # validate (if we have a list of groups)
match = self.reg.re_group.match(line)
value = match.group(1)
- if not self.minimal:
- if self.previous_line and not self.previous_line.startswith('# FIXME') and value not in self.allowed_groups:
- self.paragraph.current_group.append('# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"')
+ if not self.minimal and self.allowed_groups:
+ if self.previous_line and not self.previous_line.startswith(
+ '# FIXME') and value not in self.allowed_groups:
+ self.paragraph.current_group.append(
+ '# FIXME: use correct group or remove it,'
+ ' see "https://en.opensuse.org/openSUSE:Package_group_guidelines"')
self._add_line_value_to('group', value)
return
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/acceptance-tests.py new/spec-cleaner-spec-cleaner-1.1.6/tests/acceptance-tests.py
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/acceptance-tests.py 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/acceptance-tests.py 2019-11-11 15:21:21.000000000 +0100
@@ -51,7 +51,7 @@
'no_copyright': True,
'libexecdir': True,
'copyright_year': 2013,
- 'preserve_groups': False,
+ 'remove_groups': False,
'tex': False,
'perl': False,
'cmake': False,
@@ -151,7 +151,7 @@
('tex.spec', 'tex', {'tex': True}),
('perl.spec', 'perl', {'perl': True}),
('cmake.spec', 'cmake', {'cmake': True}),
- ('langpackage.spec', 'group', {'preserve_groups': True}),
+ ('langpackage.spec', 'group', {'remove_groups': True}),
],
)
def test_single_output(self, tmpfile, test, compare_dir, options):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/group/langpackage.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/group/langpackage.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/group/langpackage.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/group/langpackage.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,24 +1,17 @@
%package -n something-lang
# FIXME: consider using %%lang_package macro
Summary: Something
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group: Whatever
%package lang
# FIXME: consider using %%lang_package macro
Summary: Something
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group: Whatever
%package lang
# I have reason not to convert this to lang macro
Summary: Something
-# FIXME: use correct group, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
-Group: Whatever
%package -n %{_name}
Summary: Evolution Plugin for RSS Feeds Support
-Group: Productivity/Networking/Email/Clients
Recommends: %{_name}-lang
Provides: %{name} = %{version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/header/header.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/header/header.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/header/header.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/header/header.spec 2019-11-11 15:21:21.000000000 +0100
@@ -2,7 +2,7 @@
#
# spec file for package header
#
-# Copyright (c) 2013 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LLC
# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
#
# All modifications and additions to the file contributed by third parties
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/conditionalpkgs.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/conditionalpkgs.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/conditionalpkgs.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/conditionalpkgs.spec 2019-11-11 15:21:21.000000000 +0100
@@ -33,6 +33,7 @@
%if %{worker}
%package worker
Summary: Apache 2 worker MPM (Multi-Processing Module)
+Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}
Provides: %{pname}-MPM
%endif
@@ -40,6 +41,7 @@
%if %{prefork}
%package prefork
Summary: Apache 2 "prefork" MPM (Multi-Processing Module)
+Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}
Provides: %{pname}-MPM
%if 0%{?suse_version} >= 901 && 0%{?sles_version} != 9
@@ -50,6 +52,7 @@
%if %{event}
%package event
Summary: Apache 2 event MPM (Multi-Processing Module)
+Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}
Provides: %{pname}-MPM
%endif
@@ -57,6 +60,7 @@
%if %{itk}
%package itk
Summary: Apache 2 "ITK" MPM (Multi-Processing Module)
+Group: Productivity/Networking/Web/Servers
Requires: %{name} = %{version}
Provides: %{pname}-MPM
%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/conditions.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/conditions.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/conditions.spec 2019-11-11 15:21:21.000000000 +0100
@@ -6,6 +6,7 @@
Version: 2.8.2
Summary: AppArmor userlevel parser utility
License: GPL-2.0-or-later
+Group: Productivity/Networking/Security
Source0: apparmor-%{version}.tar.gz
Source1: apparmor-%{version}.tar.gz.asc
Source2: %{name}.keyring
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/enhances.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/enhances.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/enhances.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/enhances.spec 2019-11-11 15:21:21.000000000 +0100
@@ -3,6 +3,7 @@
Release: 0
Summary: Feed entropy into random pool
License: GPL-2.0-or-later
+Group: System/Daemons
Enhances: smtp_daemon
Supplements: packageand(%{name}:nautilus}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/interestingheader.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/interestingheader.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/interestingheader.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/interestingheader.spec 2019-11-11 15:21:21.000000000 +0100
@@ -8,6 +8,7 @@
Summary: .spec file cleaner
Summary(de): Ein Synthesizer der dritten Art
License: GPL-2.0-or-later
+Group: Productivity/Multimedia/Sound/Midi
URL: http://www.dinisnoise.org/
Source: %{name}-%{version}.tar.bz2
Source1: %{name}.png
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/langpackage.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/langpackage.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/langpackage.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/langpackage.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,17 +1,24 @@
%package -n something-lang
# FIXME: consider using %%lang_package macro
Summary: Something
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
+Group: Whatever
%package lang
# FIXME: consider using %%lang_package macro
Summary: Something
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
+Group: Whatever
%package lang
# I have reason not to convert this to lang macro
Summary: Something
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
+Group: Whatever
%package -n %{_name}
Summary: Evolution Plugin for RSS Feeds Support
+Group: Productivity/Networking/Email/Clients
Recommends: %{_name}-lang
Provides: %{name} = %{version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/mingw32-clutter.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/mingw32-clutter.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/mingw32-clutter.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/mingw32-clutter.spec 2019-11-11 15:21:21.000000000 +0100
@@ -22,6 +22,8 @@
Release: 0
Summary: The clutter library
License: LGPL-2.1-or-later
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
+Group: Development/Libraries
URL: http://clutter-project.org/
Source: http://www.clutter-project.org/sources/clutter/1.5/clutter-%{version}.tar.bz2
Patch0: clutter-1.6.14-windows.patch
@@ -63,6 +65,7 @@
%package -n mingw32-libclutter-win32-1_0-0
Summary: MinGW Windows port of the Clutter library
+Group: System/Libraries
Obsoletes: mingw32-clutter
Provides: mingw32-clutter
@@ -73,6 +76,8 @@
%package devel
Summary: The clutter library (Development)
+# FIXME: use correct group or remove it, see "https://en.opensuse.org/openSUSE:Package_group_guidelines"
+Group: Development/Libraries
Requires: mingw32-glee-devel
%description devel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/patterns.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/patterns.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/patterns.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/patterns.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,6 +1,7 @@
%package dhcp_dns_server
%pattern_serverfunctions
Summary: DHCP and DNS Server
+Group: Metapackages
Provides: pattern() = dhcp_dns_server
Provides: pattern-icon() = yast-dns-server
Provides: pattern-order() = 3040
@@ -15,6 +16,7 @@
%package devel_gnome
%pattern_development
Summary: GNOME Development
+Group: Metapackages
Provides: pattern() = devel_gnome
Provides: pattern-icon() = pattern-gnome-devel
# Don't freely assign order values, contact release managers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/providesobsoletes.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/providesobsoletes.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/providesobsoletes.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/providesobsoletes.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,5 +1,6 @@
%package -n %{libname}
Summary: Library for Importing WordPerfect (tm) Documents
+Group: System/Libraries
Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang)
Obsoletes: NetworkManager-lang < %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang)
# remove the old non-versioned package (built in the bs for instance)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/replace_pwdutils.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/replace_pwdutils.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/replace_pwdutils.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/replace_pwdutils.spec 2019-11-11 15:21:21.000000000 +0100
@@ -3,6 +3,7 @@
Release: 0
Summary: A Job Manager
License: GPL-2.0-or-later
+Group: System/Daemons
URL: http://ftp.debian.org/debian/pool/main/a/at
Source: http://ftp.debian.org/debian/pool/main/a/at/%{name}_%{version}.orig.tar.gz
BuildRequires: autoconf >= 2.69
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/rpmcallpkg.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/rpmcallpkg.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/rpmcallpkg.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/rpmcallpkg.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,6 +1,7 @@
%if %{with kde4}
%package -n %{name}-client-kde4
Summary: KDE 4 Backend for sflphone
+Group: Productivity/Telephony/SIP/Clients
Requires: %{name} = %{version}-%{release}
# For building with KDE 4.12
# % kde4_akonadi_requires == "Requires: akonadi-runtime >= 1.10.2 akonadi-runtime < 1.10.40" (on openSUSE 13.1)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/rpmpreamble.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/rpmpreamble.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/rpmpreamble.spec 2019-11-11 15:21:21.000000000 +0100
@@ -23,6 +23,7 @@
Release: 0
Summary: Small Embeddable HTTP Server Library
License: LGPL-2.1-or-later
+Group: Productivity/Networking/Web/Servers
URL: https://www.gnu.org/software/libmicrohttpd/
Source0: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Source1: http://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
@@ -70,12 +71,14 @@
%package -n %{libmicrohttpd}
Summary: Small embeddable http server library
+Group: System/Libraries
%description -n %{libmicrohttpd}
Shared library for %{name} (%{summary}).
%package devel
Summary: Small Embeddable HTTP Server Library
+Group: Development/Libraries/C and C++
Requires: %{libmicrohttpd} = %{version}
Requires: pkgconfig
Requires: pkgconfig(gnutls)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/spec-cleaner.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/spec-cleaner.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/spec-cleaner.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/spec-cleaner.spec 2019-11-11 15:21:21.000000000 +0100
@@ -22,6 +22,7 @@
Release: 0
Summary: .spec file cleaner
License: BSD-3-Clause
+Group: Development/Tools/Other
URL: https://github.com/openSUSE/spec-cleaner
Source0: https://github.com/openSUSE/%{name}/archive/%{name}-%{version}.tar.gz
BuildRequires: python
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.5/tests/out/susekmp.spec new/spec-cleaner-spec-cleaner-1.1.6/tests/out/susekmp.spec
--- old/spec-cleaner-spec-cleaner-1.1.5/tests/out/susekmp.spec 2019-09-19 12:29:23.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-1.1.6/tests/out/susekmp.spec 2019-11-11 15:21:21.000000000 +0100
@@ -1,5 +1,6 @@
%package guest-KMP
Summary: Guest kernel modules for VirtualBox
+Group: System/Emulators/PC
Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*)
Supplements: modalias(x86cpu:vendor%%3A0002%%3Afamily%%3A*%%3Amodel%%3A*%%3Afeature%%3A*)
#SUSE specify macro to define guest kmp package