rpms/Django/EL-5 .cvsignore, 1.10, 1.11 Django.spec, 1.13, 1.14 sources, 1.10, 1.11

[smilner]

Author: smilner

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

Modified Files:
	.cvsignore Django.spec sources 
Log Message:
updated for bz user request


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- .cvsignore	29 Jul 2009 23:19:24 -0000	1.10
+++ .cvsignore	16 Aug 2009 01:54:40 -0000	1.11
@@ -1 +1,3 @@
-Django-1.0.3.tar.gz
+Django-1.1.tar.gz
+Django-ignore-pyo-bz-495046.patch
+simplejson-init.py


Index: Django.spec
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/Django.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- Django.spec	30 Jul 2009 02:47:20 -0000	1.13
+++ Django.spec	16 Aug 2009 01:54:40 -0000	1.14
@@ -2,8 +2,8 @@
 %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
 
 Name:           Django
-Version:        1.0.3
-Release:        6%{?dist}
+Version:        1.1
+Release:        2%{?dist}
 Summary:        A high-level Python Web framework
 
 Group:          Development/Languages
@@ -12,6 +12,7 @@ URL:            http://www.djangoproject
 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
@@ -41,13 +42,13 @@ Python Web framework.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1
 # remove bundled simplejson
 cd django/utils/simplejson/
 rm -rf *
 # and put the replacement stub in place
 cp -p %{SOURCE1} __init__.py
-echo %{?rhel}
-echo "************"
+
 
 %build
 %{__python} setup.py build
@@ -57,7 +58,7 @@ echo "************"
 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
 
@@ -68,6 +69,8 @@ rm -rf $RPM_BUILD_ROOT
 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
@@ -76,7 +79,7 @@ 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
@@ -85,25 +88,33 @@ rm -rf $RPM_BUILD_ROOT
 %attr(0755,root,root) %{python_sitelib}/django/bin/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} <= 10
+%if 0%{?fedora} > 0 && 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
+* 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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/Django/EL-5/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- sources	29 Jul 2009 23:19:24 -0000	1.10
+++ sources	16 Aug 2009 01:54:40 -0000	1.11
@@ -1 +1,3 @@
-3c5435b015d8cde602b17a5f0c9873dc  Django-1.0.3.tar.gz
+b2d75b4457a39c405fa2b36bf826bf6b  Django-1.1.tar.gz
+302eb7b98d32ae67ade4ebdaff3bf361  Django-ignore-pyo-bz-495046.patch
+5fe0cb83b3122ec27d1179cb9a39063b  simplejson-init.py