rpms/Django/EL-4 .cvsignore, 1.9, 1.10 Django.spec, 1.13, 1.14 sources, 1.9, 1.10
smilner
smilner at fedoraproject.org
Wed Aug 26 20:46:28 UTC 2009
Author: smilner
Update of /cvs/pkgs/rpms/Django/EL-4
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4675
Modified Files:
.cvsignore Django.spec sources
Log Message:
update for Django 1.1 in EL4
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore 14 Dec 2008 06:23:23 -0000 1.9
+++ .cvsignore 26 Aug 2009 20:46:28 -0000 1.10
@@ -1 +1,3 @@
-Django-1.0.2-final.tar.gz
+Django-1.1.tar.gz
+simplejson-init.py
+Django-ignore-pyo-bz-495046.patch
Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/Django.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Django.spec 14 Dec 2008 06:23:23 -0000 1.13
+++ Django.spec 26 Aug 2009 20:46:28 -0000 1.14
@@ -2,21 +2,23 @@
%{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
Name: Django
-Version: 1.0.2
-Release: 1%{?dist}
+Version: 1.1
+Release: 3%{?dist}
Summary: A high-level Python Web framework
Group: Development/Languages
License: BSD
URL: http://www.djangoproject.com/
-Source0: http://media.djangoproject.com/releases/%{version}/Django-%{version}-final.tar.gz
-Source1: simplejson-init.py
+Source0: http://media.djangoproject.com/releases/%{version}/Django-%{version}.tar.gz
+# stub simplejson module that imports the system version
+Source1: simplejson-init.py
+Patch0: Django-ignore-pyo-bz-495046.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
# Note: No longer required in development version > 0.95
# BuildRequires: python-setuptools
-BuildRequires: python-devel
+BuildRequires: python-devel python-sphinx
Requires: python-simplejson
%description
@@ -39,7 +41,8 @@ Python Web framework.
%prep
-%setup -q -n %{name}-%{version}-final
+%setup -q -n %{name}-%{version}
+%patch0 -p1
# remove bundled simplejson
cd django/utils/simplejson/
rm -rf *
@@ -55,14 +58,19 @@ cp -p %{SOURCE1} __init__.py
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
# Language files; not under /usr/share, need to be handled manually
-(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | sed -e 's|^.||' | sed -e \
+(cd $RPM_BUILD_ROOT && find . -name 'django*.mo') | %{__sed} -e 's|^.||' | %{__sed} -e \
's:\(.*/locale/\)\([^/_]\+\)\(.*\.mo$\):%lang(\2) \1\2\3:' \
>> %{name}.lang
+# build documentation
+(cd docs && make html)
+
# install man pages
mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/
cp -p docs/man/* $RPM_BUILD_ROOT%{_mandir}/man1/
+# Fix items in %{_bindir}
+mv $RPM_BUILD_ROOT%{_bindir}/django-admin.py $RPM_BUILD_ROOT%{_bindir}/django-admin
%clean
rm -rf $RPM_BUILD_ROOT
@@ -71,24 +79,67 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS LICENSE README
-%{_bindir}/django-admin.py
+%{_bindir}/django-admin
%{_mandir}/man1/*
%attr(0755,root,root) %{python_sitelib}/django/conf/project_template/manage.py
%attr(0755,root,root) %{python_sitelib}/django/bin/profiling/gather_profile_stats.py
%attr(0755,root,root) %{python_sitelib}/django/bin/*-messages.py
%attr(0755,root,root) %{python_sitelib}/django/bin/daily_cleanup.py
%attr(0755,root,root) %{python_sitelib}/django/bin/django-admin.py
-%exclude %{_bindir}/django-admin.py?
%{python_sitelib}/django
+
+# Leaving these since people may want to rebuild on lower dists
%if 0%{?fedora} >= 9
%{python_sitelib}/*.egg-info
%endif
+%if 0%{?fedora} > 0 && 0%{?fedora} <= 9
+%ghost %{_bindir}/django-admin.pyc
+%ghost %{_bindir}/django-admin.pyo
+%endif
+# -----------------
+
+
%files doc
%defattr(-,root,root,-)
-%doc docs/*
+%doc docs/_build/html/*
+
%changelog
+* 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
+- Update for Django 1.1 release.
+- Moved /usr/bin/django-admin.py to /usr/bin/django-admin
+- sed macro is now being used
+- Patch for bz#495046 applied.
+
+* 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/
+
+* 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
+
+* Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
* Sun Dec 14 2008 Michel Salim <salimma at fedoraproject.org> - 1.0.2-1
- Update to 1.0.2
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-4/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- sources 14 Dec 2008 06:23:23 -0000 1.9
+++ sources 26 Aug 2009 20:46:28 -0000 1.10
@@ -1 +1,3 @@
-89353e3749668778f1370d2e444f3adc Django-1.0.2-final.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b Django-1.1.tar.gz
+5fe0cb83b3122ec27d1179cb9a39063b simplejson-init.py
+302eb7b98d32ae67ade4ebdaff3bf361 Django-ignore-pyo-bz-495046.patch
More information about the fedora-extras-commits
mailing list