Author: arekm                        Date: Tue Feb 20 16:41:27 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4

---- Files affected:
SPECS:
   python-rhpl.spec (1.9 -> 1.10) 

---- Diffs:

================================================================
Index: SPECS/python-rhpl.spec
diff -u SPECS/python-rhpl.spec:1.9 SPECS/python-rhpl.spec:1.10
--- SPECS/python-rhpl.spec:1.9  Tue Feb 13 09:06:43 2007
+++ SPECS/python-rhpl.spec      Tue Feb 20 17:41:22 2007
@@ -3,14 +3,15 @@
 Summary(pl.UTF-8):     Biblioteka kodu Pythona używana przez niektóre programy 
Red Hata
 Name:          python-rhpl
 Version:       0.176
-Release:       3
+Release:       4
 License:       GPL
 Group:         Libraries
 Source0:       rhpl-%{version}.tar.gz
 # Source0-md5: 9ebe9200e71b07dae9b0a6e5a198dbe6
+Patch0:                %{name}-enc.patch
 BuildRequires: gettext-devel
 BuildRequires: libiw-devel
-BuildRequires: python-devel
+BuildRequires: python-devel >= 1:2.5
 %pyrequires_eq python-libs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -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
+sed -i -e 's/$(PYTHON) /python /' Makefile src/iconvmodule/Makefile 
src/ethtool/Makefile
 
 %build
 %{__make} \
+       PYTHONINCLUDE="%{py_incdir}" \
        CC="%{__cc}" \
        RPM_OPT_FLAGS="%{rpmcflags}"
 
@@ -49,6 +48,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %{__make} install \
+       PYTHONLIBDIR="%{py_sitedir}" \
        DESTDIR=$RPM_BUILD_ROOT
 
 %find_lang rhpl
@@ -60,6 +60,7 @@
 %defattr(644,root,root,755)
 %doc ChangeLog README
 %dir %{py_sitedir}/rhpl
+%{py_sitedir}/rhpl/*.egg-info
 %{py_sitedir}/rhpl/*.py*
 %attr(755,root,root) %{py_sitedir}/rhpl/*.so
 
@@ -69,6 +70,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.10  2007/02/20 16:41:22  arekm
+- rel 4
+
 Revision 1.9  2007/02/13 08:06:43  glen
 - tabs in preamble
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/python-rhpl.spec?r1=1.9&r2=1.10&f=u

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to