SPECS: apr.spec - package gen-build.py (for apr-util) - use sed ra...

[glen]

Author: glen                         Date: Mon Dec 19 20:55:31 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- package gen-build.py (for apr-util)
- use sed rather perl to do inline edits, as perl ignores missing files
- fix apr-1-config inplace edit filename
- add libtool patch to be able to use ccache/distcc and friends

---- Files affected:
SPECS:
   apr.spec (1.42 -> 1.43) 

---- Diffs:

================================================================
Index: SPECS/apr.spec
diff -u SPECS/apr.spec:1.42 SPECS/apr.spec:1.43
--- SPECS/apr.spec:1.42	Fri Dec  2 11:16:07 2005
+++ SPECS/apr.spec	Mon Dec 19 21:55:26 2005
@@ -13,7 +13,7 @@
 Summary(pl):	Apache Portable Runtime - przenośna biblioteka uruchomieniowa
 Name:		apr
 Version:	1.2.2
-Release:	2
+Release:	2.6
 Epoch:		1
 License:	Apache v2.0
 Group:		Libraries
@@ -22,12 +22,13 @@
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-metuxmpm.patch
 Patch2:		%{name}-no-epoll.patch
+Patch3:		%{name}-libtool.patch
 URL:		http://apr.apache.org/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake
 BuildRequires:	libtool >= 1.3.3
 BuildRequires:	libuuid-devel
-BuildRequires:	perl-base
+BuildRequires:	sed >= 4.0
 BuildRequires:	python
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -87,6 +88,7 @@
 %patch0 -p1
 %patch1 -p1
 %{!?with_epoll:%patch2 -p1}
+%patch3 -p1
 
 %build
 install /usr/share/automake/config.* build
@@ -112,15 +114,17 @@
 ln -sf %{_bindir}/libtool $RPM_BUILD_ROOT%{_datadir}/libtool
 
 mv -f $RPM_BUILD_ROOT%{_datadir}/build-1 $RPM_BUILD_ROOT%{_datadir}/build
-install build/{*apr*.m4,*.awk,*.sh} $RPM_BUILD_ROOT%{_datadir}/build
+install build/{*apr*.m4,*.awk,*.sh,gen-build.py} $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/share/automake/config.{guess,sub} $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/share/libtool/ltmain.sh $RPM_BUILD_ROOT%{_datadir}/build
 ln -snf /usr/bin/libtool $RPM_BUILD_ROOT%{_datadir}/build
 ln -sf build $RPM_BUILD_ROOT%{_datadir}/build-1
 
-%{__perl} -pi -e 's@^(APR_SOURCE_DIR=).*@$1"%{_datadir}"@' $RPM_BUILD_ROOT%{_bindir}/apr-config
-%{__perl} -pi -e 's@^(apr_builddir|apr_builders)=.*@$1=%{_datadir}/build-1@' \
+sed -i -e 's@^\(APR_SOURCE_DIR=\).*@\1"%{_datadir}"@' \
+	$RPM_BUILD_ROOT%{_bindir}/apr-1-config
+sed -i -e 's@^\(apr_builddir\|apr_builders\)=.*@\1=%{_datadir}/build-1@' \
 	$RPM_BUILD_ROOT%{_datadir}/build/apr_rules.mk
+sed -i -e '1s@#!.*python@#!%{__python}@' $RPM_BUILD_ROOT%{_datadir}/build/gen-build.py
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -148,6 +152,7 @@
 %attr(755,root,root) %{_datadir}/build/config.*
 %attr(755,root,root) %{_datadir}/build/*.sh
 %attr(755,root,root) %{_datadir}/build/libtool
+%attr(755,root,root) %{_datadir}/build/gen-build.py
 %{_datadir}/build-1
 %{_pkgconfigdir}/apr-1.pc
 
@@ -161,6 +166,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43  2005/12/19 20:55:26  glen
+- package gen-build.py (for apr-util)
+- use sed rather perl to do inline edits, as perl ignores missing files
+- fix apr-1-config inplace edit filename
+- add libtool patch to be able to use ccache/distcc and friends
+
 Revision 1.42  2005/12/02 10:16:07  qboosh
 - disable sendfile64 on 32-bit ppc; release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apr.spec?r1=1.42&r2=1.43&f=u