Hello community,
here is the log from the commit of package spec-cleaner for openSUSE:Factory
checked in at 2014-12-08 16:56:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-11-18 22:46:22.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes
2014-12-08 16:56:45.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Dec 8 09:01:31 UTC 2014 - tchva...@suse.com
+
+- Version bump to 0.6.5:
+ * Fix vertical spacing around nested conditionals
+ * Fix issue with bogus %lang detection
+
+-------------------------------------------------------------------
Old:
----
spec-cleaner-0.6.4.tar.gz
New:
----
spec-cleaner-0.6.5.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spec-cleaner.spec ++++++
--- /var/tmp/diff_new_pack.IxfVVX/_old 2014-12-08 16:56:46.000000000 +0100
+++ /var/tmp/diff_new_pack.IxfVVX/_new 2014-12-08 16:56:46.000000000 +0100
@@ -20,7 +20,7 @@
# This is used for Fedora, we need to sync this
%{!?py3_ver: %define py3_ver %{python3_version}}
Name: spec-cleaner
-Version: 0.6.4
+Version: 0.6.5
Release: 0
Summary: .spec file cleaner
License: BSD-3-Clause
++++++ spec-cleaner-0.6.4.tar.gz -> spec-cleaner-0.6.5.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/__init__.py
new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/__init__.py
--- old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/__init__.py
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/__init__.py
2014-11-20 13:42:26.000000000 +0100
@@ -1,10 +1,10 @@
# vim: set ts=4 sw=4 et: coding=UTF-8
-# Copyright (c) 2013, SUSE LINUX Products GmbH, Nuernberg, Germany
+# Copyright (c) 2014, SUSE LINUX Products GmbH, Nuernberg, Germany
# All rights reserved.
# See COPYING for details.
-__version__ = '0.6.4'
+__version__ = '0.6.5'
import os
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/rpmpreamble.py
new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/rpmpreamble.py
--- old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/rpmpreamble.py
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/rpmpreamble.py
2014-11-20 13:42:26.000000000 +0100
@@ -655,7 +655,8 @@
Section.add(self, line)
return
# If the package is lang package we add here comment about the lang
package
- if len(self.lines) == 1 and (self.previous_line.endswith(' lang') or
self.previous_line.endswith('-lang')) and not line.startswith('#'):
+ if len(self.lines) == 1 and (self.previous_line.startswith('%') and
+ (self.previous_line.endswith(' lang') or
self.previous_line.endswith('-lang'))) and not line.startswith('#'):
Section.add(self, '# FIXME: consider using %lang_package macro')
RpmPreamble.add(self, line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/rpmsection.py
new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/rpmsection.py
--- old/spec-cleaner-spec-cleaner-0.6.4/spec_cleaner/rpmsection.py
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/spec_cleaner/rpmsection.py
2014-11-20 13:42:26.000000000 +0100
@@ -23,6 +23,7 @@
self.reg = RegexpSingle(specfile)
# Are we inside of conditional or not
self.condition = False
+ self._condition_counter = 0
def _complete_cleanup(self, line):
@@ -51,8 +52,13 @@
Check if we are in condition that is contained or not
"""
if self.reg.re_if.match(line):
- self.condition = True
+ self._condition_counter += 1
if self.reg.re_endif.match(line):
+ self._condition_counter -= 1
+
+ if self._condition_counter > 0:
+ self.condition = True
+ else:
self.condition = False
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/tests/in/conditionmultiline.spec
new/spec-cleaner-spec-cleaner-0.6.5/tests/in/conditionmultiline.spec
--- old/spec-cleaner-spec-cleaner-0.6.4/tests/in/conditionmultiline.spec
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/tests/in/conditionmultiline.spec
2014-11-20 13:42:26.000000000 +0100
@@ -12,3 +12,44 @@
--with-num-cores="$NUM_PROC" \
%endif
make -j1
+
+%ifarch %{jit_arches}
+%if 0%{?suse_version} >= 1120
+ --enable-nio2 \
+%endif
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
+ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%endif
+%if 0%{?suse_version} >= 1120
+%if %{with bootstrap}
+ --disable-pulse-java \
+%else
+ --enable-pulse-java \
+%endif
+ --enable-nss \
+%endif
+%if %{with bootstrap}
+ --enable-bootstrap \
+ --enable-bootstrap-tools \
+ --with-javac=${JAVAC} \
+ --with-ecj=%{_bindir}/ecj \
+ --with-ecj-jar=${ECJJAR} \
+ --with-jdk-home=%{_jvmdir}/java-1.5.0-gcj \
+%else
+ --disable-bootstrap \
+%endif
+%if %{with docs}
+ --enable-docs \
+%else
+ --disable-docs \
+%endif
+ --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \
+ --with-openjdk-src-zip=%{SOURCE1} \
+%ifnarch %{arm} %{aarch64}
+ --with-parallel-jobs=${NUMCPUS} \
+%else
+ --with-parallel-jobs=1 \
+%endif
+ --with-pkgversion=suse-%{release}-%{_arch}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/tests/in/langpackage.spec
new/spec-cleaner-spec-cleaner-0.6.5/tests/in/langpackage.spec
--- old/spec-cleaner-spec-cleaner-0.6.4/tests/in/langpackage.spec
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/tests/in/langpackage.spec
2014-11-20 13:42:26.000000000 +0100
@@ -10,3 +10,9 @@
# I have reason not to convert this to lang macro
Summary: Something
Group: Whatever
+
+%package -n %{_name}
+Summary: Evolution Plugin for RSS Feeds Support
+Group: Productivity/Networking/Email/Clients
+Recommends: %{_name}-lang
+Provides: %{name} = %{version}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/tests/out/conditionmultiline.spec
new/spec-cleaner-spec-cleaner-0.6.5/tests/out/conditionmultiline.spec
--- old/spec-cleaner-spec-cleaner-0.6.4/tests/out/conditionmultiline.spec
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/tests/out/conditionmultiline.spec
2014-11-20 13:42:26.000000000 +0100
@@ -31,3 +31,44 @@
%endif
make -j1
+%ifarch %{jit_arches}
+%if 0%{?suse_version} >= 1120
+ --enable-nio2 \
+%endif
+%if %{with_systemtap}
+ --enable-systemtap \
+%endif
+ --with-abs-install-dir=%{_jvmdir}/%{sdkdir} \
+%endif
+%if 0%{?suse_version} >= 1120
+%if %{with bootstrap}
+ --disable-pulse-java \
+%else
+ --enable-pulse-java \
+%endif
+ --enable-nss \
+%endif
+%if %{with bootstrap}
+ --enable-bootstrap \
+ --enable-bootstrap-tools \
+ --with-javac=${JAVAC} \
+ --with-ecj=%{_bindir}/ecj \
+ --with-ecj-jar=${ECJJAR} \
+ --with-jdk-home=%{_jvmdir}/java-1.5.0-gcj \
+%else
+ --disable-bootstrap \
+%endif
+%if %{with docs}
+ --enable-docs \
+%else
+ --disable-docs \
+%endif
+ --with-xerces2-jar=%{_javadir}/xerces-j2-bootstrap.jar \
+ --with-openjdk-src-zip=%{SOURCE1} \
+%ifnarch %{arm} %{aarch64}
+ --with-parallel-jobs=${NUMCPUS} \
+%else
+ --with-parallel-jobs=1 \
+%endif
+ --with-pkgversion=suse-%{release}-%{_arch}
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.6.4/tests/out/langpackage.spec
new/spec-cleaner-spec-cleaner-0.6.5/tests/out/langpackage.spec
--- old/spec-cleaner-spec-cleaner-0.6.4/tests/out/langpackage.spec
2014-11-15 10:57:07.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-0.6.5/tests/out/langpackage.spec
2014-11-20 13:42:26.000000000 +0100
@@ -31,3 +31,9 @@
Summary: Something
Group: Whatever
+%package -n %{_name}
+Summary: Evolution Plugin for RSS Feeds Support
+Group: Productivity/Networking/Email/Clients
+Recommends: %{_name}-lang
+Provides: %{name} = %{version}
+
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
