rpms/Django/EL-5 Django.spec,1.14,1.15

smilner smilner at fedoraproject.org
Wed Aug 26 22:36:26 UTC 2009


Author: smilner

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

Modified Files:
	Django.spec 
Log Message:
tested in devel and el4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- Django.spec	16 Aug 2009 01:54:40 -0000	1.14
+++ Django.spec	26 Aug 2009 22:36:26 -0000	1.15
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        2%{?dist}
+Release:        4%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -18,7 +18,11 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
-BuildRequires:  python-devel python-sphinx
+BuildRequires:  python-devel
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+BuildRequires: python-sphinx
+%endif
+
 Requires:       python-simplejson
 
 %description
@@ -27,7 +31,7 @@ development and a clean, pragmatic desig
 much as possible and adhering to the DRY (Don't Repeat Yourself)
 principle.
 
-
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -38,7 +42,7 @@ Obsoletes:      %{name}-docs < %{version
 %description doc
 This package contains the documentation for the Django high-level
 Python Web framework.
-
+%endif
 
 %prep
 %setup -q -n %{name}-%{version}
@@ -62,8 +66,10 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-# build documentation
-(cd docs && make html)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
+    # build documentation
+    (cd docs && make html)
+%endif
 
 # install man pages
 mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
@@ -93,20 +99,27 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitelib}/*.egg-info
 %endif
 
-%if 0%{?fedora} > 0 && 0%{?fedora} <= 10
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
 %ghost %{_bindir}/django-admin.pyc
 %ghost %{_bindir}/django-admin.pyo
 %endif
 # -----------------
  
 
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*
-
+%endif
 
 %changelog
-* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net< - 1.1-2
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-4
+- EL-4 shouldn't get the sphinx docs.
+
+* Wed Aug 26 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-3
+- ghosting admin py* is now FC9 and under.
+
+* Thu Aug  6 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-2
 - Applied Daniel Mach's patch from bz#516016.
 
 * Sat Aug  1 2009 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.1-1




More information about the fedora-extras-commits mailing list