packages: python-bottle/python-bottle.spec, python-bottle/bottle-encoding.p...

jajcus jajcus at pld-linux.org
Fri Jul 15 19:17:05 CEST 2011


Author: jajcus                       Date: Fri Jul 15 17:17:05 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- Version: 0.9.5
- patch for setup.py to run with ASCII locale
- missing %build added
- package *.py and pycache for python3

---- Files affected:
packages/python-bottle:
   python-bottle.spec (1.4 -> 1.5) , bottle-encoding.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/python-bottle/python-bottle.spec
diff -u packages/python-bottle/python-bottle.spec:1.4 packages/python-bottle/python-bottle.spec:1.5
--- packages/python-bottle/python-bottle.spec:1.4	Sun Nov 14 13:35:50 2010
+++ packages/python-bottle/python-bottle.spec	Fri Jul 15 19:17:00 2011
@@ -9,13 +9,14 @@
 Summary:	Fast and simple WSGI-framework for small web-applications
 Summary(pl.UTF-8):	Szybki i prosty szkielet WSGI dla małych aplikacji sieciowych
 Name:		python-%{module}
-Version:	0.8.5
+Version:	0.9.5
 Release:	1
 License:	MIT
 Group:		Development/Languages/Python
 Source0:	http://pypi.python.org/packages/source/b/%{module}/%{module}-%{version}.tar.gz
-# Source0-md5:	10e58aa1ef4fe66a9e99153df5dc1b09
+# Source0-md5:	d87cb9aa846003163aeda29226ae1e9c
 URL:		http://bottle.paws.de/docs/dev/index.html
+Patch0:		%{module}-encoding.patch
 %if %{with python2}
 BuildRequires:	python-modules >= 1:2.5
 %endif
@@ -69,7 +70,9 @@
 
 %prep
 %setup -q -n %{module}-%{version}
+%patch0 -p1
 
+%build
 %if %{with python2}
 %{__python} setup.py build -b build-2
 %endif
@@ -99,8 +102,6 @@
 	install \
 	--optimize=2 \
 	--root=$RPM_BUILD_ROOT
-
-%py3_postclean
 %endif
 
 %clean
@@ -118,7 +119,8 @@
 %if %{with python3}
 %files -n python3-%{module}
 %defattr(644,root,root,755)
-%{py3_sitescriptdir}/*.py[co]
+%{py3_sitescriptdir}/*.py
+%{py3_sitescriptdir}/__pycache__
 %{py3_sitescriptdir}/%{module}-*.egg-info
 %endif
 
@@ -128,6 +130,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.5  2011/07/15 17:17:00  jajcus
+- Version: 0.9.5
+- patch for setup.py to run with ASCII locale
+- missing %build added
+- package *.py and pycache for python3
+
 Revision 1.4  2010/11/14 12:35:50  megabajt
 - build python 2 and python 3 version from one spec
 

================================================================
Index: packages/python-bottle/bottle-encoding.patch
diff -u /dev/null packages/python-bottle/bottle-encoding.patch:1.1
--- /dev/null	Fri Jul 15 19:17:05 2011
+++ packages/python-bottle/bottle-encoding.patch	Fri Jul 15 19:17:00 2011
@@ -0,0 +1,13 @@
+diff -udr bottle-0.9.5.orig/setup.py bottle-0.9.5/setup.py
+--- bottle-0.9.5.orig/setup.py	2011-06-05 19:23:01.000000000 +0200
++++ bottle-0.9.5/setup.py	2011-07-15 19:12:46.582757494 +0200
+@@ -13,7 +13,8 @@
+     from distutils.command.build_py import build_py
+ 
+ # Ugly, but we can't import bottle with 3.x to read __version__ (throws SyntaxError)
+-for line in open(os.path.join(os.path.dirname(sys.argv[0]),'bottle.py')):
++for line in open(os.path.join(os.path.dirname(sys.argv[0]),'bottle.py'), "rb"):
++    line = line.decode("utf-8")
+     if line.startswith('__version__'):
+         version = eval(line.split('=')[-1])
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python-bottle/python-bottle.spec?r1=1.4&r2=1.5&f=u



More information about the pld-cvs-commit mailing list