Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2017-12-08 12:59:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Fri Dec 8 12:59:40 2017 rev:46 rq:554866 version:1.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2017-09-27 16:55:13.632130093 +0200 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new/spec-cleaner.changes 2017-12-08 12:59:41.416696323 +0100 @@ -1,0 +2,9 @@ +Wed Dec 6 15:53:43 UTC 2017 - tchva...@suse.com + +- Version update to 1.0.1 bsc#1071561: + * Recognize new rpm trgger* events + * Remove otherproviders conflicts syntax (just keep the pkg name) + * Detect more apache macros + * Drop py_requires macro that is useless + +------------------------------------------------------------------- Old: ---- spec-cleaner-1.0.0.tar.gz New: ---- spec-cleaner-1.0.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.Rg9IRS/_old 2017-12-08 12:59:42.188668443 +0100 +++ /var/tmp/diff_new_pack.Rg9IRS/_new 2017-12-08 12:59:42.192668298 +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: 1.0.0 +Version: 1.0.1 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause @@ -38,7 +38,6 @@ BuildRequires: python3-setuptools # For the pkg_resources used in the binary loader Requires: python3-setuptools -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -74,7 +73,6 @@ python3 setup.py install --root=%{buildroot} %files -%defattr(-, root, root) %{_bindir}/%{name} %dir %{_libexecdir}/obs/ %dir %{_libexecdir}/obs/service/ @@ -116,7 +114,6 @@ %{_datadir}/%{name}/tex_conversions.txt %files format_spec_file -%defattr(-,root,root) %{_libexecdir}/obs/service/format_spec_file %{_libexecdir}/obs/service/format_spec_file.service ++++++ spec-cleaner-1.0.0.tar.gz -> spec-cleaner-1.0.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/data/allowed_groups.txt new/spec-cleaner-spec-cleaner-1.0.1/data/allowed_groups.txt --- old/spec-cleaner-spec-cleaner-1.0.0/data/allowed_groups.txt 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/data/allowed_groups.txt 2017-12-06 16:42:43.000000000 +0100 @@ -33,6 +33,7 @@ Development/Languages/Java Development/Languages/Other Development/Languages/Perl +Development/Languages/PHP Development/Languages/Python Development/Languages/Ruby Development/Languages/Scheme @@ -46,6 +47,7 @@ Development/Libraries/Other Development/Libraries/Parallel Development/Libraries/Perl +Development/Libraries/PHP Development/Libraries/Python Development/Libraries/Tcl Development/Libraries/X11 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-1.0.1/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-1.0.0/data/excludes-bracketing.txt 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/data/excludes-bracketing.txt 2017-12-06 16:42:43.000000000 +0100 @@ -1,4 +1,7 @@ add_maven_depmap +apache_test_module_start_apache +apache_test_module_stop_apache +apache_test_module_curl apache_test_module_load attr(\s*\([^)]*\))? bcond_with[^\s]* @@ -91,6 +94,12 @@ prep pretrans preun +filetriggerin +filetriggerun +filetriggerpostun +transfiletriggerin +transfiletriggerun +transfiletriggerpostun py_compile python_alternative python_install_alternative diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/__init__.py 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/__init__.py 2017-12-06 16:42:43.000000000 +0100 @@ -12,7 +12,7 @@ from .rpmcleaner import RpmSpecCleaner -__version__ = '1.0.0' +__version__ = '1.0.1' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmcleaner.py new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmcleaner.py --- old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmcleaner.py 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmcleaner.py 2017-12-06 16:42:43.000000000 +0100 @@ -84,6 +84,7 @@ (self.reg.re_spec_clean, RpmClean), (self.reg.re_spec_check, RpmCheck), (self.reg.re_spec_scriptlets, RpmScriptlets), + (self.reg.re_spec_triggers, RpmScriptlets), (self.reg.re_spec_files, RpmFiles), (self.reg.re_spec_changelog, RpmChangelog) ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmpreamble.py new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmpreamble.py --- old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmpreamble.py 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmpreamble.py 2017-12-06 16:42:43.000000000 +0100 @@ -113,6 +113,7 @@ 'debugpkg': self.reg.re_debugpkg, 'prefix': self.reg.re_preamble_prefix, 'buildroot': self.reg.re_buildroot, + 'py_requires': self.reg.re_py_requires, } def start_subparagraph(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmregexp.py 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmregexp.py 2017-12-06 16:42:43.000000000 +0100 @@ -19,6 +19,7 @@ re_spec_clean = re.compile(r'^%clean\s*$', re.IGNORECASE) re_spec_check = re.compile(r'^%check\s*$', re.IGNORECASE) re_spec_scriptlets = re.compile(r'(?:^%pretrans(\s+|$))|(?:^%pre(\s+|$))|(?:^%post(\s+|$))|(?:^%verifyscript(\s+|$))|(?:^%preun(\s+|$))|(?:^%postun(\s+|$))|(?:^%posttrans(\s+|$))', re.IGNORECASE) + re_spec_triggers = re.compile(r'(?:^%filetriggerin(\s+|$))|(?:^%filetriggerun(\s+|$))|(?:^%filetriggerpostun(\s+|$))|(?:^%transfiletriggerin(\s+|$))|(?:^%transfiletriggerun(\s+|$))|(?:^%transfiletriggerpostun(\s+|$))', re.IGNORECASE) re_spec_files = re.compile(r'^%files(\s+|$)', re.IGNORECASE) re_spec_changelog = re.compile(r'^%changelog\s*$', re.IGNORECASE) @@ -67,6 +68,7 @@ re_bcond_with = re.compile(r'^\s*%bcond_with(out)?\s*(.*)', re.IGNORECASE) re_autoreqprov = re.compile(r'^\s*AutoReqProv:.*$', re.IGNORECASE) re_debugpkg = re.compile(r'^%{?(debug_package|___debug_install_post)}?\s*$', re.IGNORECASE) + re_py_requires = re.compile(r'^%{?\??py_requires}?\s*$', re.IGNORECASE) re_mingw = re.compile(r'^\s*%{?_mingw.*$', re.IGNORECASE) re_tail_macros = re.compile(r'^%{?python_subpackages}?') re_preamble_prefix = re.compile(r'^Prefix:\s*(.*)', re.IGNORECASE) @@ -129,8 +131,9 @@ # macro detection re_macro = re.compile( # find start of macro: - # either beggining of string or something which is not '%' - r'(^|([^%]))' + + # either beggining of string or something which is not '%' or : + # where : is used after macro declaration we should not curlify + r'(^|([^%:]))' + # macro itself: # '%' followed by either number not starting with '0' # or by chars where first is a-z or A-Z or underscore diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmrequirestoken.py new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmrequirestoken.py --- old/spec-cleaner-spec-cleaner-1.0.0/spec_cleaner/rpmrequirestoken.py 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/spec_cleaner/rpmrequirestoken.py 2017-12-06 16:42:43.000000000 +0100 @@ -35,6 +35,10 @@ # we just rename pkgconfig names to one unified one working everywhere if name == 'pkgconfig(pkg-config)' or name == 'pkg-config': name = 'pkgconfig' + # if there is otherproviders codeblock just ommit it + if name.startswith('otherproviders('): + name = name.rstrip(')') + name = name.lstrip('otherproviders(') return name def __str__(self): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/in/conditions.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/in/conditions.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/in/conditions.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/in/conditions.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,3 +1,4 @@ +%{?!_fillupdir:%define _fillupdir /var/adm/fillup-templates} %if 0%{?suse_version} == 1110 # _libexecdir points to /usr/lib64 for SLE11 %define _libexecdir %{_prefix}/lib @@ -30,6 +31,9 @@ %if (0%{?suse_version} && 0%{?suse_version} >= 1210) Requires: wine %endif +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} +Requires: other +%endif %if (0%{?sle_version} == 120100 && 0%{?is_opensuse} == 0) || 0%{?suse_version} == 1310 Requires: something %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/in/conflicts.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/in/conflicts.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/in/conflicts.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/in/conflicts.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,3 +1,4 @@ Conflicts: d Conflicts: z a Conflicts: openais <= 0.89, openais-devel <= 0.89 +Conflicts: otherproviders(foo) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/in/scriplets.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/in/scriplets.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/in/scriplets.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/in/scriplets.spec 2017-12-06 16:42:43.000000000 +0100 @@ -8,4 +8,22 @@ someothercommand %post -n %{_libname} -/sbin/ldconfig \ No newline at end of file +/sbin/ldconfig + +%filetriggerin tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi + +%filetriggerpostun tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/in/spec-cleaner.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/in/spec-cleaner.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/in/spec-cleaner.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/in/spec-cleaner.spec 2017-12-06 16:42:43.000000000 +0100 @@ -34,6 +34,7 @@ Obsoletes: obs-service-format_spec_file < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%{?py_requires} %{debug_package} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out/conditions.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out/conditions.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out/conditions.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out/conditions.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,3 +1,4 @@ +%{?!_fillupdir:%define _fillupdir %{_localstatedir}/adm/fillup-templates} %if 0%{?suse_version} == 1110 # _libexecdir points to /usr/lib64 for SLE11 %define _libexecdir %{_prefix}/lib @@ -31,6 +32,9 @@ %if (0%{?suse_version} && 0%{?suse_version} >= 1210) Requires: wine %endif +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} +Requires: other +%endif %if (0%{?sle_version} == 120100 && 0%{?is_opensuse} == 0) || 0%{?suse_version} == 1310 Requires: something %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out/conflicts.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out/conflicts.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out/conflicts.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out/conflicts.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,5 +1,6 @@ Conflicts: a Conflicts: d +Conflicts: foo Conflicts: openais <= 0.89 Conflicts: openais-devel <= 0.89 Conflicts: z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out/scriplets.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out/scriplets.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out/scriplets.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out/scriplets.spec 2017-12-06 16:42:43.000000000 +0100 @@ -5,5 +5,22 @@ someothercommand %post -n %{_libname} -p /sbin/ldconfig +%filetriggerin tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi + +%filetriggerpostun tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/conditions.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/conditions.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/conditions.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/conditions.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,3 +1,4 @@ +%{?!_fillupdir:%define _fillupdir %{_localstatedir}/adm/fillup-templates} %if 0%{?suse_version} == 1110 # _libexecdir points to /usr/lib64 for SLE11 %define _libexecdir %{_prefix}/lib @@ -30,6 +31,9 @@ %if (0%{?suse_version} && 0%{?suse_version} >= 1210) Requires: wine %endif +%if %{?pkg_vcmp:%pkg_vcmp java-devel >= 9}%{!?pkg_vcmp:0} +Requires: other +%endif %if (0%{?sle_version} == 120100 && 0%{?is_opensuse} == 0) || 0%{?suse_version} == 1310 Requires: something %endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/conflicts.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/conflicts.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/conflicts.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/conflicts.spec 2017-12-06 16:42:43.000000000 +0100 @@ -1,5 +1,6 @@ Conflicts: a Conflicts: d +Conflicts: foo Conflicts: openais <= 0.89 Conflicts: openais-devel <= 0.89 Conflicts: z diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/scriplets.spec new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/scriplets.spec --- old/spec-cleaner-spec-cleaner-1.0.0/tests/out-minimal/scriplets.spec 2017-09-21 13:18:40.000000000 +0200 +++ new/spec-cleaner-spec-cleaner-1.0.1/tests/out-minimal/scriplets.spec 2017-12-06 16:42:43.000000000 +0100 @@ -10,4 +10,22 @@ %post -n %{_libname} /sbin/ldconfig +%filetriggerin tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi + +%filetriggerpostun tools -- %{_datadir}/icons +if [ "$(realpath %{_bindir}/gtk-update-icon-cache)" = "%{_bindir}/gtk-update-icon-cache-2.0" ]; then + for ICON_THEME in $(cut -d / -f 5 | sort -u); do + if [ -f "%{_datadir}/icons/${ICON_THEME}/index.theme" ]; then + %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" + fi + done +fi + %changelog ++++++ spec-cleaner.dsc ++++++ --- /var/tmp/diff_new_pack.Rg9IRS/_old 2017-12-08 12:59:42.404660642 +0100 +++ /var/tmp/diff_new_pack.Rg9IRS/_new 2017-12-08 12:59:42.404660642 +0100 @@ -1,8 +1,8 @@ Format: 3.0 (quilt) Source: spec-cleaner -Version: 1.0.0-1 +Version: 1.0.1-1 Binary: spec-cleaner -Maintainer: Přemysl Janouch <pjano...@suse.com> +Maintainer: Tomáš Chvátal <tchva...@suse.com> Architecture: all Build-Depends: debhelper (>= 9), python3-dev, python3-mock, python3-nose, python3-setuptools, dh-python