Attachment 1565271 Details for Bug 1707476 – Patch for spec adding python3 support (and cleanup)

[patch] Patch for spec adding python3 support (and cleanup)

django-python3.patch (text/plain), 32.85 KB, created by Tuomo Soini on 2019-05-07 15:25:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tuomo Soini

Created: 2019-05-07 15:25:06 UTC

Size: 32.85 KB

patch

obsolete

>diff --git a/python-django.spec b/python-django.spec
>index 5a1130d..358c8f8 100644
>--- a/python-django.spec
>+++ b/python-django.spec
>@@ -1,15 +1,28 @@
>-%if 0%{?fedora} > 12
>+%if 0%{?fedora} > 12 || 0%{?rhel} > 5
> %global with_python3 1
> %else
> %global with_python3 0
> %endif
> 
>+# TODO: mrunge reenable docs build.
>+#
>+# docs build triggers some sphinx issue on epel, skipping for now
>+# build documentation
>+%global with_docs 0
>+
>+%if 0%{?fedora} > 12
>+%global with_python3_tests 1
>+%else
>+# Py3 tests disabled on epel7 because dependencies for tests are not available
>+# Actually tests are disabled for fedora too but dependencies are not removed
>+%global with_python3_tests 0
>+%endif
>+
> # Turn off the brp-python-bytecompile script
> %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
> 
> %global         pkgname Django
> 
>-
> # Tests requiring Internet connections are disabled by default
> # pass --with internet to run them (e.g. when doing a local rebuild
> # for sanity checks before committing)
>@@ -22,17 +35,13 @@
> Name:           python-django
> 
> Version:        1.11.20
>-Release:        1%{?dist}
>+Release:        2%{?dist}
> Summary:        A high-level Python Web framework
>-
>-Group:          Development/Languages
> License:        BSD
>-URL:            http://www.djangoproject.com/
>+URL:            https://www.djangoproject.com/
> Source0:        https://files.pythonhosted.org/packages/source/D/Django/Django-%{version}.tar.gz
>-
> BuildArch:      noarch
> 
>-
> %description
> Django is a high-level Python Web framework that encourages rapid
> development and a clean, pragmatic design. It focuses on automating as
>@@ -68,6 +77,9 @@ Provides:       %{pkgname} = %{version}-%{release}
> 
> Provides: bundled(jquery) = 2.2.3
> Provides: bundled(xregexp) = 2.0.0
>+%if 0%{?with_docs} == 0
>+Obsoletes: python2-django-doc < %{version}-%{release}
>+%endif
> 
> %description -n python2-django
> Django is a high-level Python Web framework that encourages rapid
>@@ -75,70 +87,67 @@ development and a clean, pragmatic design. It focuses on automating as
> much as possible and adhering to the DRY (Don't Repeat Yourself)
> principle.
> 
>-
>-
>+%if 0%{?with_docs}
> %package -n python2-django-doc
> Summary:        Documentation for Django
>-Group:          Documentation
> Requires:       %{name} = %{version}-%{release}
>-Provides:       python-django-docs = %{version}-%{release}
>-
> BuildRequires:  python-sphinx
>-
>+Provides:       python-django-docs = %{version}-%{release}
> Provides:       django-docs = %{version}-%{release}
> Provides:       %{pkgname}-docs = %{version}-%{release}
> 
> %description -n python2-django-doc
> This package contains the documentation for the Django high-level
> Python Web framework.
>-
>-
>+%endif
> 
> %package bash-completion
> Summary:        bash completion files for Django
> BuildRequires:  bash-completion
> 
>-
> %description bash-completion
> This package contains the bash completion files form Django high-level
> Python Web framework.
> 
> %if 0%{?with_python3}
>-%package -n python3-django-doc
>+%if 0%{?with_docs}
>+%package -n python%{python3_pkgversion}-django-doc
> Summary:        Documentation for Django
>-Group:          Documentation
>-Requires:       python3-django = %{version}-%{release}
>+Requires:       python%{python3_pkgversion}-django = %{version}-%{release}
> 
>-%description -n python3-django-doc
>+%description -n python%{python3_pkgversion}-django-doc
> This package contains the documentation for the Django high-level
> Python Web framework.
>+%endif
> 
>-%package -n python3-django
>+%package -n python%{python3_pkgversion}-django
> Summary:        A high-level Python Web framework
>-Group:          Development/Languages
>-
> Requires:       %{name}-bash-completion = %{version}-%{release}
>-Requires:       python3-pytz
>-
>-BuildRequires:  python3-devel
>-BuildRequires:  python3-bcrypt
>+Requires:       python%{python3_pkgversion}-pytz
>+BuildRequires:  python%{python3_pkgversion}-devel
>+BuildRequires:  python%{python3_pkgversion}-setuptools
>+BuildRequires:  python%{python3_pkgversion}-bcrypt
>+%if 0%{?with_python3_tests}
> # test requirements
>-#BuildRequires: python3-py-bcrypt
>-BuildRequires:  python3-docutils
>-BuildRequires:  python3-jinja2
>-BuildRequires:  python3-mock
>-BuildRequires:  python3-numpy
>-BuildRequires:  python3-pillow
>-BuildRequires:  python3-PyYAML
>-BuildRequires:  python3-pytz
>-BuildRequires:  python3-selenium
>-BuildRequires:  python3-sqlparse
>-BuildRequires:  python3-memcached
>-
>+#BuildRequires: python%{python3_pkgversion}-py-bcrypt
>+BuildRequires:  python%{python3_pkgversion}-docutils
>+BuildRequires:  python%{python3_pkgversion}-jinja2
>+BuildRequires:  python%{python3_pkgversion}-mock
>+BuildRequires:  python%{python3_pkgversion}-numpy
>+BuildRequires:  python%{python3_pkgversion}-pillow
>+BuildRequires:  python%{python3_pkgversion}-PyYAML
>+BuildRequires:  python%{python3_pkgversion}-pytz
>+BuildRequires:  python%{python3_pkgversion}-selenium
>+BuildRequires:  python%{python3_pkgversion}-sqlparse
>+BuildRequires:  python%{python3_pkgversion}-memcached
>+%endif
>+%if 0%{?with_docs} == 0
>+Obsoletes: python%{python3_pgkversion}-django-doc < %{version}-%{release}
>+%endif
> Provides: bundled(jquery) = 2.2.3
> Provides: bundled(xregexp) = 2.0.0
> 
>-%description -n python3-django
>+%description -n python%{python3_pkgversion}-django
> Django is a high-level Python Web framework that encourages rapid
> development and a clean, pragmatic design. It focuses on automating as
> much as possible and adhering to the DRY (Don't Repeat Yourself)
>@@ -148,7 +157,6 @@ principle.
> %prep
> %autosetup -n %{pkgname}-%{version}
> 
>-
> %build
> %py2_build
> 
>@@ -156,13 +164,13 @@ principle.
> %py3_build
> %endif # with_python3
> 
>-
> %install
> # must do install of python 3 subpackage first, so that we don't
> # overwrite django-admin script with the python 3 version
> %if 0%{?with_python3}
> %py3_install
>-mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/python3-django-admin
>+mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/python%{python3_pkgversion}-django-admin
>+ln -s python%{python3_pkgversion}-django-admin %{buildroot}%{_bindir}/python3-django-admin
> %endif # with_python3
> 
> %py2_install
>@@ -175,8 +183,7 @@ mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/python3-django-
> %if 0%{?with_python3}
> %py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
> %endif # with_python3
>-
>-%endif
>+%endif # fedora
> 
> %find_lang django
> %find_lang djangojs
>@@ -185,23 +192,24 @@ cat djangojs.lang >> django.lang
> 
> %if 0%{?with_python3}
> # When creating Python3 package, separate lang to Python 2 and Python 3 files
>-grep python3 django.lang > python3-django.lang
>+grep python%{python3_version} django.lang > python%{python3_pkgversion}-django.lang
> grep python2 django.lang > python2-django.lang
>-mv {python2-,}django.lang
>+mv python2-django.lang django.lang
> %endif # with_python3
> 
>-# TODO: mrunge reenable docs build.
>-#
>-# docs build triggers some sphinx issue on epel, skipping for now
>-# build documentation
>-#(cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
>-#cp -ar docs ..
>+%if 0%{?with_docs}
>+(cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
>+cp -ar docs ..
>+%endif # with_docs
> 
> # install man pages
> mkdir -p %{buildroot}%{_mandir}/man1/
> cp -p docs/man/* %{buildroot}%{_mandir}/man1/
> %if 0%{?with_python3}
>-cp -a %{buildroot}%{_mandir}/man1/django-admin.1 %{buildroot}%{_mandir}/man1/python3-django-admin.1
>+cp -a %{buildroot}%{_mandir}/man1/django-admin.1 %{buildroot}%{_mandir}/man1/python%{python3_pkgversion}-django-admin.1
>+%if 0%{?python3_pkgversion} > 3
>+echo ".so man1/python%{python3_pkgversion}-django-admin.1" >%{buildroot}%{_mandir}/man1/python3-django-admin.1
>+%endif # python3_pkgversion > 3
> %endif # with_python3
> 
> # install bash completion script
>@@ -210,7 +218,13 @@ mkdir -p %{buildroot}$bashcompdir
> install -m 0644 -p extras/django_bash_completion \
>   %{buildroot}$bashcompdir/django-admin.py
> 
>-for file in django-admin python3-django-admin manage.py ; do
>+for file in django-admin \
>+    python%{python3_pkgversion}-django-admin \
>+%if 0%{?python3_pkgversion} > 3
>+    python3-django-admin \
>+%endif # python3_pkgversion > 3
>+    manage.py
>+do
>    ln -s django-admin.py %{buildroot}$bashcompdir/$file
> done
> 
>@@ -232,9 +246,7 @@ cd tests
> # strange, tests on py35 fail in koji, but pass in local mock
> #{__python3} runtests.py --settings=test_sqlite --verbosity=2 --parallel 1
> %endif # with_python3
>-
>-%endif
>-
>+%endif # fedora
> 
> %files -n python2-django -f django.lang
> %doc AUTHORS README.rst
>@@ -251,85 +263,85 @@ cd tests
> %dir %{python2_sitelib}/django
> %dir %{python2_sitelib}/django/bin
> %{python2_sitelib}/django/apps
>-%{python2_sitelib}/django/db/
>+%{python2_sitelib}/django/db
> %{python2_sitelib}/django/*.py*
>-%{python2_sitelib}/django/utils/
>-%{python2_sitelib}/django/dispatch/
>-%{python2_sitelib}/django/template/
>-%{python2_sitelib}/django/views/
>-%{python2_sitelib}/django/urls/
>-%dir %{python2_sitelib}/django/conf/
>-%dir %{python2_sitelib}/django/conf/locale/
>-%dir %{python2_sitelib}/django/conf/locale/??/
>-%dir %{python2_sitelib}/django/conf/locale/??_*/
>+%{python2_sitelib}/django/utils
>+%{python2_sitelib}/django/dispatch
>+%{python2_sitelib}/django/template
>+%{python2_sitelib}/django/views
>+%{python2_sitelib}/django/urls
>+%dir %{python2_sitelib}/django/conf
>+%dir %{python2_sitelib}/django/conf/locale
>+%dir %{python2_sitelib}/django/conf/locale/??
>+%dir %{python2_sitelib}/django/conf/locale/??_*
> %dir %{python2_sitelib}/django/conf/locale/*/LC_MESSAGES
>-%dir %{python2_sitelib}/django/contrib/
>+%dir %{python2_sitelib}/django/contrib
> %{python2_sitelib}/django/contrib/*.py*
>-%dir %{python2_sitelib}/django/contrib/admin/
>+%dir %{python2_sitelib}/django/contrib/admin
> %dir %{python2_sitelib}/django/contrib/admin/locale
>-%dir %{python2_sitelib}/django/contrib/admin/locale/??/
>-%dir %{python2_sitelib}/django/contrib/admin/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/admin/locale/??
>+%dir %{python2_sitelib}/django/contrib/admin/locale/??_*
> %dir %{python2_sitelib}/django/contrib/admin/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/admin/*.py*
> %{python2_sitelib}/django/contrib/admin/migrations
>-%{python2_sitelib}/django/contrib/admin/views/
>-%{python2_sitelib}/django/contrib/admin/static/
>-%{python2_sitelib}/django/contrib/admin/templatetags/
>-%{python2_sitelib}/django/contrib/admin/templates/
>-%dir %{python2_sitelib}/django/contrib/admindocs/
>-%dir %{python2_sitelib}/django/contrib/admindocs/locale/
>-%dir %{python2_sitelib}/django/contrib/admindocs/locale/??/
>-%dir %{python2_sitelib}/django/contrib/admindocs/locale/??_*/
>+%{python2_sitelib}/django/contrib/admin/views
>+%{python2_sitelib}/django/contrib/admin/static
>+%{python2_sitelib}/django/contrib/admin/templatetags
>+%{python2_sitelib}/django/contrib/admin/templates
>+%dir %{python2_sitelib}/django/contrib/admindocs
>+%dir %{python2_sitelib}/django/contrib/admindocs/locale
>+%dir %{python2_sitelib}/django/contrib/admindocs/locale/??
>+%dir %{python2_sitelib}/django/contrib/admindocs/locale/??_*
> %dir %{python2_sitelib}/django/contrib/admindocs/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/admindocs/*.py*
>-%{python2_sitelib}/django/contrib/admindocs/templates/
>-%dir %{python2_sitelib}/django/contrib/auth/
>-%dir %{python2_sitelib}/django/contrib/auth/locale/
>-%dir %{python2_sitelib}/django/contrib/auth/locale/??/
>-%dir %{python2_sitelib}/django/contrib/auth/locale/??_*/
>+%{python2_sitelib}/django/contrib/admindocs/templates
>+%dir %{python2_sitelib}/django/contrib/auth
>+%dir %{python2_sitelib}/django/contrib/auth/locale
>+%dir %{python2_sitelib}/django/contrib/auth/locale/??
>+%dir %{python2_sitelib}/django/contrib/auth/locale/??_*
> %dir %{python2_sitelib}/django/contrib/auth/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/auth/*.py*
> %{python2_sitelib}/django/contrib/auth/common-passwords.txt.gz
>-%{python2_sitelib}/django/contrib/auth/handlers/
>-%{python2_sitelib}/django/contrib/auth/management/
>-%{python2_sitelib}/django/contrib/auth/migrations/
>-%{python2_sitelib}/django/contrib/auth/templates/
>-%{python2_sitelib}/django/contrib/auth/tests/
>-%dir %{python2_sitelib}/django/contrib/contenttypes/
>+%{python2_sitelib}/django/contrib/auth/handlers
>+%{python2_sitelib}/django/contrib/auth/management
>+%{python2_sitelib}/django/contrib/auth/migrations
>+%{python2_sitelib}/django/contrib/auth/templates
>+%{python2_sitelib}/django/contrib/auth/tests
>+%dir %{python2_sitelib}/django/contrib/contenttypes
> %dir %{python2_sitelib}/django/contrib/contenttypes/locale
>-%dir %{python2_sitelib}/django/contrib/contenttypes/locale/??/
>-%dir %{python2_sitelib}/django/contrib/contenttypes/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/contenttypes/locale/??
>+%dir %{python2_sitelib}/django/contrib/contenttypes/locale/??_*
> %dir %{python2_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/contenttypes/management
> %{python2_sitelib}/django/contrib/contenttypes/migrations
> %{python2_sitelib}/django/contrib/contenttypes/*.py*
>-%dir %{python2_sitelib}/django/contrib/flatpages/
>-%dir %{python2_sitelib}/django/contrib/flatpages/locale/
>-%dir %{python2_sitelib}/django/contrib/flatpages/locale/??/
>-%dir %{python2_sitelib}/django/contrib/flatpages/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/flatpages
>+%dir %{python2_sitelib}/django/contrib/flatpages/locale
>+%dir %{python2_sitelib}/django/contrib/flatpages/locale/??
>+%dir %{python2_sitelib}/django/contrib/flatpages/locale/??_*
> %dir %{python2_sitelib}/django/contrib/flatpages/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/flatpages/*.py*
>-%{python2_sitelib}/django/contrib/flatpages/migrations/
>+%{python2_sitelib}/django/contrib/flatpages/migrations
> %{python2_sitelib}/django/contrib/flatpages/templatetags
>-%dir %{python2_sitelib}/django/contrib/gis/
>-%dir %{python2_sitelib}/django/contrib/gis/locale/
>-%dir %{python2_sitelib}/django/contrib/gis/locale/??/
>-%dir %{python2_sitelib}/django/contrib/gis/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/gis
>+%dir %{python2_sitelib}/django/contrib/gis/locale
>+%dir %{python2_sitelib}/django/contrib/gis/locale/??
>+%dir %{python2_sitelib}/django/contrib/gis/locale/??_*
> %dir %{python2_sitelib}/django/contrib/gis/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/gis/*.py*
>-%{python2_sitelib}/django/contrib/gis/geoip/
>-%{python2_sitelib}/django/contrib/gis/geoip2/
>-%{python2_sitelib}/django/contrib/gis/serializers/
>+%{python2_sitelib}/django/contrib/gis/geoip
>+%{python2_sitelib}/django/contrib/gis/geoip2
>+%{python2_sitelib}/django/contrib/gis/serializers
> %{python2_sitelib}/django/contrib/gis/static
>-%dir %{python2_sitelib}/django/contrib/humanize/
>-%dir %{python2_sitelib}/django/contrib/humanize/locale/
>-%dir %{python2_sitelib}/django/contrib/humanize/locale/??/
>-%dir %{python2_sitelib}/django/contrib/humanize/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/humanize
>+%dir %{python2_sitelib}/django/contrib/humanize/locale
>+%dir %{python2_sitelib}/django/contrib/humanize/locale/??
>+%dir %{python2_sitelib}/django/contrib/humanize/locale/??_*
> %dir %{python2_sitelib}/django/contrib/humanize/locale/*/LC_MESSAGES
>-%{python2_sitelib}/django/contrib/humanize/templatetags/
>+%{python2_sitelib}/django/contrib/humanize/templatetags
> %{python2_sitelib}/django/contrib/humanize/*.py*
> %{python2_sitelib}/django/contrib/messages/*.py*
>-%dir %{python2_sitelib}/django/contrib/postgres/
>+%dir %{python2_sitelib}/django/contrib/postgres
> %{python2_sitelib}/django/contrib/postgres/*.py*
> %{python2_sitelib}/django/contrib/postgres/aggregates
> %{python2_sitelib}/django/contrib/postgres/jinja2
>@@ -338,158 +350,166 @@ cd tests
> %{python2_sitelib}/django/contrib/postgres/templates
> %dir %{python2_sitelib}/django/contrib/redirects
> %dir %{python2_sitelib}/django/contrib/redirects/locale
>-%dir %{python2_sitelib}/django/contrib/redirects/locale/??/
>-%dir %{python2_sitelib}/django/contrib/redirects/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/redirects/locale/??
>+%dir %{python2_sitelib}/django/contrib/redirects/locale/??_*
> %dir %{python2_sitelib}/django/contrib/redirects/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/redirects/*.py*
> %{python2_sitelib}/django/contrib/redirects/migrations
>-%dir %{python2_sitelib}/django/contrib/sessions/
>-%dir %{python2_sitelib}/django/contrib/sessions/locale/
>-%dir %{python2_sitelib}/django/contrib/sessions/locale/??/
>-%dir %{python2_sitelib}/django/contrib/sessions/locale/??_*/
>+%dir %{python2_sitelib}/django/contrib/sessions
>+%dir %{python2_sitelib}/django/contrib/sessions/locale
>+%dir %{python2_sitelib}/django/contrib/sessions/locale/??
>+%dir %{python2_sitelib}/django/contrib/sessions/locale/??_*
> %dir %{python2_sitelib}/django/contrib/sessions/locale/*/LC_MESSAGES
>-%{python2_sitelib}/django/contrib/sessions/management/
>-%{python2_sitelib}/django/contrib/sessions/migrations/
>+%{python2_sitelib}/django/contrib/sessions/management
>+%{python2_sitelib}/django/contrib/sessions/migrations
> %{python2_sitelib}/django/contrib/sessions/*.py*
>-%{python2_sitelib}/django/contrib/sitemaps/
>-%dir %{python2_sitelib}/django/contrib/sites/
>-%dir %{python2_sitelib}/django/contrib/sites/locale/
>-%dir %{python2_sitelib}/django/contrib/sites/locale/??/
>-%dir %{python2_sitelib}/django/contrib/sites/locale/??_*/
>+%{python2_sitelib}/django/contrib/sitemaps
>+%dir %{python2_sitelib}/django/contrib/sites
>+%dir %{python2_sitelib}/django/contrib/sites/locale
>+%dir %{python2_sitelib}/django/contrib/sites/locale/??
>+%dir %{python2_sitelib}/django/contrib/sites/locale/??_*
> %dir %{python2_sitelib}/django/contrib/sites/locale/*/LC_MESSAGES
> %{python2_sitelib}/django/contrib/sites/*.py*
> %{python2_sitelib}/django/contrib/sites/migrations
>-%{python2_sitelib}/django/contrib/staticfiles/
>-%{python2_sitelib}/django/contrib/syndication/
>-%{python2_sitelib}/django/contrib/gis/admin/
>-%{python2_sitelib}/django/contrib/gis/db/
>-%{python2_sitelib}/django/contrib/gis/forms/
>-%{python2_sitelib}/django/contrib/gis/gdal/
>-%{python2_sitelib}/django/contrib/gis/geometry/
>-%{python2_sitelib}/django/contrib/gis/geos/
>-%{python2_sitelib}/django/contrib/gis/management/
>-%{python2_sitelib}/django/contrib/gis/sitemaps/
>-%{python2_sitelib}/django/contrib/gis/static/gis/js/OLMapWidget.js
>-%{python2_sitelib}/django/contrib/gis/templates/
>-%{python2_sitelib}/django/contrib/gis/utils/
>-%{python2_sitelib}/django/contrib/messages/storage/
>-%{python2_sitelib}/django/contrib/sessions/backends/
>-%{python2_sitelib}/django/forms/
>-%{python2_sitelib}/django/templatetags/
>-%{python2_sitelib}/django/core/
>-%{python2_sitelib}/django/http/
>-%{python2_sitelib}/django/middleware/
>-%{python2_sitelib}/django/test/
>+%{python2_sitelib}/django/contrib/staticfiles
>+%{python2_sitelib}/django/contrib/syndication
>+%{python2_sitelib}/django/contrib/gis/admin
>+%{python2_sitelib}/django/contrib/gis/db
>+%{python2_sitelib}/django/contrib/gis/forms
>+%{python2_sitelib}/django/contrib/gis/gdal
>+%{python2_sitelib}/django/contrib/gis/geometry
>+%{python2_sitelib}/django/contrib/gis/geos
>+%{python2_sitelib}/django/contrib/gis/management
>+%{python2_sitelib}/django/contrib/gis/sitemaps
>+%{python2_sitelib}/django/contrib/gis/templates
>+%{python2_sitelib}/django/contrib/gis/utils
>+%{python2_sitelib}/django/contrib/messages/storage
>+%{python2_sitelib}/django/contrib/sessions/backends
>+%{python2_sitelib}/django/forms
>+%{python2_sitelib}/django/templatetags
>+%{python2_sitelib}/django/core
>+%{python2_sitelib}/django/http
>+%{python2_sitelib}/django/middleware
>+%{python2_sitelib}/django/test
> %{python2_sitelib}/django/conf/*.py*
>-%{python2_sitelib}/django/conf/project_template/
>-%{python2_sitelib}/django/conf/app_template/
>-%{python2_sitelib}/django/conf/urls/
>+%{python2_sitelib}/django/conf/project_template
>+%{python2_sitelib}/django/conf/app_template
>+%{python2_sitelib}/django/conf/urls
> %{python2_sitelib}/django/conf/locale/*/*.py*
> %{python2_sitelib}/django/conf/locale/*.py*
>-
> %{python2_sitelib}/*.egg-info
> 
>+%if 0%{?with_docs}
> %files -n python2-django-doc
>-# %doc docs/_build/html/*
>+%doc docs/_build/html/*
>+%endif # with_docs
> 
> %files bash-completion
> %{_datadir}/bash-completion
> 
> %if 0%{?with_python3}
>-%files -n python3-django-doc
>+%if 0%{?with_docs}
>+%files -n python%{python3_pkgversion}-django-doc
> # %doc docs/_build/html/*
>+%endif # with_docs
> 
>-%files -n python3-django -f python3-django.lang
>+%files -n python%{python3_pkgversion}-django -f python%{python3_pkgversion}-django.lang
> %doc AUTHORS README.rst
> %license LICENSE
>+%if 0%{?python3_pkgversion} > 3
> %{_bindir}/python3-django-admin
>+%endif
>+%{_bindir}/python%{python3_pkgversion}-django-admin
> # as said before, manpages are owned by both python2 and python3 packages
> %exclude %{_mandir}/man1/django-admin.1*
>-%{_mandir}/man1/python3-django-admin.1.*
>+%{_mandir}/man1/python%{python3_pkgversion}-django-admin.1*
>+%if 0%{?python3_pkgversion} > 3
>+%{_mandir}/man1/python3-django-admin.1*
>+%endif
> %attr(0755,root,root) %{python3_sitelib}/django/bin/django-admin.py*
> # Include everything but the locale data ...
> %dir %{python3_sitelib}/django
> %dir %{python3_sitelib}/django/bin
> %{python3_sitelib}/django/apps
>-%{python3_sitelib}/django/db/
>+%{python3_sitelib}/django/db
> %{python3_sitelib}/django/*.py*
>-%{python3_sitelib}/django/utils/
>-%{python3_sitelib}/django/dispatch/
>-%{python3_sitelib}/django/template/
>-%{python3_sitelib}/django/urls/
>-%{python3_sitelib}/django/views/
>-%dir %{python3_sitelib}/django/conf/
>-%dir %{python3_sitelib}/django/conf/locale/
>-%dir %{python3_sitelib}/django/conf/locale/??/
>-%dir %{python3_sitelib}/django/conf/locale/??_*/
>+%{python3_sitelib}/django/utils
>+%{python3_sitelib}/django/dispatch
>+%{python3_sitelib}/django/template
>+%{python3_sitelib}/django/urls
>+%{python3_sitelib}/django/views
>+%dir %{python3_sitelib}/django/conf
>+%dir %{python3_sitelib}/django/conf/locale
>+%dir %{python3_sitelib}/django/conf/locale/??
>+%dir %{python3_sitelib}/django/conf/locale/??_*
> %dir %{python3_sitelib}/django/conf/locale/*/LC_MESSAGES
>-%dir %{python3_sitelib}/django/contrib/
>+%dir %{python3_sitelib}/django/contrib
> %{python3_sitelib}/django/contrib/*.py*
>-%dir %{python3_sitelib}/django/contrib/admin/
>+%dir %{python3_sitelib}/django/contrib/admin
> %dir %{python3_sitelib}/django/contrib/admin/locale
>-%dir %{python3_sitelib}/django/contrib/admin/locale/??/
>-%dir %{python3_sitelib}/django/contrib/admin/locale/??_*/
>+%dir %{python3_sitelib}/django/contrib/admin/locale/??
>+%dir %{python3_sitelib}/django/contrib/admin/locale/??_*
> %dir %{python3_sitelib}/django/contrib/admin/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/admin/*.py*
> %{python3_sitelib}/django/contrib/admin/migrations
>-%{python3_sitelib}/django/contrib/admin/views/
>-%{python3_sitelib}/django/contrib/admin/static/
>-%{python3_sitelib}/django/contrib/admin/templatetags/
>-%{python3_sitelib}/django/contrib/admin/templates/
>-%dir %{python3_sitelib}/django/contrib/admindocs/
>-%dir %{python3_sitelib}/django/contrib/admindocs/locale/
>-%dir %{python3_sitelib}/django/contrib/admindocs/locale/??/
>-%dir %{python3_sitelib}/django/contrib/admindocs/locale/??_*/
>+%{python3_sitelib}/django/contrib/admin/views
>+%{python3_sitelib}/django/contrib/admin/static
>+%{python3_sitelib}/django/contrib/admin/templatetags
>+%{python3_sitelib}/django/contrib/admin/templates
>+%dir %{python3_sitelib}/django/contrib/admindocs
>+%dir %{python3_sitelib}/django/contrib/admindocs/locale
>+%dir %{python3_sitelib}/django/contrib/admindocs/locale/??
>+%dir %{python3_sitelib}/django/contrib/admindocs/locale/??_*
> %dir %{python3_sitelib}/django/contrib/admindocs/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/admindocs/*.py*
>-%{python3_sitelib}/django/contrib/admindocs/templates/
>-%dir %{python3_sitelib}/django/contrib/auth/
>-%dir %{python3_sitelib}/django/contrib/auth/locale/
>-%dir %{python3_sitelib}/django/contrib/auth/locale/??/
>-%dir %{python3_sitelib}/django/contrib/auth/locale/??_*/
>+%{python3_sitelib}/django/contrib/admindocs/templates
>+%dir %{python3_sitelib}/django/contrib/auth
>+%dir %{python3_sitelib}/django/contrib/auth/locale
>+%dir %{python3_sitelib}/django/contrib/auth/locale/??
>+%dir %{python3_sitelib}/django/contrib/auth/locale/??_*
> %dir %{python3_sitelib}/django/contrib/auth/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/auth/*.py*
> %{python3_sitelib}/django/contrib/auth/common-passwords.txt.gz
>-%{python3_sitelib}/django/contrib/auth/handlers/
>-%{python3_sitelib}/django/contrib/auth/management/
>-%{python3_sitelib}/django/contrib/auth/migrations/
>-%{python3_sitelib}/django/contrib/auth/templates/
>-%{python3_sitelib}/django/contrib/auth/tests/
>-%dir %{python3_sitelib}/django/contrib/contenttypes/
>+%{python3_sitelib}/django/contrib/auth/handlers
>+%{python3_sitelib}/django/contrib/auth/management
>+%{python3_sitelib}/django/contrib/auth/migrations
>+%{python3_sitelib}/django/contrib/auth/templates
>+%{python3_sitelib}/django/contrib/auth/tests
>+%dir %{python3_sitelib}/django/contrib/contenttypes
> %dir %{python3_sitelib}/django/contrib/contenttypes/locale
>-%dir %{python3_sitelib}/django/contrib/contenttypes/locale/??/
>-%dir %{python3_sitelib}/django/contrib/contenttypes/locale/??_*/
>+%dir %{python3_sitelib}/django/contrib/contenttypes/locale/??
>+%dir %{python3_sitelib}/django/contrib/contenttypes/locale/??_*
> %dir %{python3_sitelib}/django/contrib/contenttypes/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/contenttypes/*.py*
> %{python3_sitelib}/django/contrib/contenttypes/__pycache__
>-%{python3_sitelib}/django/contrib/contenttypes/management/
>-%{python3_sitelib}/django/contrib/contenttypes/migrations/
>-%dir %{python3_sitelib}/django/contrib/flatpages/
>-%dir %{python3_sitelib}/django/contrib/flatpages/locale/
>-%dir %{python3_sitelib}/django/contrib/flatpages/locale/??/
>-%dir %{python3_sitelib}/django/contrib/flatpages/locale/??_*/
>+%{python3_sitelib}/django/contrib/contenttypes/management
>+%{python3_sitelib}/django/contrib/contenttypes/migrations
>+%dir %{python3_sitelib}/django/contrib/flatpages
>+%dir %{python3_sitelib}/django/contrib/flatpages/locale
>+%dir %{python3_sitelib}/django/contrib/flatpages/locale/??
>+%dir %{python3_sitelib}/django/contrib/flatpages/locale/??_*
> %dir %{python3_sitelib}/django/contrib/flatpages/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/flatpages/*.py*
> %{python3_sitelib}/django/contrib/flatpages/migrations
> %{python3_sitelib}/django/contrib/flatpages/templatetags
>-%dir %{python3_sitelib}/django/contrib/gis/
>-%dir %{python3_sitelib}/django/contrib/gis/locale/
>-%dir %{python3_sitelib}/django/contrib/gis/locale/??/
>-%dir %{python3_sitelib}/django/contrib/gis/locale/??_*/
>+%dir %{python3_sitelib}/django/contrib/gis
>+%dir %{python3_sitelib}/django/contrib/gis/locale
>+%dir %{python3_sitelib}/django/contrib/gis/locale/??
>+%dir %{python3_sitelib}/django/contrib/gis/locale/??_*
> %dir %{python3_sitelib}/django/contrib/gis/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/gis/*.py*
>-%{python3_sitelib}/django/contrib/gis/geoip/
>-%{python3_sitelib}/django/contrib/gis/geoip2/
>-%{python3_sitelib}/django/contrib/gis/serializers/
>-%{python3_sitelib}/django/contrib/gis/static/
>-%dir %{python3_sitelib}/django/contrib/humanize/
>-%dir %{python3_sitelib}/django/contrib/humanize/locale/
>-%dir %{python3_sitelib}/django/contrib/humanize/locale/??/
>-%dir %{python3_sitelib}/django/contrib/humanize/locale/??_*/
>+%{python3_sitelib}/django/contrib/gis/geoip
>+%{python3_sitelib}/django/contrib/gis/geoip2
>+%{python3_sitelib}/django/contrib/gis/serializers
>+%{python3_sitelib}/django/contrib/gis/static
>+%dir %{python3_sitelib}/django/contrib/humanize
>+%dir %{python3_sitelib}/django/contrib/humanize/locale
>+%dir %{python3_sitelib}/django/contrib/humanize/locale/??
>+%dir %{python3_sitelib}/django/contrib/humanize/locale/??_*
> %dir %{python3_sitelib}/django/contrib/humanize/locale/*/LC_MESSAGES
>-%{python3_sitelib}/django/contrib/humanize/templatetags/
>+%{python3_sitelib}/django/contrib/humanize/templatetags
> %{python3_sitelib}/django/contrib/humanize/*.py*
>-%dir %{python3_sitelib}/django/contrib/messages/
>+%dir %{python3_sitelib}/django/contrib/messages
> %{python3_sitelib}/django/contrib/messages/*.py*
> %dir %{python3_sitelib}/django/contrib/postgres
> %{python3_sitelib}/django/contrib/postgres/*.py*
>@@ -501,52 +521,51 @@ cd tests
> %{python3_sitelib}/django/contrib/postgres/__pycache__
> %dir %{python3_sitelib}/django/contrib/redirects
> %dir %{python3_sitelib}/django/contrib/redirects/locale
>-%dir %{python3_sitelib}/django/contrib/redirects/locale/??/
>-%dir %{python3_sitelib}/django/contrib/redirects/locale/??_*/
>+%dir %{python3_sitelib}/django/contrib/redirects/locale/??
>+%dir %{python3_sitelib}/django/contrib/redirects/locale/??_*
> %dir %{python3_sitelib}/django/contrib/redirects/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/redirects/*.py*
> %{python3_sitelib}/django/contrib/redirects/migrations
>-%dir %{python3_sitelib}/django/contrib/sessions/
>-%dir %{python3_sitelib}/django/contrib/sessions/locale/
>-%dir %{python3_sitelib}/django/contrib/sessions/locale/??/
>-%dir %{python3_sitelib}/django/contrib/sessions/locale/??_*/
>+%dir %{python3_sitelib}/django/contrib/sessions
>+%dir %{python3_sitelib}/django/contrib/sessions/locale
>+%dir %{python3_sitelib}/django/contrib/sessions/locale/??
>+%dir %{python3_sitelib}/django/contrib/sessions/locale/??_*
> %dir %{python3_sitelib}/django/contrib/sessions/locale/*/LC_MESSAGES
>-%{python3_sitelib}/django/contrib/sessions/management/
>-%{python3_sitelib}/django/contrib/sessions/migrations/
>+%{python3_sitelib}/django/contrib/sessions/management
>+%{python3_sitelib}/django/contrib/sessions/migrations
> %{python3_sitelib}/django/contrib/sessions/*.py*
>-%{python3_sitelib}/django/contrib/sitemaps/
>-%dir %{python3_sitelib}/django/contrib/sites/
>-%dir %{python3_sitelib}/django/contrib/sites/locale/
>-%dir %{python3_sitelib}/django/contrib/sites/locale/??/
>-%dir %{python3_sitelib}/django/contrib/sites/locale/??_*/
>+%{python3_sitelib}/django/contrib/sitemaps
>+%dir %{python3_sitelib}/django/contrib/sites
>+%dir %{python3_sitelib}/django/contrib/sites/locale
>+%dir %{python3_sitelib}/django/contrib/sites/locale/??
>+%dir %{python3_sitelib}/django/contrib/sites/locale/??_*
> %dir %{python3_sitelib}/django/contrib/sites/locale/*/LC_MESSAGES
> %{python3_sitelib}/django/contrib/sites/*.py*
> %{python3_sitelib}/django/contrib/sites/migrations
>-%{python3_sitelib}/django/contrib/staticfiles/
>-%{python3_sitelib}/django/contrib/syndication/
>-%{python3_sitelib}/django/contrib/gis/admin/
>-%{python3_sitelib}/django/contrib/gis/db/
>-%{python3_sitelib}/django/contrib/gis/forms/
>-%{python3_sitelib}/django/contrib/gis/gdal/
>-%{python3_sitelib}/django/contrib/gis/geometry/
>-%{python3_sitelib}/django/contrib/gis/geos/
>-%{python3_sitelib}/django/contrib/gis/management/
>-%{python3_sitelib}/django/contrib/gis/sitemaps/
>-%{python3_sitelib}/django/contrib/gis/static/gis/js/OLMapWidget.js
>-%{python3_sitelib}/django/contrib/gis/templates/
>-%{python3_sitelib}/django/contrib/gis/utils/
>-%{python3_sitelib}/django/contrib/messages/storage/
>-%{python3_sitelib}/django/contrib/sessions/backends/
>-%{python3_sitelib}/django/forms/
>-%{python3_sitelib}/django/templatetags/
>-%{python3_sitelib}/django/core/
>-%{python3_sitelib}/django/http/
>-%{python3_sitelib}/django/middleware/
>-%{python3_sitelib}/django/test/
>+%{python3_sitelib}/django/contrib/staticfiles
>+%{python3_sitelib}/django/contrib/syndication
>+%{python3_sitelib}/django/contrib/gis/admin
>+%{python3_sitelib}/django/contrib/gis/db
>+%{python3_sitelib}/django/contrib/gis/forms
>+%{python3_sitelib}/django/contrib/gis/gdal
>+%{python3_sitelib}/django/contrib/gis/geometry
>+%{python3_sitelib}/django/contrib/gis/geos
>+%{python3_sitelib}/django/contrib/gis/management
>+%{python3_sitelib}/django/contrib/gis/sitemaps
>+%{python3_sitelib}/django/contrib/gis/templates
>+%{python3_sitelib}/django/contrib/gis/utils
>+%{python3_sitelib}/django/contrib/messages/storage
>+%{python3_sitelib}/django/contrib/sessions/backends
>+%{python3_sitelib}/django/forms
>+%{python3_sitelib}/django/templatetags
>+%{python3_sitelib}/django/core
>+%{python3_sitelib}/django/http
>+%{python3_sitelib}/django/middleware
>+%{python3_sitelib}/django/test
> %{python3_sitelib}/django/conf/*.py*
>-%{python3_sitelib}/django/conf/project_template/
>-%{python3_sitelib}/django/conf/app_template/
>-%{python3_sitelib}/django/conf/urls/
>+%{python3_sitelib}/django/conf/project_template
>+%{python3_sitelib}/django/conf/app_template
>+%{python3_sitelib}/django/conf/urls
> %{python3_sitelib}/django/conf/locale/*/*.py*
> %{python3_sitelib}/django/conf/locale/*.py*
> %{python3_sitelib}/%{pkgname}-%{version}-py%{python3_version}.egg-info
>@@ -567,11 +586,24 @@ cd tests
> %{python3_sitelib}/django/contrib/sites/__pycache__
> %endif
> 
>-
> %changelog
>+* Wed Mar 13 2019 Tuomo Soini <tis@foobar.fi> - 1.11.20-2
>+- Rebuild for python3 version update from 34 to 36
>+
> * Wed Feb 20 2019 Matthias Runge <mrunge@redhat.com> - 1.11.20-1
> - Fix for CVE-2019-6975 (rhbz#1678265)
> 
>+* Mon Jan 14 2019 Tuomo Soini <tis@foobar.fi> - 1.11.18-3
>+- Update URI to use https
>+- Don't build docs packages when docs are not build
>+- Properly obsolete old versions of docs when docs build is disabled
>+
>+* Mon Jan 14 2019 Tuomo Soini <tis@foobar.fi> - 1.11.18-2
>+- Fix python3 version of docs not to build
>+
>+* Fri Jan 11 2019 Tuomo Soini <tis@foobar.fi> - 1.11.18-1
>+- Rebuild with python3
>+
> * Mon Jan 07 2019 Matthias Runge <mrunge@redhat.com> - 1.11.18-1
> - update to 1.11.18, fix for CVE-2019-3498 (rhbz#1663724)
>

Actions: View | Diff

Attachments on bug 1707476: 1565271