Hello community, here is the log from the commit of package spec-cleaner for openSUSE:Factory checked in at 2019-03-10 09:34:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/spec-cleaner (Old) and /work/SRC/openSUSE:Factory/.spec-cleaner.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "spec-cleaner" Sun Mar 10 09:34:52 2019 rev:57 rq:682450 version:1.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/spec-cleaner/spec-cleaner.changes 2018-12-13 19:50:18.896555974 +0100 +++ /work/SRC/openSUSE:Factory/.spec-cleaner.new.28833/spec-cleaner.changes 2019-03-10 09:35:09.400179383 +0100 @@ -1,0 +2,10 @@ +Thu Mar 7 12:36:28 UTC 2019 - Tomáš Chvátal <[email protected]> + +- Update to 1.1.3 bsc#1099674: + * Convert pytest calls to macros + * Fix errors in %python_expand line expansions + * update licenses list + * Expand more excludes for curlification + * Do not add accidental newlines to complex conditions + +------------------------------------------------------------------- Old: ---- spec-cleaner-1.1.2.tar.gz New: ---- spec-cleaner-1.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ spec-cleaner.spec ++++++ --- /var/tmp/diff_new_pack.lS3k9I/_old 2019-03-10 09:35:10.892179026 +0100 +++ /var/tmp/diff_new_pack.lS3k9I/_new 2019-03-10 09:35:10.944179014 +0100 @@ -1,7 +1,7 @@ # # spec file for package spec-cleaner # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2012 Vincent Untz <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 1.1.2 +Version: 1.1.3 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause ++++++ spec-cleaner-1.1.2.tar.gz -> spec-cleaner-1.1.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/README.md new/spec-cleaner-spec-cleaner-1.1.3/README.md --- old/spec-cleaner-spec-cleaner-1.1.2/README.md 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/README.md 2019-03-07 13:33:41.000000000 +0100 @@ -127,6 +127,7 @@ CNRI-Python-GPL-Compatible | CNRI Python Open Source GPL Compatible License Agreement CNRI-Python | CNRI Python License Condor-1.1 | Condor Public License v1.1 +copyleft-next-0.3.0 | copyleft-next 0.3.0 copyleft-next-0.3.1 | copyleft-next 0.3.1 CPAL-1.0 | Common Public Attribution License 1.0 CPL-1.0 | Common Public License 1.0 @@ -395,7 +396,6 @@ LZMA-exception Libtool-exception Linux-syscall-note -Nokia-Qt-exception-1.1 OCCT-exception-1.0 OCaml-LGPL-linking-exception OpenJDK-assembly-exception-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/data/excludes-bracketing.txt new/spec-cleaner-spec-cleaner-1.1.3/data/excludes-bracketing.txt --- old/spec-cleaner-spec-cleaner-1.1.2/data/excludes-bracketing.txt 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/data/excludes-bracketing.txt 2019-03-07 13:33:41.000000000 +0100 @@ -52,6 +52,8 @@ glib2_gsettings_schema_[^\s]* global gpg_verify +hpc_setup +hpc_write_modules_files icon_theme_cache_post[^\s]* icon_theme_cache_create_ghost if(\s*\(.*\))? @@ -117,8 +119,12 @@ python(.?)_only pypy(.?)_only pycache_only +pytest +pytest_arch python(.?)_build python(.?)_install +py(.?)_build +py(.?)_install pypy3_build pypy3_install python_exec diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/data/licenses_changes.txt new/spec-cleaner-spec-cleaner-1.1.3/data/licenses_changes.txt --- old/spec-cleaner-spec-cleaner-1.1.2/data/licenses_changes.txt 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/data/licenses_changes.txt 2019-03-07 13:33:41.000000000 +0100 @@ -1178,6 +1178,8 @@ bzip2-1.0.5+ bzip2-1.0.5+ bzip2-1.0.6 bzip2-1.0.6 bzip2-1.0.6+ bzip2-1.0.6+ +copyleft-next-0.3.0 copyleft-next-0.3.0 +copyleft-next-0.3.0+ copyleft-next-0.3.0+ copyleft-next-0.3.1 copyleft-next-0.3.1 copyleft-next-0.3.1+ copyleft-next-0.3.1+ curl curl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/data/licenses_exceptions.txt new/spec-cleaner-spec-cleaner-1.1.3/data/licenses_exceptions.txt --- old/spec-cleaner-spec-cleaner-1.1.2/data/licenses_exceptions.txt 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/data/licenses_exceptions.txt 2019-03-07 13:33:41.000000000 +0100 @@ -15,7 +15,6 @@ LZMA-exception Libtool-exception Linux-syscall-note -Nokia-Qt-exception-1.1 OCCT-exception-1.0 OCaml-LGPL-linking-exception OpenJDK-assembly-exception-1.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/setup.py new/spec-cleaner-spec-cleaner-1.1.3/setup.py --- old/spec-cleaner-spec-cleaner-1.1.2/setup.py 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/setup.py 2019-03-07 13:33:41.000000000 +0100 @@ -10,7 +10,7 @@ setup( name='spec_cleaner', description='RPM .spec files cleaner', - long_description=('Command-line tool for cleaning various formatting ' 'errors in RPM .spec files'), + long_description=('Command-line tool for cleaning various formatting errors in RPM .spec files'), url='https://github.com/openSUSE/spec-cleaner', download_url='https://github.com/openSUSE/spec-cleaner', version=__version__, @@ -20,8 +20,6 @@ maintainer_email='[email protected]', license='License :: OSI Approved :: BSD License', classifiers=[ - # complete classifier list: - # http://pypi.python.org/pypi?%3Aaction=list_classifiers 'Development Status :: 5 - Production/Stable', 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/__init__.py new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/__init__.py --- old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/__init__.py 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/__init__.py 2019-03-07 13:33:41.000000000 +0100 @@ -13,7 +13,7 @@ from .rpmexception import RpmException, RpmWrongArgs -__version__ = '1.1.2' +__version__ = '1.1.3' def process_args(argv): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmcheck.py new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmcheck.py --- old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmcheck.py 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmcheck.py 2019-03-07 13:33:41.000000000 +0100 @@ -15,14 +15,25 @@ # smp_mflags for jobs macro replacement line = self.reg.re_jobs.sub('%{?_smp_mflags}', line) + if not self.minimal: + line = self._add_jobs(line) + line = self._replace_pytest(line) + + Section.add(self, line) + + def _add_jobs(self, line): # add jobs if we have just make call on line # if user want single thread he should specify -j1 - if not self.minimal and self.reg.re_make.match(line): + if self.reg.re_make.match(line): # if there are no smp_flags or jobs spec if line.find('%{?_smp_mflags}') == -1 and line.find('-j') == -1: # Don't append %_smp_mflags if the line ends with a backslash, # it would break the formatting if not line.endswith('\\') and not line.lstrip().startswith('#'): line = self.reg.re_make.sub(r'\1make %{?_smp_mflags}\2', line) + return line - Section.add(self, line) + def _replace_pytest(self, line): + line = self.reg.re_pytest.sub('%pytest', line) + line = self.reg.re_pytest_arch.sub('%pytest_arch', line) + return line diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmregexp.py new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmregexp.py --- old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmregexp.py 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmregexp.py 2019-03-07 13:33:41.000000000 +0100 @@ -104,6 +104,10 @@ re_cmake = re.compile(r'(^|(.*\s)?)cmake(\s.*|)$') re_qmake5 = re.compile(r'(^|(.*\s)?)qmake-qt5(\s.*|)$') re_meson = re.compile(r'(^|(.*\s)?)meson(\s.*|)$') + re_pytest = re.compile(r'%python_(expand|exec)\s+(PYTHONPATH=%{buildroot}%{\$?python_sitelib}\s+)?(\$?python\s+)?(%{_bindir}/?|-m\s+)?py\.?test(-(%{\$?python_version}|%{\$?python_bin_suffix})?)?(\s+(-v|-o addopts=-v))?') + re_pytest_arch = re.compile(r'%python_(expand|exec)\s+(PYTHONPATH=%{buildroot}%{\$?python_sitearch}\s+)?(\$?python\s+)?(%{_bindir}/?|-m\s+)?py\.?test(-(%{\$?python_version}|%{\$?python_bin_suffix})?)?(\s+(-v|-o addopts=-v))?') + re_python_expand = re.compile(r'%{?(python_sitelib|python_sitearch|python_bin_suffix|python_version)}?') + re_python_interp_expand = re.compile(r'\s+(python)\s+') # rpmcopyright re_copyright = re.compile(r'^#\s*Copyright\ \(c\)\s*(.*)', re.IGNORECASE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmsection.py new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmsection.py --- old/spec-cleaner-spec-cleaner-1.1.2/spec_cleaner/rpmsection.py 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/spec_cleaner/rpmsection.py 2019-03-07 13:33:41.000000000 +0100 @@ -45,6 +45,7 @@ line = self.replace_utils(line) line = self.replace_buildservice(line) line = self.replace_preamble_macros(line) + line = self.replace_python_expand(line) return line @@ -89,6 +90,7 @@ and not self.lines[-1].startswith('%if') and not self.lines[-1].startswith('%pre') and not self.lines[-1].startswith('%post') + and not self.lines[-1].endswith('\\') ): self.lines.append('') if new_class != 'RpmScriptlets' and (self.lines[-1].startswith('%pre') or self.lines[-1].startswith('%post')): @@ -154,6 +156,12 @@ line = self.reg.re_optflags.sub('%{optflags}', line) return line + def replace_python_expand(self, line): + if line.startswith('%python_expand') or line.startswith('%{python_expand'): + line = self.reg.re_python_expand.sub(r'%{$\1}', line) + line = self.reg.re_python_interp_expand.sub(r' $\1 ', line) + return line + def replace_known_dirs(self, line): """ Replace hardcoded stuff like /usr/share -> %{_datadir} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/in/makeinstall.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/in/makeinstall.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/in/makeinstall.spec 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/in/makeinstall.spec 2019-03-07 13:33:41.000000000 +0100 @@ -2,10 +2,10 @@ rm -rf %{buildroot} %makeinstall %make_install +make %{?_smp_mflags} DESTDIR=%{buildroot} install \ make install DESTDIR="$RPM_BUILD_ROOT" make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} -j1 make DESTDIR=%{buildroot} -j4 install $RPM_BUILD_ROOT_REPLACEMENT != $RPM_BUILD_ROOT == ${RPM_BUILD_ROOT} == $RPM_BUILD_ROOT DESTDIR="%{buildroot}" make install -make %{?_smp_mflags} DESTDIR=%{buildroot} install \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/in/nestedcondition.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/in/nestedcondition.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/in/nestedcondition.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/in/nestedcondition.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,31 @@ +%build +%if %{with meson} +%meson \ + --default-library=both \ + -Dselinux=true \ + -Dman=true \ + -Dgtk_doc=true \ + -Dfam=true \ +%if %{with systemtap} + -Dsystemtap=true \ +%endif + -Ddtrace=true \ + -Dinternal_pcre=false +%meson_build + +%check +%meson_test +%else +autoreconf -fi +%configure \ + --enable-static \ + --enable-selinux \ + --enable-gtk-doc \ + --enable-man \ + --with-python=%{_bindir}/python3 \ +%if %{with systemtap} + --enable-systemtap \ +%endif + --with-pcre=system +%make_build +%endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/in/pytest.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/in/pytest.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/in/pytest.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/in/pytest.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,14 @@ +%check +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} +%python_expand py.test-%{$python_version} +%python_expand PYTHONPATH=%{buildroot}%{python_sitelib} $python py.test-%{python_version} +%python_expand PYTHONPATH=%{buildroot}%{python_sitelib} $python %{_bindir}/py.test -o addopts=-v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} %{_bindir}py.test-%{$python_bin_suffix} -v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} pytest +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest +%python_exec %{_bindir}/py.test -v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} py.test-%{$python_bin_suffix} +%python_exec -m pytest -v +%python_exec -m pytest -o addopts=-v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v src/txacme/test -k 'not (matchers or util or client)' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/in/python-expand.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/in/python-expand.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/in/python-expand.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/in/python-expand.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,12 @@ +%install +%python_expand %fdupes %{buildroot}%{python_sitelib} +%python_expand %fdupes %{buildroot}%{python_sitearch} + + +%check +%python_expand PYTHONPATH=%{python_sitearch} nosetests-%{python_bin_suffix} +%python_expand testr-%{python_version} +%{python_expand python -m unittest discover} + +%changelog + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out/makeinstall.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out/makeinstall.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out/makeinstall.spec 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out/makeinstall.spec 2019-03-07 13:33:41.000000000 +0100 @@ -1,12 +1,12 @@ %install %make_install %make_install +make %{?_smp_mflags} DESTDIR=%{buildroot} install \ %make_install %make_install %make_install %make_install $RPM_BUILD_ROOT_REPLACEMENT != %{buildroot} == %{buildroot} == %{buildroot} %make_install -make %{?_smp_mflags} DESTDIR=%{buildroot} install \ %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out/nestedcondition.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out/nestedcondition.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out/nestedcondition.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out/nestedcondition.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,33 @@ +%build +%if %{with meson} +%meson \ + --default-library=both \ + -Dselinux=true \ + -Dman=true \ + -Dgtk_doc=true \ + -Dfam=true \ +%if %{with systemtap} + -Dsystemtap=true \ +%endif + -Ddtrace=true \ + -Dinternal_pcre=false +%meson_build + +%check +%meson_test +%else +autoreconf -fi +%configure \ + --enable-static \ + --enable-selinux \ + --enable-gtk-doc \ + --enable-man \ + --with-python=%{_bindir}/python3 \ +%if %{with systemtap} + --enable-systemtap \ +%endif + --with-pcre=system +%make_build +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out/pytest.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out/pytest.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out/pytest.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out/pytest.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,16 @@ +%check +%pytest +%pytest +%pytest +%pytest +%pytest +%pytest +%pytest +%pytest +%pytest +%pytest_arch +%pytest +%pytest +%pytest src/txacme/test -k 'not (matchers or util or client)' + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out/python-expand.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out/python-expand.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out/python-expand.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out/python-expand.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,11 @@ +%install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitearch} + + +%check +%python_expand PYTHONPATH=%{$python_sitearch} nosetests-%{$python_bin_suffix} +%python_expand testr-%{$python_version} +%{python_expand $python -m unittest discover} + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/makeinstall.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/makeinstall.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/makeinstall.spec 2018-12-13 12:30:17.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/makeinstall.spec 2019-03-07 13:33:41.000000000 +0100 @@ -1,12 +1,12 @@ %install %makeinstall %make_install +make %{?_smp_mflags} DESTDIR=%{buildroot} install \ make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} make install DESTDIR=%{buildroot} -j1 make DESTDIR=%{buildroot} -j4 install $RPM_BUILD_ROOT_REPLACEMENT != %{buildroot} == %{buildroot} == %{buildroot} DESTDIR=%{buildroot} make install -make %{?_smp_mflags} DESTDIR=%{buildroot} install \ %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/nestedcondition.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/nestedcondition.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/nestedcondition.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/nestedcondition.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,33 @@ +%build +%if %{with meson} +%meson \ + --default-library=both \ + -Dselinux=true \ + -Dman=true \ + -Dgtk_doc=true \ + -Dfam=true \ +%if %{with systemtap} + -Dsystemtap=true \ +%endif + -Ddtrace=true \ + -Dinternal_pcre=false +%meson_build + +%check +%meson_test +%else +autoreconf -fi +%configure \ + --enable-static \ + --enable-selinux \ + --enable-gtk-doc \ + --enable-man \ + --with-python=%{_bindir}/python3 \ +%if %{with systemtap} + --enable-systemtap \ +%endif + --with-pcre=system +%make_build +%endif + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/pytest.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/pytest.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/pytest.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/pytest.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,16 @@ +%check +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_version} +%python_expand py.test-%{$python_version} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python py.test-%{$python_version} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python %{_bindir}/py.test -o addopts=-v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} %{_bindir}py.test-%{$python_bin_suffix} -v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} pytest +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} $python -m pytest +%python_exec %{_bindir}/py.test -v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitearch} py.test-%{$python_bin_suffix} +%python_exec -m pytest -v +%python_exec -m pytest -o addopts=-v +%python_expand PYTHONPATH=%{buildroot}%{$python_sitelib} py.test-%{$python_bin_suffix} -v src/txacme/test -k 'not (matchers or util or client)' + +%changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/python-expand.spec new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/python-expand.spec --- old/spec-cleaner-spec-cleaner-1.1.2/tests/out-minimal/python-expand.spec 1970-01-01 01:00:00.000000000 +0100 +++ new/spec-cleaner-spec-cleaner-1.1.3/tests/out-minimal/python-expand.spec 2019-03-07 13:33:41.000000000 +0100 @@ -0,0 +1,11 @@ +%install +%python_expand %fdupes %{buildroot}%{$python_sitelib} +%python_expand %fdupes %{buildroot}%{$python_sitearch} + + +%check +%python_expand PYTHONPATH=%{$python_sitearch} nosetests-%{$python_bin_suffix} +%python_expand testr-%{$python_version} +%{python_expand $python -m unittest discover} + +%changelog
