rpms/python-myghty/devel python-myghty.spec,1.17,1.18

[Toshio くらとみ]

Author: toshio

Update of /cvs/pkgs/rpms/python-myghty/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27837

Modified Files:
	python-myghty.spec 
Log Message:

* Fri Jun 25 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-11
- Add README file
- Update old way of invoking setup.py
- Fix conditionals for python-setuptools
- Comment what myghty-importer.patch does



Index: python-myghty.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-myghty/devel/python-myghty.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- python-myghty.spec	26 Jul 2009 20:43:14 -0000	1.17
+++ python-myghty.spec	26 Jun 2010 08:16:10 -0000	1.18
@@ -1,20 +1,23 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if !(0%{?fedora} >= 13 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%endif
 
 Name:           python-myghty
 Version:        1.1
-Release:        10%{?dist}
-Summary:        A Python-based templating system derived from HTML::Mason
+Release:        11%{?dist}
+Summary:        Python-based templating system derived from HTML::Mason
 
 Group:          Development/Libraries
 License:        MIT
 URL:            http://www.myghty.org
-Source0:        http://download.sourceforge.net/sourceforge/myghty/Myghty-%{version}.tar.gz
+Source0:        http://pypi.python.org/packages/source/M/Myghty/Myghty-%{version}.tar.gz
+# Fix import hook to work with python-2.6+
 Patch0: myghty-importer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:      noarch
 
-BuildRequires:  python-devel
-%if 0%{?fedora} >= 8
+BuildRequires:  python2-devel
+%if 0%{?fedora} <= 12
 BuildRequires: python-setuptools-devel
 %else
 BuildRequires: python-setuptools
@@ -34,27 +37,34 @@ and much more.
 %setup -q -n Myghty-%{version}
 %patch0 -p1
 
+sed -i 's!/usr/local/bin/python!/usr/bin/python!' examples/zblog/bin/server.py
+
 %build
 %{__python} setup.py build
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --old-and-unmanageable --root $RPM_BUILD_ROOT
+%{__python} setup.py install --root $RPM_BUILD_ROOT
 (cd doc ; %{__python} genhtml.py)
 
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
 %files
 %defattr(-,root,root,-)
-%doc doc/html/* examples LICENSE
+%doc doc/html/* examples LICENSE README
 %{python_sitelib}/*
 
 
 %changelog
+* Fri Jun 25 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 1.1-11
+- Add README file
+- Update old way of invoking setup.py
+- Fix conditionals for python-setuptools
+- Comment what myghty-importer.patch does
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild