rpms/Django/EL-5 Django.spec,1.11,1.12

smilner smilner at fedoraproject.org
Thu Jul 30 02:18:44 UTC 2009


Author: smilner

Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1337

Modified Files:
	Django.spec 
Log Message:
Attempting to combine specs for F12/11/10 and EL5



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- Django.spec	30 Jul 2009 00:54:20 -0000	1.11
+++ Django.spec	30 Jul 2009 02:18:44 -0000	1.12
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.0.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -46,7 +46,8 @@ cd django/utils/simplejson/
 rm -rf *
 # and put the replacement stub in place
 cp -p %{SOURCE1} __init__.py
-
+echo %{?rhel}
+echo "************"
 
 %build
 %{__python} setup.py build
@@ -93,12 +94,19 @@ rm -rf $RPM_BUILD_ROOT
 %ghost %{_bindir}/django-admin.pyo
 %endif
 
+%if 0%{?rhel} <= 5
+%exclude %{_bindir}/django-admin.pyc
+%exclude %{_bindir}/django-admin.pyo
+%endif
 
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
 
 %changelog
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-5
+- Attempted combined spec for F12/11/10 and EL5
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-4
 - Older builds must ghost django-admin.py[c,o]
 




More information about the fedora-extras-commits mailing list