rpms/tre/devel tre-chicken.patch,NONE,1.1 tre.spec,1.6,1.7

[Dominik Mierzejewski (rathann)]

Author: rathann

Update of /cvs/pkgs/rpms/tre/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16492

Modified Files:
	tre.spec 
Added Files:
	tre-chicken.patch 
Log Message:
- include python bindings (bug #355241)
- fix chicken-and-egg problem when building python bindings


tre-chicken.patch:

--- NEW FILE tre-chicken.patch ---
diff -up tre-0.7.5/python/tre-python.c.chicken tre-0.7.5/python/tre-python.c
diff -up tre-0.7.5/python/setup.py.chicken tre-0.7.5/python/setup.py
--- tre-0.7.5/python/setup.py.chicken	2006-12-10 07:02:57.000000000 +0100
+++ tre-0.7.5/python/setup.py	2007-11-08 18:10:12.000000000 +0100
@@ -32,6 +32,8 @@ SOURCES = ["tre-python.c"]
 
 INCDIRS = ospath(["..", "../lib"])
 
+LIBDIRS = ospath(["../lib/.libs"])
+
 setup(
     name = "tre",
     version = VERSION,
@@ -46,6 +48,7 @@ setup(
 	    SOURCES,
 	    include_dirs = INCDIRS,
             define_macros = [("HAVE_CONFIG_H", None)],
+	    library_dirs = LIBDIRS,
 	    libraries=["tre"]
 	),
     ],


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/tre.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- tre.spec	28 Aug 2007 22:58:52 -0000	1.6
+++ tre.spec	8 Nov 2007 17:16:28 -0000	1.7
@@ -1,14 +1,18 @@
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+
 Name: tre
 Version: 0.7.5
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: LGPLv2+
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
+Patch0: %{name}-chicken.patch
 Summary: POSIX compatible regexp library with approximate matching
 URL: http://laurikari.net/tre/
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gettext-devel
 BuildRequires: libtool
+BuildRequires: python-devel
 
 %description
 TRE is a lightweight, robust, and efficient POSIX compatible regexp
@@ -24,6 +28,13 @@
 This package contains header files and static libraries for use when
 building applications which use the TRE library.
 
+%package -n python-%{name}
+Group: System Environment/Libraries
+Summary: Python bindings for the tre library
+
+%description -n python-%{name}
+This package contains the python bindings for the TRE library.
+
 %package -n agrep
 Summary: Approximate grep utility
 Group: Applications/Text
@@ -43,6 +54,9 @@
 
 %prep
 %setup -q
+# hack to fix python bindings build
+ln -s lib tre
+%patch0 -p1 -b .chicken
 
 %build
 %{__libtoolize} --force
@@ -51,9 +65,16 @@
 %{__autoconf}
 %configure --disable-static --disable-rpath
 %{__make} %{?_smp_mflags}
+pushd python
+%{__python} setup.py build
+popd
 
 %install
 %{__make} install DESTDIR=$RPM_BUILD_ROOT
+pushd python
+%{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
+%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
+popd
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %find_lang %{name}
 
@@ -79,12 +100,19 @@
 %{_libdir}/pkgconfig/*
 %{_includedir}/*
 
+%files -n python-%{name}
+%{python_sitearch}/tre.so
+
 %files -n agrep
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/agrep
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Wed Oct 31 2007 Dominik Mierzejewski <rpm at greysector.net> 0.7.5-3
+- include python bindings (bug #355241)
+- fix chicken-and-egg problem when building python bindings
+
 * Wed Aug 29 2007 Dominik Mierzejewski <rpm at greysector.net> 0.7.5-2
 - rebuild for BuildID
 - update license tag