Hello community,
here is the log from the commit of package spec-cleaner for openSUSE:Factory
checked in at 2019-11-15 00:15:08
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old)
and /work/SRC/openSUSE:Factory/.spec-cleaner.new.26869 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner"
Fri Nov 15 00:15:08 2019 rev:61 rq:748641 version:1.1.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes
2019-11-11 21:38:11.584648635 +0100
+++ /work/SRC/openSUSE:Factory/.spec-cleaner.new.26869/spec-cleaner.changes
2019-11-15 00:15:09.912057158 +0100
@@ -1,0 +2,7 @@
+Thu Nov 14 10:44:59 UTC 2019 - Tomáš Chvátal <tchva...@suse.com>
+
+- Update to 1.1.7 bsc#1099674:
+ * Fix a duplication with new SUSE copyright line
+ * Exclude all pom_ macros from bracketing
+
+-------------------------------------------------------------------
Old:
----
spec-cleaner-1.1.6.tar.gz
New:
----
spec-cleaner-1.1.7.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spec-cleaner.spec ++++++
--- /var/tmp/diff_new_pack.pelVHM/_old 2019-11-15 00:15:11.020056773 +0100
+++ /var/tmp/diff_new_pack.pelVHM/_new 2019-11-15 00:15:11.044056765 +0100
@@ -1,7 +1,7 @@
#
# spec file for package spec-cleaner
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC.
# Copyright (c) 2012 Vincent Untz <vu...@opensuse.org>
#
# All modifications and additions to the file contributed by third parties
@@ -18,7 +18,7 @@
Name: spec-cleaner
-Version: 1.1.6
+Version: 1.1.7
Release: 0
Summary: .spec file cleaner
License: BSD-3-Clause
++++++ spec-cleaner-1.1.6.tar.gz -> spec-cleaner-1.1.7.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/data/excludes-bracketing.txt
new/spec-cleaner-spec-cleaner-1.1.7/data/excludes-bracketing.txt
--- old/spec-cleaner-spec-cleaner-1.1.6/data/excludes-bracketing.txt
2019-11-11 15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/data/excludes-bracketing.txt
2019-11-14 11:41:19.000000000 +0100
@@ -96,8 +96,7 @@
perl_gen_filelist
perl_make_install
perl_process_[^\s]*
-pom_add_dep
-pom_remove_dep
+pom_[^\s]*
post
posttrans
postun
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/__init__.py
new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/__init__.py
--- old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/__init__.py
2019-11-11 15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/__init__.py
2019-11-14 11:41:19.000000000 +0100
@@ -14,7 +14,7 @@
from .rpmexception import RpmException, RpmWrongArgs
-__version__ = '1.1.6'
+__version__ = '1.1.7'
def process_args(argv: List[str]) -> Dict[str, Any]:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcopyright.py
new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcopyright.py
--- old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmcopyright.py
2019-11-11 15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmcopyright.py
2019-11-14 11:41:19.000000000 +0100
@@ -22,7 +22,7 @@
self.year = options['copyright_year']
self.copyrights = []
self.buildrules = []
- self.my_copyright = ''
+ self.distro_copyright = '# Copyright (c) {0} SUSE
LLC'.format(self.year)
self.vimmodeline = ''
def _add_pkg_header(self):
@@ -35,12 +35,8 @@
)
)
- def _create_default_copyright(self):
- self.my_copyright = '# Copyright (c) {0} SUSE LLC'.format(self.year)
-
def _add_copyright(self):
- self._create_default_copyright()
- self.lines.append(self.my_copyright)
+ self.lines.append(self.distro_copyright)
for i in self.copyrights:
self.lines.append(i)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmregexp.py
new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmregexp.py
--- old/spec-cleaner-spec-cleaner-1.1.6/spec_cleaner/rpmregexp.py
2019-11-11 15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/spec_cleaner/rpmregexp.py
2019-11-14 11:41:19.000000000 +0100
@@ -116,7 +116,7 @@
# rpmcopyright
re_copyright_string = re.compile(r'^#\s*Copyright\ \(c\)\s*(.*)',
re.IGNORECASE)
- re_suse_copyright = re.compile(r'SUSE LINUX (Products )?GmbH, Nuernberg,
Germany.\s*$', re.IGNORECASE)
+ re_suse_copyright = re.compile(r'SUSE (LLC\.?|LINUX (Products )?GmbH,
Nuernberg, Germany\.)\s*$', re.IGNORECASE)
re_rootforbuild = re.compile(r'^#\s*needsrootforbuild\s*$', re.IGNORECASE)
re_binariesforbuild = re.compile(r'^#\s*needsbinariesforbuild\s*$',
re.IGNORECASE)
re_nodebuginfo = re.compile(r'^#\s*nodebuginfo\s*$', re.IGNORECASE)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.6/tests/in/header.spec
new/spec-cleaner-spec-cleaner-1.1.7/tests/in/header.spec
--- old/spec-cleaner-spec-cleaner-1.1.6/tests/in/header.spec 2019-11-11
15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/tests/in/header.spec 2019-11-14
11:41:19.000000000 +0100
@@ -3,6 +3,7 @@
# spec file for package broken
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
# Copyright #C 2013 Broken copyright
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/tests/out/header.spec
new/spec-cleaner-spec-cleaner-1.1.7/tests/out/header.spec
--- old/spec-cleaner-spec-cleaner-1.1.6/tests/out/header.spec 2019-11-11
15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/tests/out/header.spec 2019-11-14
11:41:19.000000000 +0100
@@ -3,6 +3,7 @@
# spec file for package broken
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
# Copyright #C 2013 Broken copyright
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-1.1.6/tests/out-minimal/header.spec
new/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/header.spec
--- old/spec-cleaner-spec-cleaner-1.1.6/tests/out-minimal/header.spec
2019-11-11 15:21:21.000000000 +0100
+++ new/spec-cleaner-spec-cleaner-1.1.7/tests/out-minimal/header.spec
2019-11-14 11:41:19.000000000 +0100
@@ -3,6 +3,7 @@
# spec file for package broken
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LLC
# Copyright (c) 2012 Dominique Leuenberger, Amsterdam, The Netherlands
# Copyright #C 2013 Broken copyright
#
