diff --git a/.gitignore b/.gitignore index 03e60e6..97b6fa0 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,2 @@ -/django_compressor-1.2.tar.gz -/django_compressor-1.3.tar.gz -/django_compressor-1.4.tar.gz -/django_compressor-1.5.tar.gz -/django_compressor-1.6.tar.gz -/django_compressor-2.0.tar.gz -/python-django-compressor-2.1.tar.gz -/python-django-compressor-2.2.tar.gz -/python-django-compressor-2.4.tar.gz -/python-django-compressor-2.4.1.tar.gz +/python-django-compressor-*.tar.gz +/django-compressor-*.tar.gz diff --git a/changelog b/changelog new file mode 100644 index 0000000..7593c83 --- /dev/null +++ b/changelog @@ -0,0 +1,124 @@ +* Mon Jun 13 2022 Python Maint - 2.4.1-2 +- Rebuilt for Python 3.11 + +* Mon Mar 14 2022 Karolina Kula - 2.4.1-1 +- Update to 2.4.1 + +* Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Fri Jun 04 2021 Python Maint - 2.4-3 +- Rebuilt for Python 3.10 + +* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Sep 09 2020 Yatin Karel - 2.4-1 +- Update to 2.4 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue May 26 2020 Miro Hrončok - 2.2-10 +- Rebuilt for Python 3.9 + +* Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Oct 03 2019 Miro Hrončok - 2.2-8 +- Rebuilt for Python 3.8.0rc1 (#1748018) + +* Mon Aug 19 2019 Miro Hrončok - 2.2-7 +- Rebuilt for Python 3.8 + +* Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Jun 19 2018 Miro Hrončok - 2.2-3 +- Rebuilt for Python 3.7 + +* Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Jan 31 2018 Matthias Runge - 2.2-1 +- update to 2.2 + +* Fri Jan 26 2018 Matthias Runge - 2.1-6 +- Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 + +* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 +- Python 2 binary package renamed to python2-django-compressor + See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 + +* Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Mon Dec 19 2016 Miro Hrončok - 2.1-2 +- Rebuild for Python 3.6 + +* Thu Aug 11 2016 Matthias Runge - 2.1-1 +- update to 2.1 (rhbz#1365700) +- modernize spec + +* Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 +- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages + +* Fri Feb 26 2016 Matthias Runge - 2.0-1 +- update to 2.0 (rhbz#1296716) + +* Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Nov 20 2015 Matthias Runge - 1.6-1 +- update to 1.6 (rhbz#1283807) + +* Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 + +* Thu Aug 27 2015 Matthias Runge - 1.5-2 +- add python3 subpackage + +* Wed Aug 26 2015 Matthias Runge - 1.5-1 +- update to 1.5 + +* Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Wed Apr 15 2015 Matthias Runge - 1.4-3 +- make compress command work on django-1.8 + +* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Mon May 26 2014 Matthias Runge - 1.4-1 +- update to 1.4 (rhbz#1100732) + +* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Mar 20 2013 Matthias Runge - 1.3-1 +- update to python-django-compressor-1.3 (rhbz#923735) + +* Thu Feb 14 2013 Fedora Release Engineering - 1.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Mon Sep 24 2012 Matthias Runge - 1.2-3 +- add requirement Django/python-django + +* Fri Sep 14 2012 Matthias Runge - 1.2-2 +- add requirement python-versiontools + +* Tue Sep 11 2012 Matthias Runge - 1.2-1 +- Initial package. diff --git a/python-django-compressor.spec b/python-django-compressor.spec index e43779c..22e8813 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,16 +1,5 @@ -%global pypi_name django_compressor -Name: python-django-compressor -Version: 2.4.1 -Release: 3%{?dist} -Summary: Compresses linked and inline JavaScript or CSS into single cached files - -License: MIT -URL: http://pypi.python.org/pypi/django_compressor/%{version} -Source0: https://github.com/django-compressor/django-compressor/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz - -BuildArch: noarch - -%global _description\ +%global srcname django-compressor +%global _desc\ Django Compressor combines and compresses linked and inline Javascript\ or CSS in a Django templates into cacheable static files by using the\ ``compress`` template tag. HTML in between\ @@ -18,175 +7,48 @@ or CSS in a Django templates into cacheable static files by using the\ parsed and searched for CSS or JS. These styles and scripts are subsequently\ processed with optional, configurable compilers and filters. -%description %_description +Name: python-django-compressor +Version: 4.1 +Release: %autorelease +Summary: Compresses linked and inline JavaScript or CSS into single cached files -%package -n python3-django-compressor -Summary: Compresses linked and inline JavaScript or CSS into single cached files -Requires: python3-versiontools -Requires: python3-django-appconf -Requires: python3-django -Requires: python3-rjsmin -Requires: python3-rcssmin +License: MIT +URL: https://github.com/django-compressor/django-compressor +Source0: %{url}/archive/%{version}/%{srcname}-%{version}.tar.gz -BuildRequires: python3-devel -BuildRequires: python3-setuptools +Patch0: rdep-version.patch + +BuildArch: noarch + +BuildRequires: python3-devel + +%description %_desc + +%package -n python3-%{srcname} +Summary: %{summary} + +%description -n python3-%{srcname} +%_desc # Added in f28 cycle. -Obsoletes: python2-django-compressor < 2.1-6 -Obsoletes: python-django-compressor < 2.1-6 - -%description -n python3-django-compressor -Django Compressor combines and compresses linked and inline Javascript -or CSS in a Django templates into cacheable static files by using the -``compress`` template tag. HTML in between -``{% compress js/css %}`` and ``{% endcompress %}`` is -parsed and searched for CSS or JS. These styles and scripts are subsequently -processed with optional, configurable compilers and filters. - - +Obsoletes: python2-%{srcname} < 2.1-6 +Obsoletes: python-%{srcname} < 2.1-6 %prep -%autosetup -n django-compressor-%{version} +%autosetup -p1 -n %{srcname}-%{version} + +%generate_buildrequires +%pyproject_buildrequires %build -%py3_build +%pyproject_wheel %install -%py3_install +%pyproject_install +%pyproject_save_files compressor - - -%files -n python3-django-compressor +%files -n python3-%{srcname} -f %{pyproject_files} %doc README.rst -%license LICENSE -%{python3_sitelib}/compressor -%{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info %changelog -* Fri Jul 22 2022 Fedora Release Engineering - 2.4.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Mon Jun 13 2022 Python Maint - 2.4.1-2 -- Rebuilt for Python 3.11 - -* Mon Mar 14 2022 Karolina Kula - 2.4.1-1 -- Update to 2.4.1 - -* Fri Jan 21 2022 Fedora Release Engineering - 2.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Fri Jul 23 2021 Fedora Release Engineering - 2.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Fri Jun 04 2021 Python Maint - 2.4-3 -- Rebuilt for Python 3.10 - -* Wed Jan 27 2021 Fedora Release Engineering - 2.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Wed Sep 09 2020 Yatin Karel - 2.4-1 -- Update to 2.4 - -* Wed Jul 29 2020 Fedora Release Engineering - 2.2-11 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue May 26 2020 Miro Hrončok - 2.2-10 -- Rebuilt for Python 3.9 - -* Thu Jan 30 2020 Fedora Release Engineering - 2.2-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Thu Oct 03 2019 Miro Hrončok - 2.2-8 -- Rebuilt for Python 3.8.0rc1 (#1748018) - -* Mon Aug 19 2019 Miro Hrončok - 2.2-7 -- Rebuilt for Python 3.8 - -* Fri Jul 26 2019 Fedora Release Engineering - 2.2-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Sat Feb 02 2019 Fedora Release Engineering - 2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Sat Jul 14 2018 Fedora Release Engineering - 2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Jun 19 2018 Miro Hrončok - 2.2-3 -- Rebuilt for Python 3.7 - -* Fri Feb 09 2018 Fedora Release Engineering - 2.2-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Jan 31 2018 Matthias Runge - 2.2-1 -- update to 2.2 - -* Fri Jan 26 2018 Matthias Runge - 2.1-6 -- Drop python2 package for https://fedoraproject.org/wiki/Changes/Django20 - -* Sat Aug 19 2017 Zbigniew Jędrzejewski-Szmek - 2.1-5 -- Python 2 binary package renamed to python2-django-compressor - See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3 - -* Thu Jul 27 2017 Fedora Release Engineering - 2.1-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 2.1-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Mon Dec 19 2016 Miro Hrončok - 2.1-2 -- Rebuild for Python 3.6 - -* Thu Aug 11 2016 Matthias Runge - 2.1-1 -- update to 2.1 (rhbz#1365700) -- modernize spec - -* Tue Jul 19 2016 Fedora Release Engineering - 2.0-2 -- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages - -* Fri Feb 26 2016 Matthias Runge - 2.0-1 -- update to 2.0 (rhbz#1296716) - -* Thu Feb 04 2016 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Fri Nov 20 2015 Matthias Runge - 1.6-1 -- update to 1.6 (rhbz#1283807) - -* Tue Nov 10 2015 Fedora Release Engineering - 1.5-3 -- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5 - -* Thu Aug 27 2015 Matthias Runge - 1.5-2 -- add python3 subpackage - -* Wed Aug 26 2015 Matthias Runge - 1.5-1 -- update to 1.5 - -* Thu Jun 18 2015 Fedora Release Engineering - 1.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Apr 15 2015 Matthias Runge - 1.4-3 -- make compress command work on django-1.8 - -* Sat Jun 07 2014 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Mon May 26 2014 Matthias Runge - 1.4-1 -- update to 1.4 (rhbz#1100732) - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Mar 20 2013 Matthias Runge - 1.3-1 -- update to python-django-compressor-1.3 (rhbz#923735) - -* Thu Feb 14 2013 Fedora Release Engineering - 1.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Mon Sep 24 2012 Matthias Runge - 1.2-3 -- add requirement Django/python-django - -* Fri Sep 14 2012 Matthias Runge - 1.2-2 -- add requirement python-versiontools - -* Tue Sep 11 2012 Matthias Runge - 1.2-1 -- Initial package. +%autochangelog diff --git a/rdep-version.patch b/rdep-version.patch new file mode 100644 index 0000000..16a9fe2 --- /dev/null +++ b/rdep-version.patch @@ -0,0 +1,12 @@ +--- a/setup.py 2022-08-17 14:46:30.186903576 +0300 ++++ b/setup.py 2022-08-17 14:46:42.507861281 +0300 +@@ -149,7 +149,7 @@ + zip_safe=False, + install_requires=[ + 'django-appconf >= 1.0.3', +- 'rcssmin == 1.1.0', +- 'rjsmin == 1.2.0', ++ 'rcssmin >= 1.1.0', ++ 'rjsmin >= 1.2.0', + ], + ) diff --git a/sources b/sources index 3adcfa9..f9d77cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (python-django-compressor-2.4.1.tar.gz) = aedaaf749508e62c08e0bb1334b31d015a21c17290b2c441cb16fd393e81d3ce0f587d4f4b18ebd8bb156f6ac75ac2d7a1cfc2e9e7f1c4b4d557462fceafc454 +SHA512 (django-compressor-4.1.tar.gz) = eb1e4fc5d9ada8fb32a1059c87b447735cf0e1c40853b2313b5f7f5d1c9cf3c66d96ebf40a721175db5fe721c44b077bc026270d59e90890e1807125a38a33a1