Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2020-01-30 22:37:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Thu Jan 30 22:37:13 2020 rev:62 rq:768720 version:1.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2019-11-15 00:15:09.912057158 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new.26092/spec-cleaner.changes 2020-01-30 22:37:17.716577431 +0100 @@ -1,0 +2,16 @@ +Thu Jan 30 12:00:42 UTC 2020 - Kristyna Streitova <[email protected]> + +- Update to 1.1.8 bsc#1099674: + * Change libexecdir substitution to do /usr/libexec to %{_libexecdir} + * Exclude apache_rex_check from bracketing + * Add testscase for boolean dependencies that gets mangled currently + * Do not remove -p0 from autosetup + * Use %make_build if possible issue + * Teach spec-cleaner to not break the %elif* macros added with + rpm 4.15 + * Fixup the nested boolean dependencies + * Fixup whitespace reported by flake8 + * Set explicit urllib timeout issue + * Replace more stuff for %make build + +------------------------------------------------------------------- Old: ---- spec-cleaner-1.1.7.tar.gz New: ---- spec-cleaner-1.1.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.wGKazS/_old 2020-01-30 22:37:18.364577743 +0100 +++ /var/tmp/diff_new_pack.wGKazS/_new 2020-01-30 22:37:18.364577743 +0100 @@ -1,7 +1,7 @@ # # spec file for package spec-cleaner # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Vincent Untz <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 1.1.7 +Version: 1.1.8 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-1.1.7.tar.gz -> spec-cleaner-1.1.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-1.1.8/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-1.1.7/data/excludes-bracketing.txt 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/data/excludes-bracketing.txt 2020-01-24 10:31:08.000000000 +0100 @@ -1,4 +1,5 @@ add_maven_depmap +apache_rex_check apache_test_module_start_apache apache_test_module_stop_apache apache_test_module_curl @@ -28,6 +29,7 @@ doc docdir else +elif[^\s]* endif exclude fdupes diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/__init__.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/__init__.py 2020-01-24 10:31:08.000000000 +0100 @@ -14,7 +14,7 @@ from .rpmexception import RpmException, RpmWrongArgs -__version__ = '1.1.7' +__version__ = '1.1.8' def process_args(argv: List[str]) -> Dict[str, Any]: @@ -59,7 +59,6 @@ '--no-curlification', action='store_true', help='do not convert variables bracketing (%%{macro}) and keep it as it was on the input' ) 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('--remove-groups', action='store_true', help='remove groups from the specfile.') parser.add_argument( '--copyright-year', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/dependency_parser.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/dependency_parser.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/dependency_parser.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/dependency_parser.py 2020-01-24 10:31:08.000000000 +0100 @@ -25,10 +25,13 @@ def find_end_of_bracketed_macro(string, regex, opening, closing): - macro = string[0:2] - # eat '%{' - string = string[2:] - + # ommit the initial bracket, or %bracket + if string.startswith('%'): + macro = string[0:2] + string = string[2:] + else: + macro = string[0:1] + string = string[1:] opened = 1 while opened and string: try: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcheck.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmcheck.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcheck.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmcheck.py 2020-01-24 10:31:08.000000000 +0100 @@ -18,14 +18,14 @@ line = self.reg.re_jobs.sub('%{?_smp_mflags}', line) if not self.minimal: - line = self._add_jobs(line) line = self._replace_pytest(line) + line = self._replace_make(line) Section.add(self, line) - def _add_jobs(self, line: str) -> str: + def _replace_pytest(self, line: str) -> str: """ - Add %{?_smp_mflags} to 'make' call. + Replace various pytest calls with %pytest or %pytest_arch macros. Args: line: A string representing a line to process. @@ -33,20 +33,13 @@ Return: The processed line. """ - # add jobs if we have just make call on line - # if user want single thread he should specify -j1 - if self.reg.re_make.match(line): - # if there are no smp_flags or jobs spec - if line.find('%{?_smp_mflags}') == -1 and line.find('-j') == -1: - # Don't append %_smp_mflags if the line ends with a backslash, - # it would break the formatting - if not line.endswith('\\') and not line.lstrip().startswith('#'): - line = self.reg.re_make.sub(r'\1make %{?_smp_mflags}\2', line) + line = self.reg.re_pytest.sub('%pytest', line) + line = self.reg.re_pytest_arch.sub('%pytest_arch', line) return line - def _replace_pytest(self, line: str) -> str: + def _replace_make(self, line: str) -> str: """ - Replace various pytest calls with %pytest or %pytest_arch macros. + Replace 'make' call with '%make_build' macro. Args: line: A string representing a line to process. @@ -54,6 +47,18 @@ Return: The processed line. """ - line = self.reg.re_pytest.sub('%pytest', line) - line = self.reg.re_pytest_arch.sub('%pytest_arch', line) + + # if it is comment line then do nothing + if line.lstrip().startswith('#'): + return line + # find all make calls and replace them with %make_build + if self.reg.re_make.match(line): + line = self.reg.re_make.sub(r'\1%make_build\2', line) + # remove from line all the options that are part of %make_build macro + if self.reg.re_make_build.match(line): + # remove smp flags + line = line.replace(' %{?_smp_mflags}', '') + # remove verbosity + line = line.replace(' V=1', '') + line = line.replace(' VERBOSE=1', '') return line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcleaner.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmcleaner.py 2020-01-24 10:31:08.000000000 +0100 @@ -227,7 +227,7 @@ Returns: True if a condition change was found, False otherwise. """ - if any([re.match(line) for re in [self.reg.re_endif, self.reg.re_else, self.reg.re_endcodeblock]]): + if any([re.match(line) for re in [self.reg.re_endif, self.reg.re_else_elif, self.reg.re_endcodeblock]]): return True return False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmpreamble.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmpreamble.py 2020-01-24 10:31:08.000000000 +0100 @@ -358,7 +358,7 @@ self.previous_line = line return - elif self.reg.re_else.match(line): + elif self.reg.re_else_elif.match(line): if self.condition: self._add_line_to('conditions', line) self.end_subparagraph() @@ -398,7 +398,7 @@ response = None try: if https_url and not self.minimal: - response = urlopen(https_url) + response = urlopen(https_url, timeout=1) if response.getcode() == 200: value = https_url # ssl.CertificateError is a subclass of SSLError in Python 3.7. In Python 3.6 it's not. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmprep.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmprep.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmprep.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmprep.py 2020-01-24 10:31:08.000000000 +0100 @@ -51,7 +51,8 @@ The line with pretty patchlines. """ # -p0 is default - line = line.replace('-p0', '') + if line.startswith('%patch'): + line = line.replace('-p0', '') # %patch0 is desired if (line.startswith('%patch ') or line == '%patch') and '-P' not in line: line = line.replace('%patch', '%patch0') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmregexp.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmregexp.py 2020-01-24 10:31:08.000000000 +0100 @@ -34,7 +34,7 @@ # WARNING: keep in sync with rpmcleaner Section change detection re_if = re.compile(r'^\s*(?:%{?if\s|%{?ifarch\s|%{?ifnarch\s|%{?if\S*}?(\s.*|)$)', re.IGNORECASE) re_codeblock = re.compile(r'^\s*((### COMMON-([a-zA-Z0-9]+)-BEGIN ###|# MANUAL BEGIN|# SECTION)(\s.*|)|# MANUAL)$', re.IGNORECASE) - re_else = re.compile(r'^\s*%else(\s.*|)$', re.IGNORECASE) + re_else_elif = re.compile(r'^\s*%(else|elif)(\s.*|)$', re.IGNORECASE) re_endif = re.compile(r'^\s*%endif(\s.*|)$', re.IGNORECASE) re_endcodeblock = re.compile(r'^\s*(### COMMON-([a-zA-Z0-9]+)-END ###|# MANUAL END|# /MANUAL|# (END|/)SECTION)(\s.*|)$', re.IGNORECASE) re_name = re.compile(r'^Name:\s*(\S*)', re.IGNORECASE) @@ -102,6 +102,7 @@ # rpmbuild re_jobs = re.compile(r'%{?(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}?') re_make = re.compile(r'(^\s*)make(\s.*|)$') + re_make_build = re.compile(r'(^\s*)%make_build(\s.*|)$') re_optflags_quotes = re.compile(r'=\s*\${?RPM_OPT_FLAGS}?\s*$') re_optflags = re.compile(r'\${?RPM_OPT_FLAGS}?') re_suseupdateconfig = re.compile(r'%{?\??suse_update_config') @@ -177,7 +178,7 @@ re_prefix = re.compile(r'(?<!\w)/usr' + endmacro) re_bindir = re.compile(r'%{?_prefix}?/bin' + endmacro) re_sbindir = re.compile(r'%{?_prefix}?/sbin' + endmacro) - re_libexecdir = re.compile(r'%{?_prefix}?/lib' + endmacro) + re_libexecdir = re.compile(r'%{?_prefix}?/libexec' + endmacro) re_includedir = re.compile(r'%{?_prefix}?/include' + endmacro) re_datadir = re.compile(r'%{?_prefix}?/share' + endmacro) re_mandir = re.compile(r'%{?_datadir}?/man' + endmacro) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmsection.py new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmsection.py --- old/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmsection.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/spec_cleaner/rpmsection.py 2020-01-24 10:31:08.000000000 +0100 @@ -22,7 +22,6 @@ spec: A string with the path to the processed specfile. minimal: A flag indicating whether we run in minimal mode (no intrusive operations). no_curlification: A flag indicating whether we want to convert variables to curly brackets. - libexecdir: A flag indicating whether we want convert /usr/lib to %%{_libexecdir}. reg: A Regexp object that holds all regexps that will be used in spec-cleaner. condition: A flag representing if we are in the conditional or not. _condition_counter: An int for counting in how many (nested) condition we currently are. @@ -34,7 +33,6 @@ self.spec: str = options['specfile'] self.minimal: bool = options['minimal'] self.no_curlification: bool = options['no_curlification'] - self.libexecdir: bool = options['libexecdir'] self.reg: Regexp = options['reg'] # Are we inside of conditional or not self.condition: bool = False @@ -248,8 +246,7 @@ line = self.reg.re_prefix.sub(r'%{_prefix}\1', line) line = self.reg.re_bindir.sub(r'%{_bindir}\1', line) line = self.reg.re_sbindir.sub(r'%{_sbindir}\1', line) - if not self.minimal and self.libexecdir: - line = self.reg.re_libexecdir.sub(r'%{_libexecdir}\1', line) + line = self.reg.re_libexecdir.sub(r'%{_libexecdir}\1', line) line = self.reg.re_includedir.sub(r'%{_includedir}\1', line) line = self.reg.re_datadir.sub(r'%{_datadir}\1', line) line = self.reg.re_mandir.sub(r'%{_mandir}\1', line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/acceptance-tests.py new/spec-cleaner-spec-cleaner-1.1.8/tests/acceptance-tests.py --- old/spec-cleaner-spec-cleaner-1.1.7/tests/acceptance-tests.py 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/acceptance-tests.py 2020-01-24 10:31:08.000000000 +0100 @@ -49,7 +49,6 @@ 'minimal': False, 'no_curlification': False, 'no_copyright': True, - 'libexecdir': True, 'copyright_year': 2013, 'remove_groups': False, 'tex': False, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/boolean.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/boolean.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/boolean.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/boolean.spec 2020-01-24 10:31:08.000000000 +0100 @@ -5,3 +5,5 @@ Conflicts: (pkgA and pkgB) Recommends: (myPkg-langCZ if langsupportCZ) Requires: (myPkg-backend-mariaDB if mariaDB else sqlite) +Requires: ((apache2 and apache2-mod_wsgi) or (nginx and uwsgi)) +Requires: ((mariadb and python-MySQL-python) or (postgresql and python-psycopg2)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/conditionmultiline.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/conditionmultiline.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/conditionmultiline.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/conditionmultiline.spec 2020-01-24 10:31:08.000000000 +0100 @@ -49,6 +49,8 @@ --with-openjdk-src-zip=%{SOURCE1} \ %ifnarch %{arm} %{aarch64} --with-parallel-jobs=${NUMCPUS} \ +%elifarch %{ix86} + --with-parallel-jobs=2 \ %else --with-parallel-jobs=1 \ %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/makeflags.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/makeflags.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/makeflags.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/makeflags.spec 2020-01-24 10:31:08.000000000 +0100 @@ -7,3 +7,5 @@ make PREFIX=/ \ STATIC="" make -j1 +make %{?_smp_mflags} VERBOSE=1 +make V=1 %{?_smp_mflags} all doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/prefix.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/prefix.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/prefix.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/prefix.spec 2020-01-24 10:31:08.000000000 +0100 @@ -2,7 +2,7 @@ # local install python scons/scons.py PREFIX=/usr/local # more complicated case -python scons/scons.py PREFIX=/usr/lib/test/usr +python scons/scons.py PREFIX=/usr/libexec/test/usr # with spaces python scons/scons.py PREFIX=/usr blah # ending with newline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/rpathreplacement.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/rpathreplacement.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/rpathreplacement.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/rpathreplacement.spec 2020-01-24 10:31:08.000000000 +0100 @@ -6,7 +6,7 @@ %defattr(-,root,root) %doc ChangeLog README COPYING /usr/name/ -/usr/lib/name/ +/usr/libexec/name/ /usr/lib64/name /usr/share/data/name /usr/include/name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/sourcespatches.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/sourcespatches.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/sourcespatches.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/sourcespatches.spec 2020-01-24 10:31:08.000000000 +0100 @@ -16,6 +16,7 @@ %global test somethingelse %prep +%autosetup -p0 %setup -qn %name-%version %setup -q -n "%name-%version" -a1 %setup -n "%name-%version" -q -b2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/in/url_https.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/in/url_https.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/in/url_https.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/in/url_https.spec 2020-01-24 10:31:08.000000000 +0100 @@ -50,3 +50,7 @@ %package other Summary: Url is not http, https or ftp Url: abc://null.badssl.com/ + +%package brokenserver +Summary: The server reconnects and cycles +URL: http://xavprods.free.fr/lzx diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/boolean.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/boolean.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/boolean.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/boolean.spec 2020-01-24 10:31:08.000000000 +0100 @@ -1,3 +1,5 @@ +Requires: ((apache2 and apache2-mod_wsgi) or (nginx and uwsgi)) +Requires: ((mariadb and python-MySQL-python) or (postgresql and python-psycopg2)) Requires: (myPkg-backend-mariaDB if mariaDB else sqlite) Requires: (pkgA >= 3.2 or pkgB) Requires: (pkgA or (pkgB and pkgC)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/check.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/check.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/check.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/check.spec 2020-01-24 10:31:08.000000000 +0100 @@ -1,6 +1,6 @@ %check -make %{?_smp_mflags} V=1 check RUNTEST=true -make -j1 check -make %{?_smp_mflags} test V=1 +%make_build check RUNTEST=true +%make_build -j1 check +%make_build test %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/conditionmultiline.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/conditionmultiline.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/conditionmultiline.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/conditionmultiline.spec 2020-01-24 10:31:08.000000000 +0100 @@ -11,7 +11,7 @@ %ifnarch %{arm} --with-num-cores="$NUM_PROC" \ %endif - make -j1 + %make_build -j1 %ifarch %{jit_arches} %if 0%{?suse_version} >= 1120 @@ -49,6 +49,8 @@ --with-openjdk-src-zip=%{SOURCE1} \ %ifnarch %{arm} %{aarch64} --with-parallel-jobs=${NUMCPUS} \ +%elifarch %{ix86} + --with-parallel-jobs=2 \ %else --with-parallel-jobs=1 \ %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/makeflags.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/makeflags.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/makeflags.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/makeflags.spec 2020-01-24 10:31:08.000000000 +0100 @@ -3,9 +3,11 @@ # make this easy export CFLAGS="%{optflags} -blabla" cd make -make %{?_smp_mflags} -make PREFIX=/ \ +%make_build +%make_build PREFIX=/ \ STATIC="" -make -j1 +%make_build -j1 +%make_build +%make_build all doc %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/makeparams.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/makeparams.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/makeparams.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/makeparams.spec 2020-01-24 10:31:08.000000000 +0100 @@ -1,34 +1,34 @@ %build -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} -make %{?_smp_mflags} check ||: -make %{?_smp_mflags} && mv mtr xmtr -make %{?_smp_mflags} VERBOSE=1 +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build +%make_build check ||: +%make_build && mv mtr xmtr +%make_build %install %make_install install-etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/mingw32-clutter.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/mingw32-clutter.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/mingw32-clutter.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/mingw32-clutter.spec 2020-01-24 10:31:08.000000000 +0100 @@ -104,7 +104,7 @@ --disable-static --enable-shared \ --with-flavour=win32 \ --disable-glibtest --disable-conformance -make %{?_smp_mflags} || make +%make_build || make %install %make_install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/rpmpreamble.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/rpmpreamble.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/rpmpreamble.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/rpmpreamble.spec 2020-01-24 10:31:08.000000000 +0100 @@ -104,7 +104,7 @@ --disable-static \ --disable-examples \ --enable-curl -make %{?_smp_mflags} +%make_build %install %make_install @@ -112,7 +112,7 @@ %check # Paralel execution of tests fail -make -j 1 check +%make_build -j 1 check %post -n %{libmicrohttpd} -p /sbin/ldconfig %postun -n %{libmicrohttpd} -p /sbin/ldconfig diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/sourcespatches.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/sourcespatches.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/sourcespatches.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/sourcespatches.spec 2020-01-24 10:31:08.000000000 +0100 @@ -16,6 +16,7 @@ Patch10: test2 %prep +%autosetup -p0 %setup -q %setup -q -a1 %setup -q -b2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out/whitespace-build.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out/whitespace-build.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out/whitespace-build.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out/whitespace-build.spec 2020-01-24 10:31:08.000000000 +0100 @@ -2,7 +2,7 @@ pushd bulshit # FIXME: you should use the %%configure macro ./configure - make %{?_smp_mflags} + %make_build popd %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/boolean.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/boolean.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/boolean.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/boolean.spec 2020-01-24 10:31:08.000000000 +0100 @@ -1,3 +1,5 @@ +Requires: ((apache2 and apache2-mod_wsgi) or (nginx and uwsgi)) +Requires: ((mariadb and python-MySQL-python) or (postgresql and python-psycopg2)) Requires: (myPkg-backend-mariaDB if mariaDB else sqlite) Requires: (pkgA >= 3.2 or pkgB) Requires: (pkgA or (pkgB and pkgC)) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/conditionmultiline.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/conditionmultiline.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/conditionmultiline.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/conditionmultiline.spec 2020-01-24 10:31:08.000000000 +0100 @@ -49,6 +49,8 @@ --with-openjdk-src-zip=%{SOURCE1} \ %ifnarch %{arm} %{aarch64} --with-parallel-jobs=${NUMCPUS} \ +%elifarch %{ix86} + --with-parallel-jobs=2 \ %else --with-parallel-jobs=1 \ %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/makeflags.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/makeflags.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/makeflags.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/makeflags.spec 2020-01-24 10:31:08.000000000 +0100 @@ -7,5 +7,7 @@ make PREFIX=/ \ STATIC="" make -j1 +make %{?_smp_mflags} VERBOSE=1 +make V=1 %{?_smp_mflags} all doc %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/prefix.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/prefix.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/prefix.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/prefix.spec 2020-01-24 10:31:08.000000000 +0100 @@ -2,7 +2,7 @@ # local install python scons/scons.py PREFIX=%{_prefix}/local # more complicated case -python scons/scons.py PREFIX=%{_prefix}/lib/test/usr +python scons/scons.py PREFIX=%{_libexecdir}/test/usr # with spaces python scons/scons.py PREFIX=%{_prefix} blah # ending with newline diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/rpathreplacement.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/rpathreplacement.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/rpathreplacement.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/rpathreplacement.spec 2020-01-24 10:31:08.000000000 +0100 @@ -7,7 +7,7 @@ %license COPYING %doc ChangeLog README %{_prefix}/name/ -%{_prefix}/lib/name/ +%{_libexecdir}/name/ %{_libdir}/name %{_datadir}/data/name %{_includedir}/name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/sourcespatches.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/sourcespatches.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/sourcespatches.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/sourcespatches.spec 2020-01-24 10:31:08.000000000 +0100 @@ -16,6 +16,7 @@ Patch10: test2 %prep +%autosetup -p0 %setup -q -n %name-%version %setup -q -n "%name-%version" -a1 %setup -q -n "%name-%version" -b2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/url_https.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/url_https.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/url_https.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/out-minimal/url_https.spec 2020-01-24 10:31:08.000000000 +0100 @@ -48,4 +48,8 @@ Summary: Url is not http, https or ftp URL: abc://null.badssl.com/ +%package brokenserver +Summary: The server reconnects and cycles +URL: http://xavprods.free.fr/lzx + %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.7/tests/web/url_https.spec new/spec-cleaner-spec-cleaner-1.1.8/tests/web/url_https.spec --- old/spec-cleaner-spec-cleaner-1.1.7/tests/web/url_https.spec 2019-11-14 11:41:19.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.8/tests/web/url_https.spec 2020-01-24 10:31:08.000000000 +0100 @@ -48,4 +48,8 @@ Summary: Url is not http, https or ftp URL: abc://null.badssl.com/ +%package brokenserver +Summary: The server reconnects and cycles +URL: http://xavprods.free.fr/lzx + %changelog
