rpms/Django/EL-5 Django.spec,1.19,1.20
smilner
smilner at fedoraproject.org
Wed Jun 2 16:23:09 UTC 2010
- Previous message: rpms/gitolite/devel .cvsignore, 1.5, 1.6 gitolite.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message: rpms/system-config-printer/devel system-config-printer-auto_make.patch, NONE, 1.1 system-config-printer.spec, 1.395, 1.396
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: smilner
Update of /cvs/pkgs/rpms/Django/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14295
Modified Files:
Django.spec
Log Message:
forcing spec to be inline with devel
Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- Django.spec 26 May 2010 19:36:02 -0000 1.19
+++ Django.spec 2 Jun 2010 16:23:09 -0000 1.20
@@ -3,7 +3,7 @@
Name: Django
Version: 1.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
@@ -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} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} <= 13
%package doc
Summary: Documentation for Django
Group: Documentation
@@ -66,7 +66,7 @@ rm -rf $RPM_BUILD_ROOT
>> %{name}.lang
# If it's rhel5+ or any Fedora under 13 build docs
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} <= 13
# build documentation
(cd docs && mkdir djangohtml && mkdir -p _build/{doctrees,html} && make html)
%endif
@@ -255,7 +255,7 @@ rm -rf $RPM_BUILD_ROOT
# -----------------
-%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} < 13
+%if 0%{?rhel} > 4 || 0%{?fedora} > 0 && 0%{?fedora} <= 13
%files doc
%defattr(-,root,root,-)
%doc docs/_build/html/*
@@ -263,7 +263,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
-* Mon May 25 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-1
+* Thu May 27 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-2
+- Allow for building docs in F13 as it's only F14 freaking out
+
+* Tue May 25 2010 Steve 'Ashcrow' Milner <stevem at gnulinux.net> - 1.2.1-1
- Update for new release.
- Added lang files per BZ#584866.
- Changed perms on %%{python_sitelib}/django/contrib/admin/media/js/compress.py
- Previous message: rpms/gitolite/devel .cvsignore, 1.5, 1.6 gitolite.spec, 1.7, 1.8 sources, 1.5, 1.6
- Next message: rpms/system-config-printer/devel system-config-printer-auto_make.patch, NONE, 1.1 system-config-printer.spec, 1.395, 1.396
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list