From 5a94606b33afa4f2ca80c58e2e719090339215b08f9f93ec66bb2a46db671462 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 13 Aug 2014 12:10:32 +0000 Subject: [PATCH 1/3] - Version bump to 0.6.0: * Use setuptools and nosetests for building&testing * Various bugfixes as found by java icedtea cleaning OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/spec-cleaner?expand=0&rev=29 --- spec-cleaner-0.5.9.tar.gz | 3 -- spec-cleaner-0.6.0.tar.gz | 3 ++ spec-cleaner.changes | 7 +++++ spec-cleaner.spec | 58 ++++++++++++++++++--------------------- 4 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 spec-cleaner-0.5.9.tar.gz create mode 100644 spec-cleaner-0.6.0.tar.gz diff --git a/spec-cleaner-0.5.9.tar.gz b/spec-cleaner-0.5.9.tar.gz deleted file mode 100644 index c295a61..0000000 --- a/spec-cleaner-0.5.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6013f53139e2f82bf54fc6f4446d16ad379b35f45e6c17c1f1547f4a5c63bb72 -size 56536 diff --git a/spec-cleaner-0.6.0.tar.gz b/spec-cleaner-0.6.0.tar.gz new file mode 100644 index 0000000..79add5b --- /dev/null +++ b/spec-cleaner-0.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31baafccca86552ea04066f3fb22b14eeb1a7de9953c0ee1acf5dac7068048de +size 60080 diff --git a/spec-cleaner.changes b/spec-cleaner.changes index a104df9..04d6d6e 100644 --- a/spec-cleaner.changes +++ b/spec-cleaner.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 13 12:09:35 UTC 2014 - tchvatal@suse.com + +- Version bump to 0.6.0: + * Use setuptools and nosetests for building&testing + * Various bugfixes as found by java icedtea cleaning + ------------------------------------------------------------------- Tue Jul 8 11:32:40 UTC 2014 - tchvatal@suse.com diff --git a/spec-cleaner.spec b/spec-cleaner.spec index a1abe32..dc148b0 100644 --- a/spec-cleaner.spec +++ b/spec-cleaner.spec @@ -18,23 +18,19 @@ Name: spec-cleaner -Version: 0.5.9 +Version: 0.6.0 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause Group: Development/Tools/Other Url: http://github.com/openSUSE/spec-cleaner Source0: https://github.com/openSUSE/%{name}/archive/%{name}-%{version}.tar.gz -BuildRequires: python -Requires: python-argparse +BuildRequires: python3-mock +BuildRequires: python3-nose +BuildRequires: python3-setuptools +Requires: python3-argparse BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -# This is just for tests -# It is conditional so we built on older distros too -# Drop after 12.2 and older are not targeted here -%if 0%{?suse_version} > 01220 -BuildRequires: python3 -%endif %description This script cleans spec file according to some arbitrary style guide. The @@ -45,15 +41,13 @@ will never be perfect. %setup -q -n %{name}-%{name}-%{version} %build +python3 setup.py build %check -make check -j1 +python3 setup.py test %install -make DESTDIR=%{buildroot} install %{?_smp_mflags} \ - LIBEXECDIR=%{_libexecdir} \ - LIBDIR=%{_libdir} \ - SITEDIR=%{python_sitelib} +python3 setup.py install --root="%{buildroot}" %files %defattr(-, root, root) @@ -62,23 +56,25 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} \ %dir %{_libexecdir}/obs/service/ %{_libexecdir}/obs/service/clean_spec_file %{_libexecdir}/obs/service/clean_spec_file.service -%dir %{python_sitelib}/spec_cleaner/ -%{python_sitelib}/spec_cleaner/__init__.py* -%{python_sitelib}/spec_cleaner/fileutils.py* -%{python_sitelib}/spec_cleaner/rpmbuild.py* -%{python_sitelib}/spec_cleaner/rpmcheck.py* -%{python_sitelib}/spec_cleaner/rpmcleaner.py* -%{python_sitelib}/spec_cleaner/rpmcopyright.py* -%{python_sitelib}/spec_cleaner/rpmdescription.py* -%{python_sitelib}/spec_cleaner/rpmexception.py* -%{python_sitelib}/spec_cleaner/rpmfiles.py* -%{python_sitelib}/spec_cleaner/rpminstall.py* -%{python_sitelib}/spec_cleaner/rpmpreamble.py* -%{python_sitelib}/spec_cleaner/rpmprep.py* -%{python_sitelib}/spec_cleaner/rpmprune.py* -%{python_sitelib}/spec_cleaner/rpmregexp.py* -%{python_sitelib}/spec_cleaner/rpmscriplets.py* -%{python_sitelib}/spec_cleaner/rpmsection.py* +%dir %{python3_sitelib}/spec_cleaner/ +%{python3_sitelib}/spec_cleaner/__init__.py +%{python3_sitelib}/spec_cleaner/fileutils.py +%{python3_sitelib}/spec_cleaner/rpmbuild.py +%{python3_sitelib}/spec_cleaner/rpmcheck.py +%{python3_sitelib}/spec_cleaner/rpmcleaner.py +%{python3_sitelib}/spec_cleaner/rpmcopyright.py +%{python3_sitelib}/spec_cleaner/rpmdescription.py +%{python3_sitelib}/spec_cleaner/rpmexception.py +%{python3_sitelib}/spec_cleaner/rpmfiles.py +%{python3_sitelib}/spec_cleaner/rpminstall.py +%{python3_sitelib}/spec_cleaner/rpmpreamble.py +%{python3_sitelib}/spec_cleaner/rpmprep.py +%{python3_sitelib}/spec_cleaner/rpmprune.py +%{python3_sitelib}/spec_cleaner/rpmregexp.py +%{python3_sitelib}/spec_cleaner/rpmscriplets.py +%{python3_sitelib}/spec_cleaner/rpmsection.py +%{python3_sitelib}/spec_cleaner/__pycache__ +%{python3_sitelib}/spec_cleaner-%{version}-py%{py3_ver}.egg-info %dir %{_datadir}/%{name}/ %{_datadir}/%{name}/excludes-bracketing.txt %{_datadir}/%{name}/licenses_changes.txt From 8887b4137aef7ffe0bf1912b3cc94631dab897fdde69baa8c0b38f7268139dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Wed, 13 Aug 2014 12:29:13 +0000 Subject: [PATCH 2/3] - Version bump to 0.6.1: * Fixup release with working spec-cleaner script executable OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/spec-cleaner?expand=0&rev=30 --- spec-cleaner-0.6.0.tar.gz | 3 --- spec-cleaner-0.6.1.tar.gz | 3 +++ spec-cleaner.changes | 6 ++++++ spec-cleaner.spec | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 spec-cleaner-0.6.0.tar.gz create mode 100644 spec-cleaner-0.6.1.tar.gz diff --git a/spec-cleaner-0.6.0.tar.gz b/spec-cleaner-0.6.0.tar.gz deleted file mode 100644 index 79add5b..0000000 --- a/spec-cleaner-0.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31baafccca86552ea04066f3fb22b14eeb1a7de9953c0ee1acf5dac7068048de -size 60080 diff --git a/spec-cleaner-0.6.1.tar.gz b/spec-cleaner-0.6.1.tar.gz new file mode 100644 index 0000000..56f6a3e --- /dev/null +++ b/spec-cleaner-0.6.1.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e1c6fd2e5116eef90bf5a529bab27dde591f2fa601add7af60212ea740519db +size 60012 diff --git a/spec-cleaner.changes b/spec-cleaner.changes index 04d6d6e..3f0ea2c 100644 --- a/spec-cleaner.changes +++ b/spec-cleaner.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Aug 13 12:28:45 UTC 2014 - tchvatal@suse.com + +- Version bump to 0.6.1: + * Fixup release with working spec-cleaner script executable + ------------------------------------------------------------------- Wed Aug 13 12:09:35 UTC 2014 - tchvatal@suse.com diff --git a/spec-cleaner.spec b/spec-cleaner.spec index dc148b0..e1f103d 100644 --- a/spec-cleaner.spec +++ b/spec-cleaner.spec @@ -18,7 +18,7 @@ Name: spec-cleaner -Version: 0.6.0 +Version: 0.6.1 Release: 0 Summary: .spec file cleaner License: BSD-3-Clause From 0905072cdcecbe0f6c7888f94537b92f29a83ef39dd267985b2323560f090119 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 29 Aug 2014 10:46:30 +0000 Subject: [PATCH 3/3] - py3 include arpgarse itself. OBS-URL: https://build.opensuse.org/package/show/openSUSE:Tools/spec-cleaner?expand=0&rev=31 --- spec-cleaner.changes | 5 +++++ spec-cleaner.spec | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/spec-cleaner.changes b/spec-cleaner.changes index 3f0ea2c..298408f 100644 --- a/spec-cleaner.changes +++ b/spec-cleaner.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Aug 29 10:46:17 UTC 2014 - tchvatal@suse.com + +- py3 include arpgarse itself. + ------------------------------------------------------------------- Wed Aug 13 12:28:45 UTC 2014 - tchvatal@suse.com diff --git a/spec-cleaner.spec b/spec-cleaner.spec index e1f103d..2098592 100644 --- a/spec-cleaner.spec +++ b/spec-cleaner.spec @@ -28,7 +28,6 @@ Source0: https://github.com/openSUSE/%{name}/archive/%{name}-%{version}.t BuildRequires: python3-mock BuildRequires: python3-nose BuildRequires: python3-setuptools -Requires: python3-argparse BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch