Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2018-03-07 10:39:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Wed Mar 7 10:39:40 2018 rev:50 rq:583685 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2018-02-28 20:03:20.990622218 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2018-03-07 10:39:57.879036073 +0100 @@ -1,0 +2,9 @@ +Tue Mar 6 20:12:02 UTC 2018 - [email protected] + +- Version update to 1.0.6 release: + * Fixes license conversions to spdx3.0 + * Allows better parsing of pattern packages + * Various manpage suffixing fixes + * Added more things to exclude bracketing + +------------------------------------------------------------------- Old: ---- spec-cleaner-1.0.4.tar.gz New: ---- spec-cleaner-1.0.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.blZ1nC/_old 2018-03-07 10:39:58.595010247 +0100 +++ /var/tmp/diff_new_pack.blZ1nC/_new 2018-03-07 10:39:58.595010247 +0100 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 1.0.4 +Version: 1.0.6 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-1.0.4.tar.gz -> spec-cleaner-1.0.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/.gitignore new/spec-cleaner-spec-cleaner-1.0.6/.gitignore --- old/spec-cleaner-spec-cleaner-1.0.4/.gitignore 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/.gitignore 2018-03-06 21:10:18.000000000 +0100 @@ -6,6 +6,7 @@ .*.swp .cache .coverage +*.orig .coveralls.yml .pytest_cache .tox diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-1.0.6/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-1.0.4/data/excludes-bracketing.txt 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/data/excludes-bracketing.txt 2018-03-06 21:10:18.000000000 +0100 @@ -49,6 +49,7 @@ global gpg_verify icon_theme_cache_post[^\s]* +icon_theme_cache_create_ghost if(\s*\(.*\))? if[^\s]* include @@ -73,8 +74,8 @@ make_jobs makeinstall meson -meson_build -meson_install +meson_[^\s]* +ninja_[^\s]* mime_database_post[^\s]* _mingw32_configure nagios_command_user_group_add @@ -100,7 +101,10 @@ transfiletriggerin transfiletriggerun transfiletriggerpostun +pattern_[^\s]* py_compile +py2_compile +py3_compile python_alternative python_install_alternative python_uninstall_alternative @@ -137,6 +141,7 @@ triggerun udev_rules_update undefine +update_bootloader_check_type_refresh_post verify[^\s]* verify(\s*\([^)]*\))? with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/__init__.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/__init__.py 2018-03-06 21:10:18.000000000 +0100 @@ -13,7 +13,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '1.0.4' +__version__ = '1.0.6' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmfiles.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmfiles.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmfiles.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmfiles.py 2018-03-06 21:10:18.000000000 +0100 @@ -16,6 +16,9 @@ line = self.strip_useless_spaces(line) line = self._remove_doc_on_man(line) line = self._move_license_from_doc(line) + # we only get empty %doc left over + if line == '%doc ': + return if not self.minimal: # prune obsolete defattr that is default @@ -44,9 +47,9 @@ the proper macro variable """ if line.startswith("%{_mandir}"): - line = self.reg.re_compression.sub('%{ext_man}', line) + line = self.reg.re_man_compression.sub(r'\1%{?ext_man}', line) if line.startswith("%{_infodir}"): - line = self.reg.re_compression.sub('%{ext_info}', line) + line = self.reg.re_info_compression.sub('.info%{?ext_info}', line) return line def _move_license_from_doc(self, line): @@ -56,8 +59,4 @@ match += self.reg.re_doclicense.search(line).group() line = self.reg.re_doclicense.sub('', line, 1) Section.add(self, "%license {}".format(match)) - - # we only got empty %doc then ommit it - if line == "%doc ": - line = '' return line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmhelpers.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmhelpers.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmhelpers.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmhelpers.py 2018-03-06 21:10:18.000000000 +0100 @@ -120,9 +120,11 @@ def fix_license(value, conversions): # license ; should be replaced by ands so find it re_license_semicolon = re.compile(r'\s*;\s*') + value = value.rstrip(';') + value = re_license_semicolon.sub(' and ', value) # split using 'or', 'and' and parenthesis, ignore empty strings licenses = [] - for a in re.split(r'(\(|\)| and | or (?!later))', value): + for a in re.split(r'(\(|\)| and | AND | OR | or (?!later)|;)', value): if a != '': licenses.append(a) if not licenses: @@ -132,8 +134,6 @@ my_license = ' '.join(my_license.split()) my_license = my_license.replace('ORlater', 'or later') my_license = my_license.replace('ORsim', 'or similar') - my_license = my_license.rstrip(';') - my_license = re_license_semicolon.sub(' and ', my_license) if my_license in conversions: my_license = conversions[my_license] licenses[index] = my_license diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmpreamble.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmpreamble.py 2018-03-06 21:10:18.000000000 +0100 @@ -50,6 +50,8 @@ self._condition_define = False # Is the condition based probably on bcond evaluation self._condition_bcond = False + # Is the condition based on the pattern + self._pattern_condition = False self.options = options # do we want pkgconfig and others? self.pkgconfig = options['pkgconfig'] @@ -216,12 +218,16 @@ if len(self._oldstore) == 0: self._condition_define = False else: - self.paragraph.items['build_conditions'] += self.paragraph.items['conditions'] + if self._pattern_condition: + self.paragraph.items['patterncodeblock'] += self.paragraph.items['conditions'] + else: + self.paragraph.items['build_conditions'] += self.paragraph.items['conditions'] # bcond must be reseted when on top and can be set even outside of the # define scope. So reset it here always if len(self._oldstore) == 0: self._condition_bcond = False + self._pattern_condition = False self.paragraph.items['conditions'] = [] @staticmethod @@ -317,6 +323,9 @@ def add(self, line): line = self._complete_cleanup(line) + if self.condition and self.reg.re_patternmacro.search(line): + self._pattern_condition = True + # if the line is empty, just skip it, unless keep_space is true if not self.keep_space and len(line) == 0: return @@ -396,6 +405,25 @@ self._add_line_to('define', line) return + elif self.reg.re_patterndefine.match(line): + self._add_line_to('define', line) + return + + elif self.reg.re_provides.match(line) and self.reg.re_patternmacro.search(line): + match = self.reg.re_provides.match(line) + self._add_line_value_to('patternprovides', match.group(1), key='Provides') + return + + elif self.reg.re_provides.match(line) and self.reg.re_patternobsolete.search(line): + match = self.reg.re_provides.match(line) + self._add_line_value_to('patternobsoletes', match.group(1), key='Provides') + return + + elif self.reg.re_obsoletes.match(line) and self.reg.re_patternobsolete.search(line): + match = self.reg.re_obsoletes.match(line) + self._add_line_value_to('patternobsoletes', match.group(1), key='Obsoletes') + return + elif self.reg.re_requires_eq.match(line): match = self.reg.re_requires_eq.match(line) if match.group(1): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmpreambleelements.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmpreambleelements.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmpreambleelements.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmpreambleelements.py 2018-03-06 21:10:18.000000000 +0100 @@ -57,6 +57,9 @@ 'source', 'nosource', 'patch', + 'patternprovides', # fake provides with special function for patterns + 'patternobsoletes', # fake provide/obsoletes with old pattern symbols + 'patterncodeblock', # fake condition placement for patterns to stay on top 'buildrequires', 'buildconflicts', 'buildignores', @@ -82,6 +85,7 @@ # categories that are sorted based on value in them categories_with_sorted_package_tokens = [ + 'patternprovides', 'buildrequires', 'buildconflicts', 'buildignores', @@ -142,13 +146,15 @@ match = self.reg.re_source.match(key) value = match.group(1) if not value: - value = '0' + value = '1' key = int(value) # Put brackety ()-style deps at the end of the list, after all other elif self.reg.re_brackety_requires.search(key): - key = '1' + key - else: + key = '2' + key + elif self.reg.re_patternmacro.search(key): key = '0' + key + else: + key = '1' + key return key def _insert_value(self, category, value, key=None): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-1.0.4/spec_cleaner/rpmregexp.py 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/spec_cleaner/rpmregexp.py 2018-03-06 21:10:18.000000000 +0100 @@ -70,11 +70,14 @@ re_debugpkg = re.compile(r'^%{?(debug_package|___debug_install_post)}?\s*$', re.IGNORECASE) re_py_requires = re.compile(r'^%{?\??py_requires}?\s*$', re.IGNORECASE) re_mingw = re.compile(r'^\s*%{?_mingw.*$', re.IGNORECASE) + re_patterndefine = re.compile(r'^\s*%{?pattern_\S+}?\s*$', re.IGNORECASE) + re_patternmacro = re.compile(r'pattern(-\S+)?\(\)', re.IGNORECASE) + re_patternobsolete = re.compile(r'patterns-openSUSE-\S+', re.IGNORECASE) re_tail_macros = re.compile(r'^%{?python_subpackages}?') re_preamble_prefix = re.compile(r'^Prefix:\s*(.*)', re.IGNORECASE) - # here we need to grab all submacros with rpm calls so just match almost - # everything - re_rpm_command = re.compile(r'%\(.*\)') + # grab all macros with rpm call that query for version, this still might + # be bit too greedy but it is good enough now + re_rpm_command = re.compile(r'%\(\s*(rpm|echo\s+`rpm).*--queryformat\s+\'%{?VERSION}?\'.*\)') re_requires_eq = re.compile(r'^\s*(%{\?requires_eq:\s*)?%requires_eq\s*(.*)') re_requires_ge = re.compile(r'^\s*(%{\?requires_ge:\s*)?%requires_ge\s*(.*)') re_onelinecond = re.compile(r'^\s*%{!?[^?]*\?[^:]+:[^}]+}') @@ -118,7 +121,8 @@ re_setup = re.compile(r'\s*-n\s+"?%{name}-%{version}"?($|\s)') # rpmfiles - re_compression = re.compile(r'\.(gz|\*)$') + re_man_compression = re.compile(r'(\d)(\.?\*|\.gz|%{?ext_man}?)$') + re_info_compression = re.compile(r'\.info(\.?\*|\.gz|%{?ext_info}?)$') re_defattr = re.compile(r'^\s*%defattr\s*\(\s*-\s*,\s*root\s*,\s*root\s*(,\s*-\s*)?\)\s*') re_doclicense = re.compile(r'(\S+)?(LICENSE|COPYING)(\*|\.(\*|\S+))?($|\s)') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/in/doc2license.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/in/doc2license.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/in/doc2license.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/in/doc2license.spec 2018-03-06 21:10:18.000000000 +0100 @@ -10,4 +10,8 @@ %files c %doc COPYING LICENSE* +%files FOO +%doc COPYING +%{_libdir/library.so + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/in/licenseand.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/in/licenseand.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/in/licenseand.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/in/licenseand.spec 2018-03-06 21:10:18.000000000 +0100 @@ -8,3 +8,6 @@ %package test3 LICense: (GPL-3.0 with GCC-exception-3.1 and MIT) or Apache-2.0 + +%package test4 +License: LGPL-2.1+ AND GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/in/mandirs.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/in/mandirs.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/in/mandirs.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/in/mandirs.spec 2018-03-06 21:10:18.000000000 +0100 @@ -2,5 +2,15 @@ %defattr(-,root,root) %{_mandir}/man3/%{name}.3.gz %{_mandir}/man5/%{name}.5.* +%{_mandir}/man1/%{name}.1%{ext_man} %{_infodir}/%{name}.info.gz %{_infodir}/%{name}.info.* + +%files extension +%{_mandir}/man1/binary.1.gz + +%files glob1 +%{_mandir}/man1/binary.* + +%files glob2 +%{_mandir}/man?/binary* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/in/patterns.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/in/patterns.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/in/patterns.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/in/patterns.spec 2018-03-06 21:10:18.000000000 +0100 @@ -2,10 +2,33 @@ %pattern_serverfunctions Summary: DHCP and DNS Server Group: Metapackages -Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = yast-dns-server -Provides: pattern-order() = 3040 Provides: pattern-visible() +Provides: pattern() = dhcp_dns_server Provides: patterns-openSUSE-dhcp_dns_server = %{version} Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} Requires: pattern() = basesystem +Recommends: pattern() = yast_basis +Provides: pattern-order() = 3040 +Requires: curl +Recommends: wget + +%package devel_gnome +%pattern_development +Summary: GNOME Development +Group: Metapackages +Recommends: gtk3 + +Provides: pattern() = devel_gnome +Provides: pattern-icon() = pattern-gnome-devel +# Don't freely assign order values, contact release managers +Provides: pattern-order() = 3160 +Provides: pattern-visible() +# SECTION PATTERNDATA +Suggests: pattern() = devel_C_C++ +Requires: pattern() = gnome_basis +# /SECTION PATTERNDATA +Provides: patterns-openSUSE-devel_gnome = %{version} +Obsoletes: patterns-openSUSE-devel_gnome < %{version} +Suggests: python-gobject +Requires: vim diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/in/rpmcmd.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/in/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/in/rpmcmd.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/in/rpmcmd.spec 2018-03-06 21:10:18.000000000 +0100 @@ -7,4 +7,5 @@ Requires: mozilla-nss-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss-devel) Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) +Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) Provides: NetworkManager-lang = %(rpm -q --queryformat '%{VERSION}' NetworkManager-lang) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/doc2license.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/doc2license.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/doc2license.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/doc2license.spec 2018-03-06 21:10:18.000000000 +0100 @@ -12,4 +12,8 @@ %files c %license COPYING LICENSE* +%files FOO +%license COPYING +%{_libdir/library.so + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/licenseand.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/licenseand.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/licenseand.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/licenseand.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,7 +1,7 @@ -License: GPL-2.0 AND GPL-3.0 +License: GPL-2.0-only AND GPL-3.0-only %package test -License: BSD AND GPL-3.0 +License: BSD AND GPL-3.0-only %package test2 License: MIT @@ -9,4 +9,7 @@ %package test3 License: (GPL-3.0 WITH GCC-exception-3.1 AND MIT) OR Apache-2.0 +%package test4 +License: LGPL-2.1-or-later AND GPL-2.0-or-later + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/mandirs.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/mandirs.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/mandirs.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/mandirs.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,7 +1,17 @@ %files -%{_mandir}/man3/%{name}.3%{ext_man} -%{_mandir}/man5/%{name}.5%{ext_man} -%{_infodir}/%{name}.info%{ext_info} -%{_infodir}/%{name}.info%{ext_info} +%{_mandir}/man3/%{name}.3%{?ext_man} +%{_mandir}/man5/%{name}.5%{?ext_man} +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_infodir}/%{name}.info%{?ext_info} +%{_infodir}/%{name}.info%{?ext_info} + +%files extension +%{_mandir}/man1/binary.1%{?ext_man} + +%files glob1 +%{_mandir}/man1/binary.* + +%files glob2 +%{_mandir}/man?/binary* %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/patterns.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/patterns.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/patterns.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/patterns.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,13 +1,35 @@ %package dhcp_dns_server +%pattern_serverfunctions Summary: DHCP and DNS Server Group: Metapackages -Requires: pattern() = basesystem Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = yast-dns-server Provides: pattern-order() = 3040 Provides: pattern-visible() Provides: patterns-openSUSE-dhcp_dns_server = %{version} Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} -%{pattern_serverfunctions} +Requires: pattern() = basesystem +Requires: curl +Recommends: pattern() = yast_basis +Recommends: wget + +%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 +Provides: pattern-order() = 3160 +Provides: pattern-visible() +Provides: patterns-openSUSE-devel_gnome = %{version} +Obsoletes: patterns-openSUSE-devel_gnome < %{version} +# SECTION PATTERNDATA +Requires: pattern() = gnome_basis +Suggests: pattern() = devel_C_C++ +# /SECTION PATTERNDATA +Requires: vim +Recommends: gtk3 +Suggests: python-gobject %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/rpmcmd.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/rpmcmd.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/rpmcmd.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,4 +1,5 @@ %define version %(rpm -q --qf '%{VERSION}' kernel-source) +Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) # FIXME: Use %requires_eq macro instead Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) # FIXME: Use %requires_eq macro instead diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/rpmpreamble.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/rpmpreamble.spec 2018-03-06 21:10:18.000000000 +0100 @@ -133,7 +133,7 @@ %{_includedir}/microhttpd.h %{_libdir}/%{name}.so %{_libdir}/pkgconfig/%{name}.pc -%{_infodir}/%{name}*.info%{ext_info} -%{_mandir}/man3/%{name}.3%{ext_man} +%{_infodir}/%{name}*.info%{?ext_info} +%{_mandir}/man3/%{name}.3%{?ext_man} %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out/whitespace.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out/whitespace.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out/whitespace.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out/whitespace.spec 2018-03-06 21:10:18.000000000 +0100 @@ -15,7 +15,7 @@ %license LICENSE %doc Copyright README.md etc/example.conf etc/encoding-example-profiles.conf etc/input.conf %{_bindir}/%{name} -%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/%{name}.1%{?ext_man} %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.png diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/doc2license.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/doc2license.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/doc2license.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/doc2license.spec 2018-03-06 21:10:18.000000000 +0100 @@ -12,4 +12,8 @@ %files c %license COPYING LICENSE* +%files FOO +%license COPYING +%{_libdir/library.so + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/licenseand.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/licenseand.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/licenseand.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/licenseand.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,7 +1,7 @@ -License: GPL-2.0 AND GPL-3.0 +License: GPL-2.0-only AND GPL-3.0-only %package test -License: BSD AND GPL-3.0 +License: BSD AND GPL-3.0-only %package test2 License: MIT @@ -9,4 +9,7 @@ %package test3 License: (GPL-3.0 WITH GCC-exception-3.1 AND MIT) OR Apache-2.0 +%package test4 +License: LGPL-2.1-or-later AND GPL-2.0-or-later + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/mandirs.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/mandirs.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/mandirs.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/mandirs.spec 2018-03-06 21:10:18.000000000 +0100 @@ -2,7 +2,17 @@ %defattr(-,root,root) %{_mandir}/man3/%{name}.3.gz %{_mandir}/man5/%{name}.5.* +%{_mandir}/man1/%{name}.1%{ext_man} %{_infodir}/%{name}.info.gz %{_infodir}/%{name}.info.* +%files extension +%{_mandir}/man1/binary.1.gz + +%files glob1 +%{_mandir}/man1/binary.* + +%files glob2 +%{_mandir}/man?/binary* + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/patterns.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/patterns.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/patterns.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/patterns.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,13 +1,35 @@ %package dhcp_dns_server +%pattern_serverfunctions Summary: DHCP and DNS Server Group: Metapackages -Requires: pattern() = basesystem Provides: pattern() = dhcp_dns_server Provides: pattern-icon() = yast-dns-server Provides: pattern-order() = 3040 Provides: pattern-visible() Provides: patterns-openSUSE-dhcp_dns_server = %{version} Obsoletes: patterns-openSUSE-dhcp_dns_server < %{version} -%pattern_serverfunctions +Requires: pattern() = basesystem +Requires: curl +Recommends: pattern() = yast_basis +Recommends: wget + +%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 +Provides: pattern-order() = 3160 +Provides: pattern-visible() +Provides: patterns-openSUSE-devel_gnome = %{version} +Obsoletes: patterns-openSUSE-devel_gnome < %{version} +# SECTION PATTERNDATA +Requires: pattern() = gnome_basis +Suggests: pattern() = devel_C_C++ +# /SECTION PATTERNDATA +Requires: vim +Recommends: gtk3 +Suggests: python-gobject %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/rpmcmd.spec new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-1.0.4/tests/out-minimal/rpmcmd.spec 2018-02-28 15:29:54.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.0.6/tests/out-minimal/rpmcmd.spec 2018-03-06 21:10:18.000000000 +0100 @@ -1,4 +1,5 @@ %define version %(rpm -q --qf '%{VERSION}' kernel-source) +Requires: %(rpm --qf "%%{name}" -qf $(readlink -f %{_libdir}/libavcodec.so))(unrestricted) Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr)
