From bf6c080e42d863ca736b5860359476226393330c Mon Sep 17 00:00:00 2001 From: Matthias Runge Date: Fri, 26 Jan 2018 10:31:40 +0100 Subject: [PATCH] drop python2 package see https://fedoraproject.org/wiki/Changes/Django20 --- python-django-compressor.spec | 52 ++++++----------------------------- 1 file changed, 8 insertions(+), 44 deletions(-) diff --git a/python-django-compressor.spec b/python-django-compressor.spec index a2da1fd..284726e 100644 --- a/python-django-compressor.spec +++ b/python-django-compressor.spec @@ -1,18 +1,7 @@ -%{!?__python2:%global __python2 %{__python}} -%{!?python2_sitelib: %global python2_sitelib %{python_sitelib}} -%{!?python2_sitearch: %global python2_sitearch %{python_sitearch}} -%{!?python2_version: %global python2_version %{python_version}} - %global pypi_name django_compressor -%if 0%{?fedora} > 12 -%global with_python3 1 -%else -%global with_python3 0 -%endif - Name: python-django-compressor Version: 2.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Compresses linked and inline JavaScript or CSS into single cached files License: MIT @@ -21,9 +10,6 @@ Source0: https://github.com/django-compressor/django-compressor/archive/% BuildArch: noarch -BuildRequires: python2-devel -BuildRequires: python-setuptools - %global _description\ Django Compressor combines and compresses linked and inline Javascript\ or CSS in a Django templates into cacheable static files by using the\ @@ -34,18 +20,6 @@ processed with optional, configurable compilers and filters. %description %_description -%package -n python2-django-compressor -Summary: %summary -Requires: python-django-appconf >= 1.0 -Requires: python-versiontools -Requires: python-django -Requires: python2-rjsmin -Requires: python2-rcssmin -%{?python_provide:%python_provide python2-django-compressor} - -%description -n python2-django-compressor %_description - -%if 0%{?with_python3} %package -n python3-django-compressor Summary: Compresses linked and inline JavaScript or CSS into single cached files Requires: python3-versiontools @@ -57,6 +31,10 @@ Requires: python3-rcssmin BuildRequires: python3-devel BuildRequires: python3-setuptools +# 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 @@ -65,43 +43,29 @@ 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. -%endif %prep %autosetup -n django-compressor-%{version} %build -%py2_build - -%if 0%{?with_python3} %py3_build -%endif %install -%py2_install - -%if 0%{?with_python3} %py3_install -%endif -%files -n python2-django-compressor -%doc README.rst -%license LICENSE -%{python2_sitelib}/compressor -%{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info - -%if 0%{?with_python3} %files -n python3-django-compressor %doc README.rst %license LICENSE %{python3_sitelib}/compressor %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info -%endif %changelog +* 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