[packages/python-django] fix "django-admin" global alias

glen glen at pld-linux.org
Mon Jun 27 23:53:25 CEST 2016


commit 0b2875fced032bf543182f5d5345771f3f5c9d01
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Tue Jun 28 00:29:35 2016 +0300

    fix "django-admin" global alias
    
    this needs to be done after both Python versions are installed
    otherwise file contents would be overwritten via symlink

 python-django.spec | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index 2628bb5..59cab33 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -91,8 +91,6 @@ rm -rf $RPM_BUILD_ROOT
 find $RPM_BUILD_ROOT%{py_sitescriptdir} -type f -path '*_template*' -a -name '*.py[oc]' | xargs rm
 
 mv $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py2-django-admin}
-# default to python2 if built
-ln -sf py2-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
 %endif
 
 %if %{with python3}
@@ -100,8 +98,17 @@ ln -sf py2-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
 find $RPM_BUILD_ROOT%{py3_sitescriptdir}/django/conf/*_template -name __pycache__ | xargs rm -r
 
 mv $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py3-django-admin}
-%if %{without python2}
+%endif
+
+# setup "django-admin" global alias
+# this needs to be done after both Python versions are installed
+# otherwise file contents would be overwritten via symlink
+%if %{with python2}
+# default to python2 if built
+ln -sf py2-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
 # default to python2 if built
+%else
+%if %{with python3}
 ln -sf py3-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
 %endif
 %endif
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-django.git/commitdiff/795498e114f2e8c46fefba1888760caf6de515ff



More information about the pld-cvs-commit mailing list