rpms/tre/devel tre-tests.patch,NONE,1.1 tre.spec,1.14,1.15

[Dominik Mierzejewski]

Author: rathann

Update of /cvs/pkgs/rpms/tre/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19089

Modified Files:
	tre.spec 
Added Files:
	tre-tests.patch 
Log Message:
* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-2
- added missing defattr for python subpackage
- dropped conditionals for Fedora <10
- used alternative method for rpath removal
- fixed internal testsuite to run with just-built shared library
- dropped unnecessary build dependencies


tre-tests.patch:
 run-tests.sh |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE tre-tests.patch ---
diff -up tre-0.7.6/tests/agrep/run-tests.sh.tests tre-0.7.6/tests/agrep/run-tests.sh
--- tre-0.7.6/tests/agrep/run-tests.sh.tests	2009-03-11 10:44:44.000000000 +0100
+++ tre-0.7.6/tests/agrep/run-tests.sh	2009-08-22 20:20:15.885084058 +0200
@@ -2,6 +2,7 @@
 
 set -e
 
+export LD_LIBRARY_PATH=$top_builddir/lib/.libs
 agrep="$top_builddir/src/agrep"
 
 echo "$builddir $top_builddir $srcdir"


Index: tre.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tre/devel/tre.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- tre.spec	28 Jul 2009 14:28:36 -0000	1.14
+++ tre.spec	22 Aug 2009 19:12:53 -0000	1.15
@@ -2,16 +2,16 @@
 
 Name: tre
 Version: 0.7.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: BSD
 Group: System Environment/Libraries
 Source0: http://laurikari.net/tre/%{name}-%{version}.tar.bz2
 Patch0: %{name}-chicken.patch
+# make internal tests of agrep work with just-built shared library
+Patch1: %{name}-tests.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
@@ -57,13 +57,12 @@ regexps of any length, any number of err
 # hack to fix python bindings build
 ln -s lib tre
 %patch0 -p1 -b .chicken
+%patch1 -p1 -b .tests
 
 %build
-#%{__libtoolize} --force
-#%{__aclocal} -I m4 -I gnulib/m4
-#%{__automake}
-#%{__autoconf}
 %configure --disable-static --disable-rpath
+sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
 %{__make} %{?_smp_mflags}
 pushd python
 %{__python} setup.py build
@@ -79,6 +78,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/*.la
 %find_lang %{name}
 
 %check
+# revert rpath removal for building internal test programs
+sed -i 's|^runpath_var=DIE_RPATH_DIE|runpath_var=LD_RUN_PATH|g' libtool
 %{__make} check
 
 %clean
@@ -101,10 +102,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/*
 
 %files -n python-%{name}
+%defattr(644,root,root,755)
 %{python_sitearch}/tre.so
-%if 0%{?fedora} >= 9
 %{python_sitearch}/*.egg-info
-%endif
 
 %files -n agrep
 %defattr(644,root,root,755)
@@ -112,6 +112,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/agrep.1*
 
 %changelog
+* Sat Aug 22 2009 Dominik Mierzejewski <rpm at greysector.net> 0.7.6-2
+- added missing defattr for python subpackage
+- dropped conditionals for Fedora <10
+- used alternative method for rpath removal
+- fixed internal testsuite to run with just-built shared library
+- dropped unnecessary build dependencies
+
 * Tue Jul 28 2009 Itamar Reis Peixoto <itamar at ispbrasil.com.br> - 0.7.6-1
 - new version 0.7.6