Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-05-10 22:58:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04-05 16:48:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2014-05-10 22:58:34.000000000 +0200 @@ -1,0 +2,6 @@ +Sat May 10 11:28:35 UTC 2014 - [email protected] + +- Version bump to 0.5.6: + * Few minor fixes as reported on github. + +------------------------------------------------------------------- Old: ---- spec-cleaner-0.5.5.tar.gz New: ---- spec-cleaner-0.5.6.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.AuEpLQ/_old 2014-05-10 22:58:34.000000000 +0200 +++ /var/tmp/diff_new_pack.AuEpLQ/_new 2014-05-10 22:58:34.000000000 +0200 @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.5.5 +Version: 0.5.6 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-0.5.5.tar.gz -> spec-cleaner-0.5.6.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.5.6/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-0.5.5/data/excludes-bracketing.txt 2014-04-04 14:47:13.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.6/data/excludes-bracketing.txt 2014-05-10 13:14:24.000000000 +0200 @@ -34,6 +34,7 @@ install_info install_info_delete ix86 +lang lang_package make_install mime_database_post[^\s]* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/__init__.py 2014-04-04 14:47:13.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/__init__.py 2014-05-10 13:14:24.000000000 +0200 @@ -5,7 +5,7 @@ # All rights reserved. # See COPYING for details. -__version__ = '0.5.5' +__version__ = '0.5.6' import os import sys diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-0.5.5/spec_cleaner/rpmpreamble.py 2014-04-04 14:47:13.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.6/spec_cleaner/rpmpreamble.py 2014-05-10 13:14:24.000000000 +0200 @@ -150,7 +150,7 @@ 'requires': self.reg.re_requires, 'recommends': self.reg.re_recommends, 'suggests': self.reg.re_suggests, - 'ehnances': self.reg.re_enhances, + 'enhances': 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 @@ -359,6 +359,9 @@ return [ value ] tokens = [ item[1] for item in self.reg.re_requires_token.findall(value) ] + # Split based on ',' here as it breaks up pattern matching later on + tokens = [ item.split(',') for item in tokens ] + tokens = [ item for sublist in tokens for item in sublist ] # first loop over all and do formatting as we can get more deps for one expanded = [] for token in tokens: @@ -367,6 +370,8 @@ # rpm actually allows ',' separated list of deps token = token.replace(',','') token = re.sub(r'([<>]=?|=)', r' \1 ', token) + if not token: + continue if self.pkgconfig: token = self._pkgname_to_pkgconfig(token) if isinstance(token, str): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/tests/in/enhances.spec new/spec-cleaner-spec-cleaner-0.5.6/tests/in/enhances.spec --- old/spec-cleaner-spec-cleaner-0.5.5/tests/in/enhances.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.6/tests/in/enhances.spec 2014-05-10 13:14:24.000000000 +0200 @@ -0,0 +1,7 @@ +Name: haveged +Version: 1.9.1 +Release: 0 +Summary: Feed entropy into random pool +License: GPL-3.0 +Group: System/Daemons +Enhances: smtp_daemon diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/tests/in/nospacebuildrequires.spec new/spec-cleaner-spec-cleaner-0.5.6/tests/in/nospacebuildrequires.spec --- old/spec-cleaner-spec-cleaner-0.5.5/tests/in/nospacebuildrequires.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.6/tests/in/nospacebuildrequires.spec 2014-05-10 13:14:24.000000000 +0200 @@ -0,0 +1,2 @@ +BuildRequires: unzip,dos2unix +BuildRequires: automake diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/tests/out/enhances.spec new/spec-cleaner-spec-cleaner-0.5.6/tests/out/enhances.spec --- old/spec-cleaner-spec-cleaner-0.5.5/tests/out/enhances.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.6/tests/out/enhances.spec 2014-05-10 13:14:24.000000000 +0200 @@ -0,0 +1,26 @@ +# +# spec file for package enhances +# +# 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: haveged +Version: 1.9.1 +Release: 0 +Summary: Feed entropy into random pool +License: GPL-3.0 +Group: System/Daemons +Enhances: smtp_daemon + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/tests/out/hugedefine.spec new/spec-cleaner-spec-cleaner-0.5.6/tests/out/hugedefine.spec --- old/spec-cleaner-spec-cleaner-0.5.5/tests/out/hugedefine.spec 2014-04-04 14:47:13.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-0.5.6/tests/out/hugedefine.spec 2014-05-10 13:14:24.000000000 +0200 @@ -19,8 +19,8 @@ %define langpack(c:Ei:L:l:Mm:n:p:r:S:s:TXx:) \ %define project LibreOffice \ %define lang %{-l:%{-l*}}%{!-l:%{error:Language code not defined}} \ -%define _langpack_lang %{-L:%{-L*}}%{!-L:%{lang}} \ -%define pkgname l10n-%{lang} \ +%define _langpack_lang %{-L:%{-L*}}%{!-L:%lang} \ +%define pkgname l10n-%lang \ %define langname %{-n:%{-n*}}%{!-n:%{error:Language name not defined}} \ \ %global langpack_langs %{langpack_langs} %{_langpack_lang} %{-i:%{-i*}} \ @@ -29,14 +29,14 @@ Summary: %{langname} Localization Files for LibreOffice \ Group: Productivity/Office/Suite \ Requires: %{name} = %{version} \ -Provides: locale(libreoffice:%{lang}) \ +Provides: locale(libreoffice:%lang) \ BuildArch: noarch \ -%{-m:Requires: libreoffice-thesaurus-%{-m*}}%{!-m:%{-M:Requires: libreoffice-thesaurus-%{lang}}} \ +%{-m:Requires: libreoffice-thesaurus-%{-m*}}%{!-m:%{-M:Requires: libreoffice-thesaurus-%lang}} \ %{-r:Requires: %{-r*}} \ %{-p:Provides: %{name}-l10n-%{-p*}} \ %{-T: \ -Provides: %{name}-help-%{lang} = %{version} \ -Obsoletes: %{name}-help-%{lang} < %{version} \ +Provides: %{name}-help-%lang = %{version} \ +Obsoletes: %{name}-help-%lang < %{version} \ } \ \ %description %{pkgname} \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.5/tests/out/nospacebuildrequires.spec new/spec-cleaner-spec-cleaner-0.5.6/tests/out/nospacebuildrequires.spec --- old/spec-cleaner-spec-cleaner-0.5.5/tests/out/nospacebuildrequires.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-0.5.6/tests/out/nospacebuildrequires.spec 2014-05-10 13:14:24.000000000 +0200 @@ -0,0 +1,22 @@ +# +# spec file for package nospacebuildrequires +# +# 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/ +# + + +BuildRequires: automake +BuildRequires: dos2unix +BuildRequires: unzip + -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
