rpms/Django/EL-4 Django.spec,1.15,1.16

[smilner]

Author: smilner

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

Modified Files:
	Django.spec 
Log Message:
testing combined spec in EL4


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- Django.spec	26 Aug 2009 21:49:31 -0000	1.15
+++ Django.spec	26 Aug 2009 21:59:12 -0000	1.16
@@ -3,7 +3,7 @@
 
 Name:           Django
 Version:        1.1
-Release:        3.01%{?dist}
+Release:        3.02%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -19,7 +19,7 @@ BuildArch:      noarch
 # Note: No longer required in development version > 0.95
 # BuildRequires:  python-setuptools
 BuildRequires:  python-devel
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 BuildRequires: python-sphinx
 %endif
 
@@ -31,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} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %package doc
 Summary:        Documentation for Django
 Group:          Documentation
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
   's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
   >> %{name}.lang
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel}  4 || 0%{?fedora} > 0
     # build documentation
     (cd docs && make html)
 %endif
@@ -106,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 # -----------------
  
 
-%if (0%{?rhel} > 0 && 0%{?rhel} > 4) || (0%{?fedora} > 0)
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0
 %files doc
 %defattr(-,root,root,-)
 %doc docs/_build/html/*