.gitignore

@@ -1 +1 @@
-SOURCES/scour-0.38.1.tar.gz
+SOURCES/scour-0.35.tar.gz

.python-scour.metadata

@@ -1 +1 @@
-1e00370d80513691a7447897f792d8b6d5d36133 SOURCES/scour-0.38.1.tar.gz
+76770a49c308ef6d181e1e0ef9085c1ed979a0b7 SOURCES/scour-0.35.tar.gz

SPECS/python-scour.spec

@@ -1,31 +1,45 @@
+%if 0%{?rhel} > 7
+# Disable python2 build by default
+%bcond_with python2
+%else
+%bcond_without python2
+%endif
+
 %global modname scour
 %global sum     An SVG scrubber
 
 Name:               python-scour
-Version:            0.38.1
-%global	gitversion  038.1
-Release:            5%{?dist}
+Version:            0.35
+Release:            9%{?dist}
 Summary:            %{sum}
 
 License:            ASL 2.0
 URL:                https://github.com/scour-project/scour
-Source0:            %{url}/archive/v%{gitversion}.tar.gz#/%{modname}-%{version}.tar.gz
+Source0:            %{url}/archive/v%{version}.tar.gz#/%{modname}-%{version}.tar.gz
+
+%if %{with python2}
+BuildRequires:      python2-devel
+BuildRequires:      python2-setuptools
+%endif # with python2
 
 BuildRequires:      python3-devel
 BuildRequires:      python3-setuptools
-# Tests
-%if !0%{?rhel}
-%if !0%{?centos}
-BuildRequires:      python3-six
-BuildRequires:      python3-flake8
-%endif
-%endif
 
 BuildArch:          noarch
 
 %description
 %{sum}.
 
+%if %{with python2}
+%package -n python2-%{modname}
+Summary:            %{sum}
+%{?python_provide:%python_provide python2-%{modname}}
+
+
+%description -n python2-%{modname}
+%{sum}.
+%endif # with python2
+
 
 %package -n python3-%{modname}
 Summary:            %{sum}
@@ -37,28 +51,41 @@ Summary:            %{sum}
 
 
 %prep
-%autosetup -n %{modname}-%{gitversion}
+%autosetup -n %{modname}-%{version}
 
 # Better safe than sorry
 find . -type f -name '*.py' -exec sed -i /env\ python/d {} ';'
 find . -type f -name '*.py' -exec sed -i /env\ python/d {} ';'
 
 %build
+%if %{with python2}
+%py2_build
+%endif # with python2
 %py3_build
 
 %install
+%if %{with python2}
+%py2_install
+%endif # with python2
 %py3_install
 
 
-%check
-%if !0%{?rhel}
-%if !0%{?centos}
-%{__python3} setup.py test
-%endif
-%endif
+#%%check
+%if %{with python2}
+#%%{__python2} setup.py test
+%endif # with python2
+#%%{__python3} setup.py test
 
 %{!?_licensedir: %global license %doc}
 
+%if %{with python2}
+%files -n python2-%{modname}
+%doc README.md
+%license LICENSE
+%{python2_sitelib}/%{modname}/
+%{python2_sitelib}/%{modname}-%{version}*
+%endif # with python2
+
 %files -n python3-%{modname}
 %doc README.md
 %license LICENSE
@@ -68,54 +95,14 @@ find . -type f -name '*.py' -exec sed -i /env\ python/d {} ';'
 
 
 %changelog
-* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.38.1-5
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Thu Apr 22 2021 Jan Horak <jhorak@redhat.com> - 0.38.1-4
-- Don't run tests on the centos and rhel because of missing required packages
-
-* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.38.1-3
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-
-* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.38.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Thu Sep 03 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.38.1
-- 0.38.1
-
-* Tue Aug 18 2020 Gwyn Ciesla <gwync@protonmail.com> - 0.38-1
-- 0.38
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.37-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Mon May 25 2020 Miro Hrončok <mhroncok@redhat.com> - 0.37-7
-- Rebuilt for Python 3.9
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.37-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.37-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
-
-* Wed Aug 28 2019 Gwyn Ciesla <gwync@protonmail.com> - 0.37-4
-- Drop Python 2.
-
-* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.37-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.37-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Thu Jan 31 2019 Gwyn Ciesla <limburgher@gmail.com> - 0.37-1
-- 0.37
+* Tue Dec 12 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.35-9
+- Rebuilt for MSVSphere 8.8
 
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.35-9
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+* Mon Oct 15 2018 Jan Horak <jhorak@redhat.com> - 0.35-9
+- Bump release
 
-* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.35-8
-- Rebuilt for Python 3.7
+* Sun Jul 22 2018 Charalampos Stratakis <cstratak@redhat.com> - 0.35-8
+- Conditionalize the python2 subpackage
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.35-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild