Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-06-24 15:16:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2014-05-10 22:58:34.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2014-06-24 15:16:26.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Jun 23 15:01:57 UTC 2014 - [email protected] + +- Version bump to 0.5.8: + * brown paperbag release fixing tests on py3. + +------------------------------------------------------------------- +Mon Jun 23 11:25:09 UTC 2014 - [email protected] + +- Version bump to 0.5.7: + * Updates about smp_mflags parsing + * makeinstall macro replacing improvements. + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.5.6.tar.gz New: ---- spec-cleaner-0.5.8.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.9BDcgH/_old 2014-06-24 15:16:27.000000000 +0200 +++ /var/tmp/diff_new_pack.9BDcgH/_new 2014-06-24 15:16:27.000000000 +0200 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.5.6 +Version: 0.5.8 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.5.6.tar.gz -> spec-cleaner-0.5.8.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.5.8/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.5.6/data/excludes-bracketing.txt 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/data/excludes-bracketing.txt 2014-06-23 17:00:21.000000000 +0200 @@ -1,3 +1,4 @@ +add_maven_depmap attr bcond_with[^\s]* build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/__init__.py 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/__init__.py 2014-06-23 17:00:21.000000000 +0200 @@ -5,7 +5,7 @@ # All rights reserved. # See COPYING for details. -__version__ = '0.5.6' +__version__ = '0.5.8' import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmbuild.py new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmbuild.py --- old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmbuild.py 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmbuild.py 2014-06-23 17:00:21.000000000 +0200 @@ -1,33 +1,17 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -from rpmsection import Section +# We basically extend rpmcheck +from rpmcheck import RpmCheck -class RpmBuild(Section): +class RpmBuild(RpmCheck): """ Replace various troublemakers in build phase """ def add(self, line): - line = self._complete_cleanup(line) - - # smp_mflags for jobs - if not self.reg.re_comment.match(line): - line = self.embrace_macros(line) - line = self.reg.re_jobs.sub('%{?_smp_mflags}', line) - - # add jobs if we have just make call on line - # if user want single thread he should specify -j1 - if line.startswith('make'): - # if there are no smp_flags or jobs spec just append it - 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('\\'): - line = '{0} {1}'.format(line, '%{?_smp_mflags}') - # if user uses cmake directly just recommend him using the macros if line.startswith('cmake'): - self.lines.append('# FIXME: you should use %cmake macros') + self.lines.append('# FIXME: you should use %%cmake macros') - Section.add(self, line) + RpmCheck.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmcheck.py new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmcheck.py --- old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmcheck.py 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmcheck.py 2014-06-23 17:00:21.000000000 +0200 @@ -11,7 +11,7 @@ def add(self, line): line = self._complete_cleanup(line) - # smp_mflags for jobs as tests are usually able to run in parallel + # smp_mflags for jobs if not self.reg.re_comment.match(line): line = self.embrace_macros(line) line = self.reg.re_jobs.sub('%{?_smp_mflags}', line) @@ -19,8 +19,11 @@ # add jobs if we have just make call on line # if user want single thread he should specify -j1 if line.startswith('make'): - # if there are no smp_flags or jobs spec just append it + # if there are no smp_flags or jobs spec if line.find('%{?_smp_mflags}') == -1 and line.find('-j') == -1: - line = '{0} {1}'.format(line, '%{?_smp_mflags}') + # Don't append %_smp_mflags if the line ends with a backslash, + # it would break the formatting + if not line.endswith('\\') and not '||' in line: + line = '{0} {1}'.format(line, '%{?_smp_mflags}') Section.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpminstall.py new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpminstall.py --- old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpminstall.py 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpminstall.py 2014-06-23 17:00:21.000000000 +0200 @@ -24,6 +24,9 @@ if self.reg.re_install.match(line): line = install_command + # we can deal with additional params for %makeinstall so replace that too + line = line.replace('%{makeinstall}', install_command) + Section.add(self, line) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmregexp.py 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmregexp.py 2014-06-23 17:00:21.000000000 +0200 @@ -71,7 +71,7 @@ re_requires_eq = re.compile('^\s*%requires_eq\s*(.*)') # rpmbuild - re_jobs = re.compile('%{(_smp_mflags|\?jobs:\s*-j\s*%(jobs|{jobs}))}') + re_jobs = re.compile('%{(_smp_mflags|\?_smp_flags|\?jobs:\s*-j\s*%(jobs|{jobs}))}') # rpmcopyright re_copyright = re.compile('^#\s*Copyright\ \(c\)\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/tests/in/makeparams.spec new/spec-cleaner-spec-cleaner-0.5.8/tests/in/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.5.6/tests/in/makeparams.spec 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/tests/in/makeparams.spec 2014-06-23 17:00:21.000000000 +0200 @@ -26,8 +26,11 @@ make %_smp_mflags make %{_smp_mflags} make %{?_smp_mflags} +make check ||: +make %{?_smp_flags} VERBOSE=1 %install +%makeinstall install-etc %__make DESTDIR=%{buildroot} install %__make DESTDIR=%buildroot install %{__make} DESTDIR=%{buildroot} install diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.6/tests/out/makeparams.spec new/spec-cleaner-spec-cleaner-0.5.8/tests/out/makeparams.spec --- old/spec-cleaner-spec-cleaner-0.5.6/tests/out/makeparams.spec 2014-05-10 13:14:24.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.8/tests/out/makeparams.spec 2014-06-23 17:00:21.000000000 +0200 @@ -44,8 +44,11 @@ make %{?_smp_mflags} make %{?_smp_mflags} make %{?_smp_mflags} +make check ||: +make %{?_smp_mflags} VERBOSE=1 %install +make DESTDIR=%{buildroot} install %{?_smp_mflags} install-etc make DESTDIR=%{buildroot} install %{?_smp_mflags} make DESTDIR=%{buildroot} install %{?_smp_mflags} make DESTDIR=%{buildroot} install %{?_smp_mflags} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
