SPECS (AC-branch): python-rhpl.spec - merged 0.201 from HEAD

[glen]

Author: glen                         Date: Tue Nov 13 19:20:37 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged 0.201 from HEAD

---- Files affected:
SPECS:
   python-rhpl.spec (1.6.2.2 -> 1.6.2.3) 

---- Diffs:

================================================================
Index: SPECS/python-rhpl.spec
diff -u SPECS/python-rhpl.spec:1.6.2.2 SPECS/python-rhpl.spec:1.6.2.3
--- SPECS/python-rhpl.spec:1.6.2.2	Tue Nov 13 20:18:43 2007
+++ SPECS/python-rhpl.spec	Tue Nov 13 20:20:32 2007
@@ -2,12 +2,13 @@
 Summary:	Library of Python code used by some programs made by Red Hat
 Summary(pl.UTF-8):	Biblioteka kodu Pythona używana przez niektóre programy Red Hata
 Name:		python-rhpl
-Version:	0.176
-Release:	3
+Version:	0.201
+Release:	2
 License:	GPL
 Group:		Libraries
 Source0:	rhpl-%{version}.tar.gz
-# Source0-md5:	9ebe9200e71b07dae9b0a6e5a198dbe6
+# Source0-md5:	a40ecdad6b77b46b61ac76fe47c82c4d
+Patch0:		%{name}-enc.patch
 BuildRequires:	gettext-devel
 BuildRequires:	libiw-devel
 BuildRequires:	python-devel
@@ -24,6 +25,7 @@
 
 %prep
 %setup -q -n rhpl-%{version}
+%patch0 -p1
 
 # remove deprecated modules
 # moved into python-rhpxl
@@ -33,15 +35,12 @@
 
 rm -f po/no.po
 
-for module in . src/iconvmodule src/ethtool
-do
-	mv $module/Makefile $module/Makefile.old
-	sed -e 's/$(PYTHON) /python /' $module/Makefile.old > $module/Makefile
-	rm $module/Makefile.old
-done
+sed -i -e 's#gcc#%{__cc}#g' Makefile */Makefile */*/Makefile
 
 %build
 %{__make} \
+	PYTHON="%{__python}" \
+	PYTHONINCLUDE="%{py_incdir}" \
 	CC="%{__cc}" \
 	RPM_OPT_FLAGS="%{rpmcflags}"
 
@@ -49,6 +48,8 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+	PYTHON="%{__python}" \
+	PYTHONLIBDIR="%{py_sitedir}" \
 	DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang rhpl
@@ -69,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6.2.3  2007-11-13 19:20:32  glen
+- merged 0.201 from HEAD
+
 Revision 1.6.2.2  2007-11-13 19:18:43  glen
 - converted to utf8
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/python-rhpl.spec?r1=1.6.2.2&r2=1.6.2.3&f=u