Hello community,
here is the log from the commit of package spec-cleaner for openSUSE:Factory
checked in at 2015-07-02 22:49:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2015-06-10 09:16:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes
2015-07-03 00:21:31.000000000 +0200
@@ -1,0 +2,8 @@
+Fri Jun 26 20:11:48 UTC 2015 - tchva...@suse.com
+
+- Version bump to 0.7.2:
+ * Do not curlify %20 which is usually space in Source lines
+ * Few more excludes for bracket
+ * Bunch of small fixes
+
+-------------------------------------------------------------------
Old:
----
spec-cleaner-0.7.1.tar.gz
New:
----
spec-cleaner-0.7.2.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ spec-cleaner.spec ++++++
--- /var/tmp/diff_new_pack.B91fAA/_old 2015-07-03 00:21:32.000000000 +0200
+++ /var/tmp/diff_new_pack.B91fAA/_new 2015-07-03 00:21:32.000000000 +0200
@@ -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.7.1
+Version: 0.7.2
Release: 0
Summary: .spec file cleaner
License: BSD-3-Clause
++++++ spec-cleaner-0.7.1.tar.gz -> spec-cleaner-0.7.2.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/data/excludes-bracketing.txt
new/spec-cleaner-spec-cleaner-0.7.2/data/excludes-bracketing.txt
--- old/spec-cleaner-spec-cleaner-0.7.1/data/excludes-bracketing.txt
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/data/excludes-bracketing.txt
2015-06-26 22:09:54.000000000 +0200
@@ -89,6 +89,7 @@
suse_update_desktop_file
systemd_requires
systemd_preun
+tmpfiles_create
triggerin
triggerpostun
triggerun
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/spec-cleaner-spec-cleaner-0.7.1/path-macros-todo.txt
new/spec-cleaner-spec-cleaner-0.7.2/path-macros-todo.txt
--- old/spec-cleaner-spec-cleaner-0.7.1/path-macros-todo.txt 2015-06-05
11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/path-macros-todo.txt 1970-01-01
01:00:00.000000000 +0100
@@ -1,101 +0,0 @@
-macros.systemd:%_unitdir /usr/lib/systemd/system
-macros.systemd:%_userunitdir /usr/lib/systemd/user
-macros.systemd:%_presetdir /usr/lib/systemd/system-preset
-macros.systemd:%_udevhwdbdir /usr/lib/udev/hwdb.d
-macros.systemd:%_udevrulesdir /usr/lib/udev/rules.d
-macros.systemd:%_journalcatalogdir /usr/lib/systemd/catalog
-macros.systemd:%_tmpfilesdir /usr/lib/tmpfiles.d
-macros.systemd:%_sysusersdir /usr/lib/sysusers.d
-macros.systemd:%_sysctldir /usr/lib/sysctl.d
-macros.systemd:%_ntpunitsdir /usr/lib/systemd/ntp-units.d
-macros.systemd:%_binfmtdir /usr/lib/binfmt.d
-
-macros.qt4:%_libqt4_pluginsdir %{_libdir}/qt4/plugins
-macros.qt4:%_libqt4_accessibledir %{_libqt4_pluginsdir}/accessible
-macros.qt4:%_libqt4_bearerdir %{_libqt4_pluginsdir}/bearer
-macros.qt4:%_libqt4_codecsdir %{_libqt4_pluginsdir}/codecs
-macros.qt4:%_libqt4_designerdir %{_libqt4_pluginsdir}/designer
-macros.qt4:%_libqt4_iconenginesdir %{_libqt4_pluginsdir}/iconengines
-macros.qt4:%_libqt4_imageformatsdir %{_libqt4_pluginsdir}/imageformats
-macros.qt4:%_libqt4_importsdir %{_libqt4_pluginsdir}/imports
-macros.qt4:%_libqt4_inputmethodsdir %{_libqt4_pluginsdir}/inputmethods
-macros.qt4:%_libqt4_graphicssystemsdir %{_libqt4_pluginsdir}/graphicssystems
-macros.qt4:%_libqt4_phonon_backenddir %{_libqt4_pluginsdir}/phonon_backend
-macros.qt4:%_libqt4_qmltoolingdir %{_libqt4_pluginsdir}/qmltooling
-macros.qt4:%_libqt4_scriptdir %{_libqt4_pluginsdir}/script
-macros.qt4:%_libqt4_sqldriversdir %{_libqt4_pluginsdir}/sqldrivers
-
-macros.kde4:%_kde4_bindir %{_bindir}
-macros.kde4:%_kde4_datadir %{_datadir}
-macros.kde4:%_kde4_includedir %{_includedir}
-macros.kde4:%_kde4_libdir %{_libdir}
-macros.kde4:%_kde4_mandir %{_mandir}
-macros.kde4:%_kde4_sbindir %{_sbindir}
-macros.kde4:%_kde4_sysconfdir %{_sysconfdir}
-macros.kde4:%_kde4_applicationsdir %{_kde4_datadir}/applications/kde4
-macros.kde4:%_kde4_iconsdir %{_kde4_datadir}/icons
-macros.kde4:%_kde4_wallpapersdir %{_kde4_datadir}/wallpapers
-macros.kde4:%_kde4_sharedir %{_kde4_datadir}/kde4
-macros.kde4:%_kde4_appsdir %{_kde4_sharedir}/apps
-macros.kde4:%_kde4_configdir %{_kde4_sharedir}/config
-macros.kde4:%_kde4_configkcfgdir %{_kde4_sharedir}/config.kcfg
-macros.kde4:%_kde4_servicesdir %{_kde4_sharedir}/services
-macros.kde4:%_kde4_servicetypesdir %{_kde4_sharedir}/servicetypes
-macros.kde4:%_kde4_docdir %{_kde4_datadir}/doc/kde
-macros.kde4:%_kde4_htmldir %{_kde4_docdir}/HTML
-macros.kde4:%_kde4_modulesdir %{_kde4_libdir}/kde4
-macros.kde4:%_kde4_libexecdir %{_kde4_modulesdir}/libexec
-macros.kde4:%_kde_config_dir %{_kde4_configdir}
-macros.kde4:%_kde_html_dir %{_kde4_htmldir}
-macros.kde4:%_kde_libdir %{_kde4_libdir}
-macros.kde4:%_kde_share_dir %{_kde4_sharedir}
-macros.kde4:%_kde4_modules %{_kde4_modulesdir}
-macros.kde4:%_kde4_servicetypes %{_kde4_servicetypesdir}
-
-
-macros.jpackage:%_javadocdir %{_datadir}/javadoc
-macros.jpackage:%_mavenpomdir %{_datadir}/maven-poms
-macros.jpackage:%_ivyxmldir %{_datadir}/ivy-xmls
-macros.jpackage:%_mavendepmapdir %{_sysconfdir}/maven
-macros.jpackage:%_mavendepmapfragdir %{_datadir}/maven-fragments
-
-macros.jpackage:%_jvmdir %{_libdir}/jvm
-macros.jpackage:# Root directory where all Java VMs/SDK/JREs expose their jars
-macros.jpackage:%_jvmjardir %{_libdir}/jvm-exports
-macros.jpackage:# Root directory for all Java VM/SDK/JRE's private things.
-macros.jpackage:%_jvmprivdir %{_libdir}/jvm-private
-macros.jpackage:# Root directory for all architecture dependent parts of Java
VM/SDK/JRE's
-macros.jpackage:%_jvmlibdir %{_libdir}/jvm
-macros.jpackage:# Root directory for all architecture independent parts of
Java VM/SDK/JRE's
-macros.jpackage:%_jvmdatadir %{_datadir}/jvm
-macros.jpackage:# Root directory for all configurations parts of Java
VM/SDK/JRE's
-macros.jpackage:%_jvmsysconfdir %{_sysconfdir}/jvm
-macros.jpackage:# Root directory for all common architecture dependent parts
of Java VM/SDK/JRE's
-macros.jpackage:%_jvmcommonlibdir %{_libdir}/jvm-commmon
-macros.jpackage:# Root directory for all common architecture independent parts
of Java VM/SDK/JRE's
-macros.jpackage:%_jvmcommondatadir %{_datadir}/jvm-commmon
-macros.jpackage:# Root directory for all common configurations parts of Java
VM/SDK/JRE's
-macros.jpackage:%_jvmcommonsysconfdir %{_sysconfdir}/jvm-commmon
-macros.jpackage:%_javaconfdir %{_sysconfdir}/java
-
-%_libqt5_prefix %{_prefix}
-%_libqt5_libdir %{_libdir}
-%_libqt5_archdatadir %{_libqt5_libdir}/qt5
-%_libqt5_bindir %{_libqt5_archdatadir}/bin
-%_libqt5_datadir %{_datadir}/qt5
-%_libqt5_docdir %{_docdir}/qt5
-%_libqt5_examplesdir %{_libqt5_archdatadir}/examples
-%_libqt5_includedir %{_includedir}/qt5
-%_libqt5_importdir %{_libqt5_archdatadir}/imports
-%_libqt5_libexecdir %{_libqt5_archdatadir}/libexec
-%_libqt5_plugindir %{_libqt5_archdatadir}/plugins
-%_libqt5_sysconfdir %{_sysconfdir}/xdg
-%_libqt5_translationdir %{_libqt5_datadir}/translations
-
-macros.python3:%python3_sitelib /usr/lib/python3.4/site-packages
-macros.python3:%python3_sitearch /usr/lib64/python3.4/site-packages
-
-macros.python:%python_sitelib %(python -c "from distutils.sysconfig import
get_python_lib; print get_python_lib();")
-macros.python:%python_sitearch %(python -c "from distutils.sysconfig import
get_python_lib; print get_python_lib(True);")
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/__init__.py
new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/__init__.py
--- old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/__init__.py
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/__init__.py
2015-06-26 22:09:54.000000000 +0200
@@ -12,7 +12,7 @@
from .rpmcleaner import RpmSpecCleaner
-__version__ = '0.7.1'
+__version__ = '0.7.2'
def process_args(argv):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/rpmregexp.py
new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/rpmregexp.py
--- old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/rpmregexp.py
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/rpmregexp.py
2015-06-26 22:09:54.000000000 +0200
@@ -112,11 +112,12 @@
re_comment = re.compile(r'^$|^\s*#')
# macro detection
- re_macro = re.compile(r'(^|([^%]))%(\w+(\s*\([^)]*\))?)(|(\W))')
+ re_macro =
re.compile(r'(^|([^%]))%([1-9]\d*|[a-zA-Z_]\w*(\s*\([^)]*\))?)(|(\W))')
# macro func detection
re_spec_macrofunc = re.compile(r'^\s*%define\s(\w+)\(.*')
# cleaning path regexps
+ re_oldprefix = re.compile(r'%{?_exec_prefix}?([/\s$])')
re_prefix = re.compile(r'(?<!\w)/usr(/|\s|$)')
re_bindir = re.compile(r'%{_prefix}/bin([/\s$])')
re_sbindir = re.compile(r'%{_prefix}/sbin([/\s$])')
@@ -130,7 +131,6 @@
re_sysconfdir = re.compile(r'/etc([/\s$])')
re_localstatedir = re.compile(r'/var([/\s$])')
re_libdir = re.compile(r'%{_prefix}/(%{_lib}|lib64)([/\s$])')
- # old typo in rpm macro
re_initddir = re.compile(r'%{?_initrddir}?([/\s$])')
re_rpmbuildroot =
re.compile(r'(\${?RPM_BUILD_ROOT}?|"%{?buildroot}?")([/\s%]|$)')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/rpmsection.py
new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/rpmsection.py
--- old/spec-cleaner-spec-cleaner-0.7.1/spec_cleaner/rpmsection.py
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/spec_cleaner/rpmsection.py
2015-06-26 22:09:54.000000000 +0200
@@ -151,6 +151,7 @@
Replace hardcoded stuff like /usr/share -> %{_datadir}
"""
+ line = self.reg.re_oldprefix.sub(r'%{_prefix}\1', line)
line = self.reg.re_prefix.sub(r'%{_prefix}\1', line)
line = self.reg.re_bindir.sub(r'%{_bindir}\1', line)
line = self.reg.re_sbindir.sub(r'%{_sbindir}\1', line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/tests/in/rpathreplacement.spec
new/spec-cleaner-spec-cleaner-0.7.2/tests/in/rpathreplacement.spec
--- old/spec-cleaner-spec-cleaner-0.7.1/tests/in/rpathreplacement.spec
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/tests/in/rpathreplacement.spec
2015-06-26 22:09:54.000000000 +0200
@@ -13,3 +13,4 @@
/usr/share/info/name
/usr/share/doc/packages/name
/etc/init.d/name
+%_exec_prefix/bla
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/tests/out/rpathreplacement.spec
new/spec-cleaner-spec-cleaner-0.7.2/tests/out/rpathreplacement.spec
--- old/spec-cleaner-spec-cleaner-0.7.1/tests/out/rpathreplacement.spec
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/tests/out/rpathreplacement.spec
2015-06-26 22:09:54.000000000 +0200
@@ -31,4 +31,5 @@
%{_infodir}/name
%{_docdir}/name
%{_initddir}/name
+%{_prefix}/bla
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/spec-cleaner-spec-cleaner-0.7.1/tests/out-minimal/rpathreplacement.spec
new/spec-cleaner-spec-cleaner-0.7.2/tests/out-minimal/rpathreplacement.spec
--- old/spec-cleaner-spec-cleaner-0.7.1/tests/out-minimal/rpathreplacement.spec
2015-06-05 11:55:46.000000000 +0200
+++ new/spec-cleaner-spec-cleaner-0.7.2/tests/out-minimal/rpathreplacement.spec
2015-06-26 22:09:54.000000000 +0200
@@ -31,4 +31,5 @@
%{_infodir}/name
%{_docdir}/name
%{_initddir}/name
+%{_prefix}/bla
