rpms/Django/devel Django.spec,1.22,1.23

[smilner]

Author: smilner

Update of /cvs/pkgs/rpms/Django/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv22726

Modified Files:
	Django.spec 
Log Message:
Unifed django spec (via mockbuild)



Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/devel/Django.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- Django.spec	29 Jul 2009 20:27:56 -0000	1.22
+++ Django.spec	30 Jul 2009 03:24:04 -0000	1.23
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.0.3
-Release:        2%{?dist}
+Release:        6%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -83,24 +83,41 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
 %attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
 %{python_sitelib}/django
+
 %if 0%{?fedora} >= 9
 %{python_sitelib}/*.egg-info
 %endif
 
+%if 0%{?fedora} <= 10
+%ghost %{_bindir}/django-admin.pyc
+%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-6
+- 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]
+
+* Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-3
+- Bump for tag issue.
+
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-2
 - Fix changelog.
 
 * Wed Jul 29 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.0.3-1
 - Upgrade for http://www.djangoproject.com/weblog/2009/jul/28/security/
 
-* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
 * Thu Mar 12 2009 Michel Salim <salimma at fedoraproject.org> - 1.0.2-3
 - Build HTML documentation (bug #484070)
 - No longer excluding *.py? in bindir, F11's Python does not optimizes these