[python-django] update to 1.8.c1 (release candidate)
Matthias Runge
mrunge at fedoraproject.org
Mon Mar 23 12:26:47 UTC 2015
commit 44a561e3d47f1f5d3bbcd463eb2ceec96b1c3ef7
Author: Matthias Runge <mrunge at redhat.com>
Date: Mon Mar 23 13:26:27 2015 +0100
update to 1.8.c1 (release candidate)
.gitignore | 1 +
python-django.spec | 55 ++++++++++++++++++++++++++++++++----------------------
sources | 2 +-
3 files changed, 35 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8a8cfe6..c04faf3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@
/Django-1.7.3.tar.gz
/Django-1.8b1.tar.gz
/Django-1.8b2.tar.gz
+/Django-1.8c1.tar.gz
diff --git a/python-django.spec b/python-django.spec
index e2b591f..c514d12 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -15,7 +15,7 @@
%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g')
%global pkgname Django
-%global prerelease b2
+%global prerelease c1
# Tests requiring Internet connections are disabled by default
# pass --with internet to run them (e.g. when doing a local rebuild
@@ -29,7 +29,7 @@
Name: python-django
Version: 1.8
-Release: 0.6.%{prerelease}%{?dist}
+Release: 0.7.%{prerelease}%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -133,7 +133,15 @@ principle.
%endif
%prep
-%setup -q -n %{pkgname}-%{version}%{prerelease}
+#%setup -q -n %{pkgname}-%{version}%{prerelease}
+%setup -qc
+
+mv django-%{version}%{prerelease} python2
+pushd python2
+
+# copy LICENSE etc. to top level dir
+cp -a LICENSE ..
+cp -a README.rst AUTHORS ..
# remove bundled egg-info
rm -rf Django.egg-info
@@ -148,17 +156,20 @@ for f in \
; do
echo "# just a comment" > $f
done
+popd
%if 0%{?with_python3}
-cp -a . %{py3dir}
+cp -a python2 python3
%endif
%build
+pushd python2
%{__python} setup.py build
+popd
%if 0%{?with_python3}
-pushd %{py3dir}
+pushd python3
%{__python3} setup.py build
popd
%endif # with_python3
@@ -168,12 +179,13 @@ popd
# 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}
-pushd %{py3dir}
+pushd python3
%{__python3} setup.py install --skip-build --root %{buildroot}
mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/python3-django-admin
popd
%endif # with_python3
+pushd python2
%{__python} setup.py install --skip-build --root %{buildroot}
# Manually invoke the python byte compile macro for each path that needs byte
@@ -184,6 +196,7 @@ popd
%py_byte_compile %{__python3} %{buildroot}%{python3_sitelib}
%endif # with_python3
+popd
%find_lang django
%find_lang djangojs
# append djangojs.lang to django.lang
@@ -196,12 +209,10 @@ grep python2 django.lang > python2-django.lang
mv {python2-,}django.lang
%endif # with_python3
+pushd python2
# build documentation
-%if 0%{?rhel} == 6
-export SPHINXBUILD=sphinx-1.0-build
-%endif
(cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
-
+cp -ar docs ..
# install man pages
mkdir -p %{buildroot}%{_mandir}/man1/
@@ -219,6 +230,7 @@ install -m 0644 -p extras/django_bash_completion \
for file in django-admin python3-django-admin manage.py ; do
ln -s django-admin.py %{buildroot}$bashcompdir/$file
done
+popd
# Fix items in %%{_bindir}
mv %{buildroot}%{_bindir}/django-admin.py %{buildroot}%{_bindir}/django-admin
@@ -228,14 +240,16 @@ find $RPM_BUILD_ROOT -name "*.po" | xargs rm -f
# checks failing in f21. need to examinate
%check
+pushd python2
export PYTHONPATH=$(pwd)
export LANG=en_US.utf8
cd tests
./runtests.py --settings=test_sqlite --verbosity=2
+popd
%if 0%{?with_python3}
-pushd %{py3dir}
-export PYTHONPATH=%{py3dir}
+pushd python3
+export PYTHONPATH=$(pwd)
cd tests
%{__python3} runtests.py --settings=test_sqlite --verbosity=2
popd
@@ -330,11 +344,6 @@ popd
%dir %{python_sitelib}/django/contrib/humanize/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/humanize/templatetags/
%{python_sitelib}/django/contrib/humanize/*.py*
-%dir %{python_sitelib}/django/contrib/messages/
-%dir %{python_sitelib}/django/contrib/messages/locale
-%dir %{python_sitelib}/django/contrib/messages/locale/??/
-%dir %{python_sitelib}/django/contrib/messages/locale/??_*/
-%dir %{python_sitelib}/django/contrib/messages/locale/*/LC_MESSAGES
%{python_sitelib}/django/contrib/messages/*.py*
%dir %{python_sitelib}/django/contrib/postgres/
%{python_sitelib}/django/contrib/postgres/*.py*
@@ -492,10 +501,6 @@ popd
%{python3_sitelib}/django/contrib/humanize/templatetags/
%{python3_sitelib}/django/contrib/humanize/*.py*
%dir %{python3_sitelib}/django/contrib/messages/
-%dir %{python3_sitelib}/django/contrib/messages/locale
-%dir %{python3_sitelib}/django/contrib/messages/locale/??/
-%dir %{python3_sitelib}/django/contrib/messages/locale/??_*/
-%dir %{python3_sitelib}/django/contrib/messages/locale/*/LC_MESSAGES
%{python3_sitelib}/django/contrib/messages/*.py*
%dir %{python3_sitelib}/django/contrib/postgres
%{python3_sitelib}/django/contrib/postgres/*.py*
@@ -554,7 +559,7 @@ popd
%{python3_sitelib}/django/conf/urls/
%{python3_sitelib}/django/conf/locale/*/*.py*
%{python3_sitelib}/django/conf/locale/*.py*
-%{python3_sitelib}/%{pkgname}-%{version}%{prerelease}-py3.?.egg-info
+%{python3_sitelib}/%{pkgname}-%{version}rc1-py%{python3_version}.egg-info
%{python3_sitelib}/django/__pycache__
%{python3_sitelib}/django/bin/__pycache__
%{python3_sitelib}/django/conf/__pycache__
@@ -574,6 +579,12 @@ popd
%changelog
+* Mon Mar 23 2015 Matthias Runge <mrunge at redhat.com> - 1.8.0.7.c1
+- modernize spec for python3
+- 1.8c1 snapshot
+- fix for CVE-2015-2316 (rhbz#1203614)
+- fix for CVE-2015-2317 (rhbz#1203616)
+
* Tue Mar 10 2015 Matthias Runge <mrunge at redhat.com> - 1.8.0.6.b2
- 1.8b2 snapshot and security fix
diff --git a/sources b/sources
index 06c3bb0..3bcf328 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-171f5f7f7cae5885f0125fe2deddd2f8 Django-1.8b2.tar.gz
+e33847fbe1d325ed4f8586daba72e6a9 Django-1.8c1.tar.gz
More information about the scm-commits
mailing list