Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2017-04-13 10:45:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Thu Apr 13 10:45:19 2017 rev:40 rq:487015 version:0.9.4 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2017-02-28 23:51:01.353436659 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2017-04-13 10:45:21.071042089 +0200 @@ -1,0 +2,9 @@ +Sat Apr 8 09:18:20 UTC 2017 - tchva...@suse.com + +- Version update to 0.9.4: + * Fixes in the dep_parser + * Vertical whitespace is now safeguarded + * More excludes_bracketing + * Update list of known licenses + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.9.3.tar.gz New: ---- spec-cleaner-0.9.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.DDtZtI/_old 2017-04-13 10:45:21.974914266 +0200 +++ /var/tmp/diff_new_pack.DDtZtI/_new 2017-04-13 10:45:21.978913701 +0200 @@ -20,7 +20,7 @@ # This is used for Fedora, we need to sync this %{!?py3_ver: %define py3_ver %{python3_version}} Name: spec-cleaner -Version: 0.9.3 +Version: 0.9.4 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.9.3.tar.gz -> spec-cleaner-0.9.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/README.md new/spec-cleaner-spec-cleaner-0.9.4/README.md --- old/spec-cleaner-spec-cleaner-0.9.3/README.md 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/README.md 2017-04-08 11:05:38.000000000 +0200 @@ -400,6 +400,7 @@ |SUSE-LGPL-2.1-with-nokia-exception-1.1| |SUSE-LGPL-3.0-with-openssl-exception| |SUSE-Liberation| +|SUSE-MIT-Khronos| |SUSE-Manpages| |SUSE-Matplotlib| |SUSE-MgOpen| @@ -425,6 +426,7 @@ |SUSE-TGPPL-1.0| |SUSE-TeX| |SUSE-Ubuntu-Font-License-1.0| +|SUSE-XDebug| |SUSE-XFree86-with-font-exception| |SUSE-XSL-Lint| |SUSE-Xano| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.9.4/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.9.3/data/excludes-bracketing.txt 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/data/excludes-bracketing.txt 2017-04-08 11:05:38.000000000 +0200 @@ -1,4 +1,5 @@ add_maven_depmap +apache_test_module_load attr(\s*\([^)]*\))? bcond_with[^\s]* build @@ -114,6 +115,8 @@ suse_update_desktop_file systemd_preun systemd_requires +sysusers_requires +sysusers_generate_pre tmpfiles_create triggerin triggerpostun diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/data/licenses_changes.txt new/spec-cleaner-spec-cleaner-0.9.4/data/licenses_changes.txt --- old/spec-cleaner-spec-cleaner-0.9.3/data/licenses_changes.txt 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/data/licenses_changes.txt 2017-04-08 11:05:38.000000000 +0200 @@ -843,6 +843,8 @@ SUSE-LGPL-3.0-with-openssl-exception+ SUSE-LGPL-3.0-with-openssl-exception+ SUSE-Liberation LiberationFontsLicense (Fedora calls this the Liberation license - it will be easier to get it upstream if we adopt that) SUSE-Liberation+ SUSE-Liberation+ +SUSE-MIT-Khronos https://github.com/KhronosGroup/KTX/blob/master/lib/loader.c +SUSE-MIT-Khronos+ SUSE-MIT-Khronos+ SUSE-Manpages Manpages licenses (linux man pages e.g.) SUSE-Manpages+ SUSE-Manpages+ SUSE-Matplotlib E.g. python -matplotlib -> LICENSE/LICENSE @@ -897,6 +899,8 @@ SUSE-TeX+ SUSE-TeX+ SUSE-Ubuntu-Font-License-1.0 http://font.ubuntu.com/licence/ SUSE-Ubuntu-Font-License-1.0+ SUSE-Ubuntu-Font-License-1.0+ +SUSE-XDebug https://xdebug.org/license.php +SUSE-XDebug+ SUSE-XDebug+ SUSE-XFree86-with-font-exception XFree86 with exception to clarify that a document embedding such fonts does not need to be licensed under the XFree86 license SUSE-XFree86-with-font-exception+ SUSE-XFree86-with-font-exception+ SUSE-XSL-Lint http://pastebin.com/cFxX3zCb (probably deprecated but found in docbook-dsssl-stylesheets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/obs/clean_spec_file new/spec-cleaner-spec-cleaner-0.9.4/obs/clean_spec_file --- old/spec-cleaner-spec-cleaner-0.9.3/obs/clean_spec_file 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/obs/clean_spec_file 2017-04-08 11:05:38.000000000 +0200 @@ -41,7 +41,7 @@ for i in ${MYSPECFILES}; do if [ ! -w "${i}" ]; then - echo "WARNING: spec file \"${i}\" is not writeable." + echo "WARNING: spec file \"${i}\" is not writable." continue fi /usr/bin/spec-cleaner -f "$i" -i > /dev/null 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/obs/format_spec_file new/spec-cleaner-spec-cleaner-0.9.4/obs/format_spec_file --- old/spec-cleaner-spec-cleaner-0.9.3/obs/format_spec_file 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/obs/format_spec_file 2017-04-08 11:05:38.000000000 +0200 @@ -41,7 +41,7 @@ for i in ${MYSPECFILES}; do if [ ! -w "${i}" ]; then - echo "WARNING: spec file \"${i}\" is not writeable." + echo "WARNING: spec file \"${i}\" is not writable." continue fi /usr/bin/spec-cleaner -m -f "$i" -i > /dev/null 2>&1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/__init__.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/__init__.py 2017-04-08 11:05:38.000000000 +0200 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '0.9.3' +__version__ = '0.9.4' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/dependency_parser.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/dependency_parser.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/dependency_parser.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/dependency_parser.py 2017-04-08 11:05:38.000000000 +0200 @@ -33,12 +33,13 @@ r')' ) -re_name = re.compile(r'[-A-Za-z0-9_~():.+/*]+') +re_name = re.compile(r'[-A-Za-z0-9_~():.+/*\[\]]+') re_version = re.compile(r'[-A-Za-z0-9_~():.+]+') re_spaces = re.compile(r'\s+') re_macro_unbraced = re.compile('%[A-Za-z0-9_]{3,}') re_version_operator = re.compile('(>=|<=|=>|=<|>|<|=)') + def find_end_of_macro(string, regex, opening, closing): if DEBUG: logger = logging.getLogger('DepParser') @@ -78,7 +79,8 @@ if match: end = match.end() if logger: - logger.debug('consume_chars: split "%s", "%s"', string[0:end], string[end:]) + logger.debug('consume_chars: split "%s", "%s"', + string[0:end], string[end:]) return string[0:end], string[end:] else: raise NoMatchException('Expected match failed') @@ -110,6 +112,7 @@ return self.parsed.append(self.token) self.token = [] + self.state = ['name'] def state_change_loop(self): while self.string: @@ -139,14 +142,14 @@ def read_spaces(self, state_change=True): try: - spaces, self.string = consume_chars(re_spaces, self.string, self.logger) + spaces, self.string = consume_chars( + re_spaces, self.string, self.logger) self.token.append(spaces) if state_change: self.state.pop() # remove 'spaces' state # if we were reading version, space definitely means # end of that if self.state[-1] == 'version': - self.state.pop() self.dump_token() self.status() except NoMatchException: @@ -179,7 +182,8 @@ def read_name(self): try: - name, self.string = consume_chars(re_name, self.string, self.logger) + name, self.string = consume_chars( + re_name, self.string, self.logger) if self.token and self.token[-1].isspace(): self.dump_token() self.token.append(name) @@ -193,6 +197,14 @@ def read_macro_unbraced(self): try: + if ( + self.state[-2] == 'name' and self.token and + self.token[-1].isspace()): + self.dump_token() + self.state.append('macro_unbraced') + except IndexError: + pass + try: # 3 or more alphanumeric characters macro, self.string = consume_chars( re_macro_unbraced, self.string, self.logger) @@ -226,6 +238,14 @@ self.read_unknown() def read_macro_name(self): + try: + if ( + self.state[-2] == 'name' and + self.token and self.token[-1].isspace()): + self.dump_token() + self.state.append('macro_name') + except IndexError: + pass macro = find_end_of_macro(self.string, re_braces, '{', '}') # remove macro from string self.string = self.string[len(macro):] @@ -235,6 +255,14 @@ self.status() def read_macro_shell(self): + try: + if ( + self.state[-2] == 'name' and + self.token and self.token[-1].isspace()): + self.dump_token() + self.state.append('macro_shell') + except IndexError: + pass macro = find_end_of_macro(self.string, re_parens, '(', ')') self.string = self.string[len(macro):] self.token.append(macro) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmbuild.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmbuild.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmbuild.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmbuild.py 2017-04-08 11:05:38.000000000 +0200 @@ -18,15 +18,32 @@ # if user uses cmake/configure directly just recommend him using the macros # but check on the multiline entry and do not ammend that if not self.minimal: - if (not self.previous_line \ - or (not self.previous_line.startswith('#') \ - and not self.previous_line.endswith('\\'))) \ - and self.reg.re_configure.match(line): - self.lines.append('# FIXME: you should use the %%configure macro') - if (not self.previous_line \ - or (not self.previous_line.startswith('#') \ - and not self.previous_line.endswith('\\'))) \ - and self.reg.re_cmake.match(line): - self.lines.append('# FIXME: you should use %%cmake macros') + self._comment_macro_calls(line) RpmCheck.add(self, line) + + def _comment_macro_calls(self, line): + """ + Add comment if the package uses direct call instead of macro + """ + if self.reg.re_configure.match(line): + msg = '# FIXME: you should use the %%configure macro' + elif self.reg.re_cmake.match(line): + msg = '# FIXME: you should use %%cmake macros' + else: + return + + position = len(self.lines) + if self.previous_line.endswith('\\'): + # Backtrack until we are on top of multiline command + for i in reversed(self.lines): + if i.endswith('\\'): + position -= 1 + else: + # we stop backtracking on the first + # non-backslashed line + break + # Check if on the position above is no comment + # if not add our message + if not self.lines[position - 1].startswith('#'): + self.lines.insert(position, msg) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmcleaner.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmcleaner.py 2017-04-08 11:05:38.000000000 +0200 @@ -249,7 +249,13 @@ if detected_class == Section and self._detect_condition_change(line): return False else: - return True + # We also do not want to print newline if at the end of the + # previous section we actually had a commentary, ie comment above + # new section + if self._previous_line and self._previous_line.startswith('#'): + return False + else: + return True def run(self): # If we are skipping we should do nothing diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmcopyright.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmcopyright.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmcopyright.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmcopyright.py 2017-04-08 11:05:38.000000000 +0200 @@ -77,7 +77,7 @@ self.copyrights.append(line) elif self.reg.re_rootforbuild.match(line): self.buildrules.append('# needsrootforbuild') - elif self.reg.re_binariesforbuld.match(line): + elif self.reg.re_binariesforbuild.match(line): self.buildrules.append('# needsbinariesforbuild') elif self.reg.re_nodebuginfo.match(line): self.buildrules.append('# nodebuginfo') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmpreamble.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmpreamble.py 2017-04-08 11:05:38.000000000 +0200 @@ -55,6 +55,8 @@ # mixed, so we'll have to specify the key when needed 'buildroot': 'BuildRoot', 'buildarch': 'BuildArch', + 'exclusivearch': 'ExclusiveArch', + 'excludearch': 'ExcludeArch', } categories_order = [ @@ -85,6 +87,8 @@ 'provides_obsoletes', 'buildroot', 'buildarch', + 'exclusivearch', + 'excludearch', 'misc', 'build_conditions', 'conditions', @@ -172,6 +176,8 @@ # for provides/obsoletes, we have a special case because we group them # for build root, we have a special match because we force its value 'buildarch': self.reg.re_buildarch, + 'excludearch': self.reg.re_excludearch, + 'exclusivearch': self.reg.re_exclusivearch, } # deprecated definitions that we no longer want to see @@ -217,7 +223,7 @@ if t == str: key = a elif t == list: - # if this is a list then all items except last are commentary + # if this is a list then all items except last are comment or whitespace key = a[-1] else: raise RpmException('Unknown type during sort: %s' % t) @@ -323,6 +329,7 @@ # sort based on category order for i in self.categories_order: + sorted_list = [] # sort-out within the ordered groups based on the key if i in self.categories_with_sorted_package_tokens: self.paragraph[i].sort(key=self._sort_helper_key) @@ -331,7 +338,11 @@ if i in self.categories_with_sorted_keyword_tokens: self.paragraph[i].sort(key=self._sort_helper_key) for group in self.paragraph[i]: - lines += self._add_group(group) + sorted_list += self._add_group(group) + # now check if we need to add comment for the prereq + if i == 'prereq' and not self.minimal: + sorted_list = self._verify_prereq_message(sorted_list) + lines += sorted_list if self.current_group: # the current group was not added to any category. It's just some # random stuff that should be at the end anyway. @@ -470,6 +481,27 @@ expanded.sort() return expanded + def _verify_prereq_message(self, elements): + """ + Verify if the prereq is present in the Requires(*) and add the fixme + comment if needed + """ + message = '# FIXME: use proper Requires(pre/post/preun/...)' + + # Check first if we have prereq values included + if not any("PreReq" in s for s in elements): + return elements + + # Verify the message is not already present + if any(message in s for s in elements): + return elements + + # add the message on the first position after any whitespace + location = next(i for i, j in enumerate(elements) if j) + elements.insert(location, message) + + return elements + def _add_line_value_to(self, category, value, key=None): """ Change a key-value line, to make sure we have the right spacing. @@ -608,11 +640,6 @@ elif self.reg.re_prereq.match(line): match = self.reg.re_prereq.match(line) - if not self.minimal: - # add the comment about using proper macro which needs - # investingaton - if self.previous_line is not None and not self.previous_line.startswith('#') and not self.previous_line.startswith('PreReq'): - self.current_group.append('# FIXME: use proper Requires(pre/post/preun/...)') self._add_line_value_to('prereq', match.group(1)) return diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.9.3/spec_cleaner/rpmregexp.py 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/spec_cleaner/rpmregexp.py 2017-04-08 11:05:38.000000000 +0200 @@ -54,6 +54,8 @@ re_obsoletes = re.compile(r'^Obsoletes:\s*(.*)', re.IGNORECASE) re_buildroot = re.compile(r'^\s*BuildRoot:', re.IGNORECASE) re_buildarch = re.compile(r'^\s*BuildArch(itectures)?:\s*(.*)', re.IGNORECASE) + re_exclusivearch = re.compile(r'^\s*ExclusiveArch(itectures)?:\s*(.*)', re.IGNORECASE) + re_excludearch = re.compile(r'^\s*ExcludeArch(itectures)?:\s*(.*)', re.IGNORECASE) re_epoch = re.compile(r'^\s*Epoch:\s*(.*)', re.IGNORECASE) re_icon = re.compile(r'^\s*Icon:\s*(.*)', re.IGNORECASE) re_copyright = re.compile(r'^\s*Copyright:\s*(.*)', re.IGNORECASE) @@ -91,7 +93,7 @@ re_copyright = re.compile(r'^#\s*Copyright\ \(c\)\s*(.*)', re.IGNORECASE) re_suse_copyright = re.compile(r'SUSE LINUX (Products )?GmbH, Nuernberg, Germany.\s*$', re.IGNORECASE) re_rootforbuild = re.compile(r'^#\s*needsrootforbuild\s*$', re.IGNORECASE) - re_binariesforbuld = re.compile(r'^#\s*needsbinariesforbuild\s*$', re.IGNORECASE) + re_binariesforbuild = re.compile(r'^#\s*needsbinariesforbuild\s*$', re.IGNORECASE) re_nodebuginfo = re.compile(r'^#\s*nodebuginfo\s*$', re.IGNORECASE) re_sslcerts = re.compile(r'^#\s*needssslcertforbuild\s*$', re.IGNORECASE) re_icecream = re.compile(r'^#\s*icecream\s*$', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/conditions.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/conditions.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/conditions.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/conditions.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,3 +1,7 @@ +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif Version: 2.8.2 %ifpython2 Release: 0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/desctopreamble.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/desctopreamble.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/desctopreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/desctopreamble.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,16 @@ +Name: wireless-regdb + +%description +The 802.11 regulatory domain database is used by CRDA and provides +allowed frequency ranges for 802.11 wireless drivers. + +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif + +# OURUGLYBUILDPHASE +%build +%configure + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/excludearch.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/excludearch.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/excludearch.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/excludearch.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,6 @@ +Name: excludearch +%if 0%{?suse_version} +BuildRequires: dependency +%endif +ExclusiveArch: s390x +ExcludeArch: s390 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/excludes-bracketing.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/excludes-bracketing.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/excludes-bracketing.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/excludes-bracketing.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,4 +1,5 @@ %add_maven_depmap +%apache_test_module_load %attr(\s*\([^)]*\))? %bcond_with[^\s]* %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/macros.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/macros.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/macros.spec 2017-04-08 11:05:38.000000000 +0200 @@ -11,3 +11,9 @@ ./configure --aughr %useful_macro 15 ./configure.sh \ + +CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \ +LDFLAGS="-pie" \ +./configure \ + +CFLAGS="-g" ./configure diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/prereq.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/prereq.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/prereq.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/prereq.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,6 +1,8 @@ +Name: prereq Requires(post): something Requires(pre): test1 Requires(post): asomething bsomething PreReq: deprecatedrequires PreReq: uglyline1 uglyline2 +PreReq: /bin/rm /bin/mkdir /usr/bin/chroot %fillup_prereq %insserv_prereq Requires(postun): somethingcrazy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/spec-cleaner.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/spec-cleaner.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/spec-cleaner.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/spec-cleaner.spec 2017-04-08 11:05:38.000000000 +0200 @@ -33,7 +33,7 @@ Provides: obs-service-format_spec_file = %{version} Obsoletes: obs-service-format_spec_file < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildArch: noarch +BuildArch: noarch %{debug_package} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/susekmp.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/susekmp.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/susekmp.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/susekmp.spec 2017-04-08 11:05:38.000000000 +0200 @@ -2,6 +2,7 @@ Summary: Guest kernel modules for VirtualBox Group: System/Emulators/PC Supplements: modalias(x86cpu:vendor%%3A0002%%3Afamily%%3A*%%3Amodel%%3A*%%3Afeature%%3A*) +Supplements: modalias(dmi:*:[bs]vnD[Ee][Ll][Ll]*:*) #SUSE specify macro to define guest kmp package %{?suse_kernel_module_package:%{suse_kernel_module_package} -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} kdump um xen xenpae} %kernel_module_package -p %{name}-kmp-preamble diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/in/sysusers.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/in/sysusers.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/in/sysusers.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/in/sysusers.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,15 @@ +Source1: system-user-uucp.conf +BuildRequires: sysuser-tools + +%package -n system-user-uucp +Summary: System user and group uucp +%sysusers_requires + +%build +%sysusers_generate_pre %{SOURCE1} uucp + +%pre -n system-user-uucp -f uucp.pre + +%files -n system-user-uucp +%defattr(-,root,root) +%dir %attr(0750,uucp,uucp) %{_sysconfdir}/uucp diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/conditions.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/conditions.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,3 +1,7 @@ +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif Version: 2.8.2 Summary: AppArmor userlevel parser utility License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/desctopreamble.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/desctopreamble.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/desctopreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/desctopreamble.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,16 @@ +Name: wireless-regdb + +%description +The 802.11 regulatory domain database is used by CRDA and provides +allowed frequency ranges for 802.11 wireless drivers. + +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif + +# OURUGLYBUILDPHASE +%build +%configure + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/excludearch.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/excludearch.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/excludearch.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/excludearch.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,8 @@ +Name: excludearch +ExclusiveArch: s390x +ExcludeArch: s390 +%if 0%{?suse_version} +BuildRequires: dependency +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/excludes-bracketing.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/excludes-bracketing.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/excludes-bracketing.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/excludes-bracketing.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,5 +1,6 @@ %bcond_with[^\s]* %add_maven_depmap +%apache_test_module_load %attr(\s*\([^)]*\))? %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/macros.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/macros.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/macros.spec 2017-04-08 11:05:38.000000000 +0200 @@ -11,4 +11,12 @@ %useful_macro 15 ./configure.sh \ +# FIXME: you should use the %%configure macro +CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \ +LDFLAGS="-pie" \ +./configure \ + +# FIXME: you should use the %%configure macro +CFLAGS="-g" ./configure + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/prereq.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/prereq.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/prereq.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/prereq.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,4 +1,10 @@ +Name: prereq # FIXME: use proper Requires(pre/post/preun/...) +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: %{_bindir}/chroot +PreReq: /bin/mkdir +PreReq: /bin/rm PreReq: deprecatedrequires PreReq: uglyline1 PreReq: uglyline2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/susekmp.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/susekmp.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/susekmp.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/susekmp.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,6 +1,7 @@ %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 %{?suse_kernel_module_package:%suse_kernel_module_package -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} kdump um xen xenpae} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out/sysusers.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out/sysusers.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out/sysusers.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out/sysusers.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,17 @@ +Source1: system-user-uucp.conf +BuildRequires: sysuser-tools + +%package -n system-user-uucp +Summary: System user and group uucp +%sysusers_requires + +%build +%sysusers_generate_pre %{SOURCE1} uucp + +%pre -n system-user-uucp -f uucp.pre + +%files -n system-user-uucp +%defattr(-,root,root) +%dir %attr(0750,uucp,uucp) %{_sysconfdir}/uucp + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/conditions.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/conditions.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,3 +1,7 @@ +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif Version: 2.8.2 Summary: AppArmor userlevel parser utility License: GPL-2.0+ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/desctopreamble.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/desctopreamble.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/desctopreamble.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/desctopreamble.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,16 @@ +Name: wireless-regdb + +%description +The 802.11 regulatory domain database is used by CRDA and provides +allowed frequency ranges for 802.11 wireless drivers. + +%if 0%{?suse_version} == 1110 +# _libexecdir points to /usr/lib64 for SLE11 +%define _libexecdir %{_prefix}/lib +%endif + +# OURUGLYBUILDPHASE +%build +%configure + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/excludearch.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/excludearch.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/excludearch.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/excludearch.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,8 @@ +Name: excludearch +ExclusiveArch: s390x +ExcludeArch: s390 +%if 0%{?suse_version} +BuildRequires: dependency +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/excludes-bracketing.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/excludes-bracketing.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/excludes-bracketing.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/excludes-bracketing.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,5 +1,6 @@ %bcond_with[^\s]* %add_maven_depmap +%apache_test_module_load %attr(\s*\([^)]*\))? %build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/macros.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/macros.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/macros.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/macros.spec 2017-04-08 11:05:38.000000000 +0200 @@ -9,4 +9,10 @@ %useful_macro 15 ./configure.sh \ +CFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fPIE" \ +LDFLAGS="-pie" \ +./configure \ + +CFLAGS="-g" ./configure + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/prereq.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/prereq.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/prereq.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/prereq.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,3 +1,9 @@ +Name: prereq +PreReq: %fillup_prereq +PreReq: %insserv_prereq +PreReq: %{_bindir}/chroot +PreReq: /bin/mkdir +PreReq: /bin/rm PreReq: deprecatedrequires PreReq: uglyline1 PreReq: uglyline2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/susekmp.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/susekmp.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/susekmp.spec 2017-02-27 11:17:49.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/susekmp.spec 2017-04-08 11:05:38.000000000 +0200 @@ -1,6 +1,7 @@ %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 %{?suse_kernel_module_package:%{suse_kernel_module_package} -p %{SOURCE8} -n %{name}-guest -f %{SOURCE6} kdump um xen xenpae} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/sysusers.spec new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/sysusers.spec --- old/spec-cleaner-spec-cleaner-0.9.3/tests/out-minimal/sysusers.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.9.4/tests/out-minimal/sysusers.spec 2017-04-08 11:05:38.000000000 +0200 @@ -0,0 +1,17 @@ +Source1: system-user-uucp.conf +BuildRequires: sysuser-tools + +%package -n system-user-uucp +Summary: System user and group uucp +%sysusers_requires + +%build +%sysusers_generate_pre %{SOURCE1} uucp + +%pre -n system-user-uucp -f uucp.pre + +%files -n system-user-uucp +%defattr(-,root,root) +%dir %attr(0750,uucp,uucp) %{_sysconfdir}/uucp + +%changelog ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.DDtZtI/_old 2017-04-13 10:45:22.238876937 +0200 +++ /var/tmp/diff_new_pack.DDtZtI/_new 2017-04-13 10:45:22.242876372 +0200 @@ -1,6 +1,6 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 0.9.3-1 +Version: 0.9.4-1 Binary: spec-cleaner Maintainer: Přemysl Janouch <pjano...@suse.com> Architecture: all