commit spec-cleaner for openSUSE:Factory

8 Jul 2014

Hello community,

here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2014-07-08 16:59:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-06-24 15:16:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes	2014-07-08 16:59:10.000000000 +0200
@@ -1,0 +2,7 @@
+Tue Jul  8 11:32:40 UTC 2014 - tchvatal@suse.com
+
+- Version bump to 0.5.9:
+  * Fix parsing %endif #comment
+  * Fix parsing %if rigth after %clean section
+
+-------------------------------------------------------------------

Old:
----
  spec-cleaner-0.5.8.tar.gz

New:
----
  spec-cleaner-0.5.9.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ spec-cleaner.spec ++++++
--- /var/tmp/diff_new_pack.AvVDkU/_old	2014-07-08 16:59:11.000000000 +0200
+++ /var/tmp/diff_new_pack.AvVDkU/_new	2014-07-08 16:59:11.000000000 +0200
@@ -18,7 +18,7 @@
 
 
 Name:           spec-cleaner
-Version:        0.5.8
+Version:        0.5.9
 Release:        0
 Summary:        .spec file cleaner
 License:        BSD-3-Clause

++++++ spec-cleaner-0.5.8.tar.gz -> spec-cleaner-0.5.9.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-0.5.9/data/excludes-bracketing.txt
--- old/spec-cleaner-spec-cleaner-0.5.8/data/excludes-bracketing.txt	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/data/excludes-bracketing.txt	2014-07-08 13:17:58.000000000 +0200
@@ -34,6 +34,7 @@
 install
 install_info
 install_info_delete
+jpackage_script
 ix86
 lang
 lang_package
@@ -51,6 +52,7 @@
 prep
 pretrans
 preun
+py_compile
 requires_eq
 restart_on_update
 setup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/__init__.py
--- old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/__init__.py	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/__init__.py	2014-07-08 13:17:58.000000000 +0200
@@ -5,7 +5,7 @@
 # All rights reserved.
 # See COPYING for details.
 
-__version__ = '0.5.8'
+__version__ = '0.5.9'
 
 import os
 import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/rpmcleaner.py
--- old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmcleaner.py	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/rpmcleaner.py	2014-07-08 13:17:58.000000000 +0200
@@ -122,6 +122,14 @@
             if self._previous_line == '' and line == '':
                 return RpmPreamble
 
+        # If we are in clean section and encounter whitespace
+        # we need to stop deleting
+        # This avoids deleting %if before %files section that could
+        # be deleted otherwise
+        if isinstance(self.current_section, RpmClean):
+           if line == '':
+               return RpmPreamble
+
         # we are staying in the section
         return None
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/rpmregexp.py
--- old/spec-cleaner-spec-cleaner-0.5.8/spec_cleaner/rpmregexp.py	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/spec_cleaner/rpmregexp.py	2014-07-08 13:17:58.000000000 +0200
@@ -35,8 +35,8 @@
 
     # rpmpreamble
     re_if = re.compile('^\s*(?:%if\s|%ifarch\s|%ifnarch\s)', re.IGNORECASE)
-    re_else = re.compile('^\s*%else\s*$', re.IGNORECASE)
-    re_endif = re.compile('^\s*%endif\s*$', re.IGNORECASE)
+    re_else = re.compile('^\s*%else(\s.*|)$', re.IGNORECASE)
+    re_endif = re.compile('^\s*%endif(\s.*|)$', re.IGNORECASE)
     re_name = re.compile('^Name:\s*(\S*)', re.IGNORECASE)
     re_version = re.compile('^Version:\s*(\S*)', re.IGNORECASE)
     re_release = re.compile('^Release:\s*(\S*)', re.IGNORECASE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/tests/in/cleansection.spec new/spec-cleaner-spec-cleaner-0.5.9/tests/in/cleansection.spec
--- old/spec-cleaner-spec-cleaner-0.5.8/tests/in/cleansection.spec	1970-01-01 01:00:00.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.5.9/tests/in/cleansection.spec	2014-07-08 13:17:58.000000000 +0200
@@ -0,0 +1,10 @@
+%install
+install bla
+
+%clean
+rm bla
+
+%ifarch x86
+%files -n something
+/bin/bla
+%endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/tests/in/conditions.spec new/spec-cleaner-spec-cleaner-0.5.9/tests/in/conditions.spec
--- old/spec-cleaner-spec-cleaner-0.5.8/tests/in/conditions.spec	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/tests/in/conditions.spec	2014-07-08 13:17:58.000000000 +0200
@@ -15,7 +15,7 @@
 %if %{with editor}
 %ifarch ppc64
 Requires:       naughty-stuff
-%endif
+%endif # test commentary
 BuildRequires:  gcc-c++
 BuildRequires:  update-desktop-files
 %endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/tests/out/cleansection.spec new/spec-cleaner-spec-cleaner-0.5.9/tests/out/cleansection.spec
--- old/spec-cleaner-spec-cleaner-0.5.8/tests/out/cleansection.spec	1970-01-01 01:00:00.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.5.9/tests/out/cleansection.spec	2014-07-08 13:17:58.000000000 +0200
@@ -0,0 +1,28 @@
+#
+# spec file for package cleansection
+#
+# 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/
+#
+
+
+%install
+install bla
+
+%ifarch x86
+
+%files -n something
+%defattr(-,root,root)
+/bin/bla
+%endif
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.5.8/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-0.5.9/tests/out/conditions.spec
--- old/spec-cleaner-spec-cleaner-0.5.8/tests/out/conditions.spec	2014-06-23 17:00:21.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.5.9/tests/out/conditions.spec	2014-07-08 13:17:58.000000000 +0200
@@ -40,6 +40,6 @@
 BuildRequires:  update-desktop-files
 %ifarch ppc64
 Requires:       naughty-stuff
-%endif
+%endif # test commentary
 %endif
 

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)