Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-04-05 16:48:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-02-03 16:41:56.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2014-04-05 16:48:20.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Apr 4 12:56:21 UTC 2014 - [email protected] + +- Version bump to 0.5.5: + * Few minor fixes as reported on github tracker. + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.5.4.tar.gz New: ---- spec-cleaner-0.5.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.DVpX5t/_old 2014-04-05 16:48:20.000000000 +0200 +++ /var/tmp/diff_new_pack.DVpX5t/_new 2014-04-05 16:48:20.000000000 +0200 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.5.4 +Version: 0.5.5 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.5.4.tar.gz -> spec-cleaner-0.5.5.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.5.5/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.5.4/data/excludes-bracketing.txt 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/data/excludes-bracketing.txt 2014-04-04 14:47:13.000000000 +0200 @@ -1,5 +1,5 @@ attr -bcond_with +bcond_with[^\s]* build cmake cmake_[^\s]* @@ -21,6 +21,7 @@ find_lang ghost global +gpg_verify changelog check icon_theme_cache_post[^\s]* @@ -32,11 +33,14 @@ install install_info install_info_delete +ix86 lang_package make_install mime_database_post[^\s]* package patch[0-9]* +perl_gen_filelist +perl_make_install perl_process_[^\s]* post posttrans diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/__init__.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/__init__.py 2014-04-04 14:47:13.000000000 +0200 @@ -5,7 +5,7 @@ # All rights reserved. # See COPYING for details. -__version__ = '0.5.2' +__version__ = '0.5.5' import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/fileutils.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/fileutils.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/fileutils.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/fileutils.py 2014-04-04 14:47:13.000000000 +0200 @@ -40,8 +40,8 @@ try: f = open(FILE, mode) - except IOError: - raise RpmException(e) + except IOError as error: + raise RpmException(error) self.f = f diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmbuild.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmbuild.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmbuild.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmbuild.py 2014-04-04 14:47:13.000000000 +0200 @@ -21,7 +21,10 @@ 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: - 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('\\'): + line = '{0} {1}'.format(line, '%{?_smp_mflags}') # if user uses cmake directly just recommend him using the macros if line.startswith('cmake'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcleaner.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmcleaner.py 2014-04-04 14:47:13.000000000 +0200 @@ -133,8 +133,7 @@ # FIXME: we need to store the content localy and then reorder # to maintain the specs all the same (eg somebody put # filelist to the top). - while True: - line = self.fin.readline() + for line in self.fin: # Stop at the end of the file if len(line) == 0: break diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcopyright.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmcopyright.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcopyright.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmcopyright.py 2014-04-04 14:47:13.000000000 +0200 @@ -1,6 +1,5 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import re import os import time diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmexception.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmexception.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmexception.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmexception.py 2014-04-04 14:47:13.000000000 +0200 @@ -1,7 +1,5 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import sys - class RpmBaseException(Exception): """ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmfiles.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmfiles.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmfiles.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmfiles.py 2014-04-04 14:47:13.000000000 +0200 @@ -1,7 +1,5 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import re - from rpmsection import Section diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpminstall.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpminstall.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpminstall.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpminstall.py 2014-04-04 14:47:13.000000000 +0200 @@ -1,7 +1,5 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import re - from rpmsection import Section diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmpreamble.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmpreamble.py 2014-04-04 14:47:13.000000000 +0200 @@ -333,7 +333,6 @@ # we just want the pkgname if we have version string there # and for the pkgconfig deps we need to put the version into # the braces - split = value.split() pkgname = value.split()[0] version = value.replace(pkgname,'') pkgconfig = [] @@ -446,10 +445,10 @@ licenses = {} files = FileUtils() - f = files.open_datafile(LICENSES_CHANGES) + files.open_datafile(LICENSES_CHANGES) for line in files.f: # strip newline - line = line[:-1] + line = line.rstrip('\n') # file has format # correct license string<tab>known bad license string # tab is used as separator diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmprep.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmprep.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmprep.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmprep.py 2014-04-04 14:47:13.000000000 +0200 @@ -1,9 +1,8 @@ # vim: set ts=4 sw=4 et: coding=UTF-8 -import re - from rpmsection import Section + class RpmPrep(Section): ''' Try to simplify to %setup -q when possible. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmregexp.py 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmregexp.py 2014-04-04 14:47:13.000000000 +0200 @@ -117,7 +117,7 @@ files.open_datafile(BRACKETING_EXCLUDES) keywords= [] for line in files.f: - keywords.append(line[:-1]) + keywords.append(line.rstrip('\n')) files.close() return keywords @@ -131,8 +131,8 @@ macros = [] re_rc_macrofunc = re.compile(r'^-[0-9]+[:=]\s(\w+)\(.*') output = os.popen('rpm --showrc') - for line in output.readlines(): - line = line[:-1] + for line in output: + line = line.rstrip('\n') found_macro = re_rc_macrofunc.sub(r'\1', line) if found_macro != line: macros += [ found_macro ] @@ -148,8 +148,8 @@ files = FileUtils() files.open(spec, 'r') - for line in files.f.readlines(): - line = line[:-1] + for line in files.f: + line = line.rstrip('\n') found_macro = self.re_spec_macrofunc.sub(r'\1', line) if found_macro != line: macrofuncs += [ found_macro ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/tests/in/makeflags.spec new/spec-cleaner-spec-cleaner-0.5.5/tests/in/makeflags.spec --- old/spec-cleaner-spec-cleaner-0.5.4/tests/in/makeflags.spec 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/tests/in/makeflags.spec 2014-04-04 14:47:13.000000000 +0200 @@ -1,3 +1,5 @@ %build make +make PREFIX=/ \ + STATIC="" make -j1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.4/tests/out/makeflags.spec new/spec-cleaner-spec-cleaner-0.5.5/tests/out/makeflags.spec --- old/spec-cleaner-spec-cleaner-0.5.4/tests/out/makeflags.spec 2014-02-03 13:39:11.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.5/tests/out/makeflags.spec 2014-04-04 14:47:13.000000000 +0200 @@ -18,5 +18,7 @@ %build make %{?_smp_mflags} +make PREFIX=/ \ + STATIC="" make -j1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
