Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-02-03 16:41:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-01-15 16:27:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2014-02-03 16:41:56.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Feb 3 12:44:39 UTC 2014 - [email protected] + +- Version bump to 0.5.4: + * plenty of bugfixes regarding to spec parsing as they were + reported on github + * add more exceptions on adding curly brackets + * update licenses list to the latest. + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.5.3.tar.gz New: ---- spec-cleaner-0.5.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.OLidKx/_old 2014-02-03 16:41:56.000000000 +0100 +++ /var/tmp/diff_new_pack.OLidKx/_new 2014-02-03 16:41:56.000000000 +0100 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.5.3 +Version: 0.5.4 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.5.3.tar.gz -> spec-cleaner-0.5.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.5.4/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.5.3/data/excludes-bracketing.txt 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/data/excludes-bracketing.txt 2014-02-03 13:39:11.000000000 +0100 @@ -1,6 +1,8 @@ attr bcond_with build +cmake +cmake_[^\s]* configure config defattr @@ -28,6 +30,9 @@ include insserv_[^\s]* install +install_info +install_info_delete +lang_package make_install mime_database_post[^\s]* package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/data/licenses_changes.txt new/spec-cleaner-spec-cleaner-0.5.4/data/licenses_changes.txt --- old/spec-cleaner-spec-cleaner-0.5.3/data/licenses_changes.txt 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/data/licenses_changes.txt 2014-02-03 13:39:11.000000000 +0100 @@ -635,6 +635,8 @@ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0+-with-openssl-exception+ SUSE-GPL-3.0-with-FLOSS-exception GPL-3.0 with exceptions for certain FLOSS licenses SUSE-GPL-3.0-with-FLOSS-exception+ SUSE-GPL-3.0-with-FLOSS-exception+ +SUSE-GPL-3.0-with-font-exception SUSE-GPL-3.0-with-font-exception +SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-font-exception+ SUSE-GPL-3.0-with-openssl-exception GPLv3 with openssl linking exception (see e.g. courier-authlib 0.64.0) SUSE-GPL-3.0-with-openssl-exception+ SUSE-GPL-3.0-with-openssl-exception+ SUSE-GPL-3.0-with-template-exception See e.g. dh-make from debian (debian/copyright) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmcleaner.py 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmcleaner.py 2014-02-03 13:39:11.000000000 +0100 @@ -139,7 +139,8 @@ if len(line) == 0: break # Remove \n to make it easier to parse things - line = line[:-1] + line = line.rstrip('\n') + line = line.rstrip('\r') new_class = self._detect_new_section(line) if new_class: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmpreamble.py 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmpreamble.py 2014-02-03 13:39:11.000000000 +0100 @@ -62,6 +62,7 @@ 'requires_eq': '%requires_eq', 'recommends': 'Recommends', 'suggests': 'Suggests', + 'enhances': 'Enhances', 'supplements': 'Supplements', # Provides/Obsoletes cannot be part of this since we want to keep them # mixed, so we'll have to specify the key when needed @@ -90,6 +91,7 @@ 'requires_phase', # this is Requires(pre/post/...) 'recommends', 'suggests', + 'enhances', 'supplements', 'provides_obsoletes', 'buildroot', @@ -107,6 +109,7 @@ 'requires_eq', 'recommends', 'suggests', + 'enhances', 'supplements', ] @@ -147,6 +150,7 @@ 'requires': self.reg.re_requires, 'recommends': self.reg.re_recommends, 'suggests': self.reg.re_suggests, + 'ehnances': self.reg.re_enhances, 'supplements': self.reg.re_supplements, # 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 @@ -350,8 +354,9 @@ if self.reg.re_requires_token.match(value): # we do fix the package list only if there is no rpm call there on line # otherwise print there warning about nicer content and skip - if self.reg.re_rpm_command.search(value) and not self.previous_line.startswith('#'): - self.current_group.append('# FIXME: Use %requires_eq macro instead') + if self.reg.re_rpm_command.search(value): + if not self.previous_line.startswith('#'): + self.current_group.append('# FIXME: Use %requires_eq macro instead') return [ value ] tokens = [ item[1] for item in self.reg.re_requires_token.findall(value) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-0.5.3/spec_cleaner/rpmregexp.py 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/spec_cleaner/rpmregexp.py 2014-02-03 13:39:11.000000000 +0100 @@ -54,6 +54,7 @@ re_requires_phase = re.compile('^Requires(\(\S+\)):\s*(.*)', re.IGNORECASE) re_recommends = re.compile('^Recommends:\s*(.*)', re.IGNORECASE) re_suggests = re.compile('^Suggests:\s*(.*)', re.IGNORECASE) + re_enhances = re.compile('^Enhances:\s*(.*)', re.IGNORECASE) re_supplements = re.compile('^Supplements:\s*(.*)', re.IGNORECASE) re_provides = re.compile('^Provides:\s*(.*)', re.IGNORECASE) re_obsoletes = re.compile('^Obsoletes:\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/in/nonewline.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/in/nonewline.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/in/nonewline.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/in/nonewline.spec 2014-02-03 13:39:11.000000000 +0100 @@ -0,0 +1,3 @@ +Name: nonewline + +%changelog \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/in/rpmcallpkg.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/in/rpmcallpkg.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/in/rpmcallpkg.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/in/rpmcallpkg.spec 2014-02-03 13:39:11.000000000 +0100 @@ -0,0 +1,17 @@ +%if %{with kde4} +%package -n %{name}-client-kde4 +Group: Productivity/Telephony/SIP/Clients +Summary: KDE 4 Backend for sflphone +Requires: %{name} = %{version}-%{release} +%kde4_runtime_requires +%kde4_pimlibs_requires + +# For building with KDE 4.12 +# % kde4_akonadi_requires == "Requires: akonadi-runtime >= 1.10.2 akonadi-runtime < 1.10.40" (on openSUSE 13.1) +Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) + + +%description -n %{name}-client-kde4 +KDE 4 backend for SFLphone. +%endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/in/rpmcmd.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/in/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/in/rpmcmd.spec 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/in/rpmcmd.spec 2014-02-03 13:39:11.000000000 +0100 @@ -5,3 +5,4 @@ Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) 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`) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/out/nonewline.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/out/nonewline.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/out/nonewline.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/out/nonewline.spec 2014-02-03 13:39:11.000000000 +0100 @@ -0,0 +1,21 @@ +# +# spec file for package nonewline +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +Name: nonewline + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/out/rpmcallpkg.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/out/rpmcallpkg.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/out/rpmcallpkg.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/out/rpmcallpkg.spec 2014-02-03 13:39:11.000000000 +0100 @@ -0,0 +1,34 @@ +# +# spec file for package rpmcallpkg +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%if %{with kde4} + +%package -n %{name}-client-kde4 +Summary: KDE 4 Backend for sflphone +Group: Productivity/Telephony/SIP/Clients +Requires: %{name} = %{version}-%{release} +# For building with KDE 4.12 +# % kde4_akonadi_requires == "Requires: akonadi-runtime >= 1.10.2 akonadi-runtime < 1.10.40" (on openSUSE 13.1) +Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) +%{kde4_runtime_requires} +%{kde4_pimlibs_requires} + +%description -n %{name}-client-kde4 +KDE 4 backend for SFLphone. +%endif + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.3/tests/out/rpmcmd.spec new/spec-cleaner-spec-cleaner-0.5.4/tests/out/rpmcmd.spec --- old/spec-cleaner-spec-cleaner-0.5.3/tests/out/rpmcmd.spec 2014-01-09 18:26:24.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.4/tests/out/rpmcmd.spec 2014-02-03 13:39:11.000000000 +0100 @@ -18,6 +18,8 @@ %define version %(rpm -q --qf '%{VERSION}' kernel-source) # FIXME: Use %requires_eq macro instead +Requires: akonadi-runtime >= %( echo `rpm -q --queryformat '%{VERSION}' akonadi-runtime`) +# FIXME: Use %requires_eq macro instead Requires: ant = %(echo `rpm -q --queryformat '%{VERSION}' ant`) # FIXME: Use %requires_eq macro instead Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
