[packages/python-django] package only one django-admin script

glen glen at pld-linux.org
Mon Jun 27 22:53:03 CEST 2016


commit 9749628d18e834595c60a7045e6c7e15f5ff6c02
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Mon Jun 27 23:52:47 2016 +0300

    package only one django-admin script

 python-django.spec | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/python-django.spec b/python-django.spec
index 8be0de3..e586930 100644
--- a/python-django.spec
+++ b/python-django.spec
@@ -86,15 +86,17 @@ install -d $RPM_BUILD_ROOT%{_docdir}
 
 %if %{with python2}
 %py_install
-cp $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py2-django-admin}
+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}
 %py3_install
-cp $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py3-django-admin}
-%if %{with python2}
+mv $RPM_BUILD_ROOT%{_bindir}/{django-admin.py,py3-django-admin}
+%if %{without python2}
 # default to python2 if built
-cp $RPM_BUILD_ROOT%{_bindir}/{py2-django-admin,django-admin.py}
+ln -sf py3-django-admin $RPM_BUILD_ROOT%{_bindir}/django-admin
 %endif
 %endif
 
@@ -123,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.rst
-%attr(755,root,root) %{_bindir}/django-admin.py
+%attr(755,root,root) %{_bindir}/django-admin
 %attr(755,root,root) %{_bindir}/py2-django-admin
 %{py_sitescriptdir}/%{module}*
 %{py_sitescriptdir}/Django-*.egg-info
@@ -134,7 +136,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc README.rst
 %if %{without python2}
-%attr(755,root,root) %{_bindir}/django-admin.py
+%attr(755,root,root) %{_bindir}/django-admin
 %endif
 %attr(755,root,root) %{_bindir}/py3-django-admin
 %{py3_sitescriptdir}/%{module}*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-django.git/commitdiff/9749628d18e834595c60a7045e6c7e15f5ff6c02



More information about the pld-cvs-commit mailing list