OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Mar-2005 15:16:19
Branch: HEAD Handle: 2005030814161900
Modified files:
openpkg-src/subversion subversion.spec
Log:
packaging cleanups
Summary:
Revision Changes Path
1.88 +40 -26 openpkg-src/subversion/subversion.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/subversion/subversion.spec
============================================================================
$ cvs diff -u -r1.87 -r1.88 subversion.spec
--- openpkg-src/subversion/subversion.spec 8 Mar 2005 13:26:09 -0000
1.87
+++ openpkg-src/subversion/subversion.spec 8 Mar 2005 14:16:19 -0000
1.88
@@ -106,22 +106,30 @@
%setup -q
%setup -q -T -D -a 1
%patch -p0
+
+ # substitute path from applied patch
%{l_shtool} subst %{l_value -s -a} \
subversion/bindings/swig/perl/native/Makefile.PL.in
- %{l_shtool} subst \
- -e '/^<Layout apr>/,/<\/Layout>/{ s;\(^[ ]*prefix:\).*$;\1
%{l_prefix}; ;s;\(^[ ]*sysconfdir:\).*$;\1 %{l_prefix}/etc/subversion; }' \
- apr/config.layout \
- apr-util/config.layout
-%build
- # configure package
+ # patch: correctly pass --disable-shared to sub-directories
%{l_shtool} subst \
-e 's;\($ac_abs_srcdir/configure\) $ac_configure_args;\1
--disable-shared;' \
configure
+
+ # patch: adjust path to configuration directory
%{l_shtool} subst \
-e 's;/etc/subversion;%{l_prefix}/etc/subversion;g' \
subversion/libsvn_subr/config_impl.h \
subversion/libsvn_subr/config_file.c
+
+ # patch: fix installation of APR
+ %{l_shtool} subst \
+ -e '/^<Layout apr>/,/<\/Layout>/{ s;\(^[ ]*prefix:\).*$;\1
%{l_prefix}; ;s;\(^[ ]*sysconfdir:\).*$;\1 %{l_prefix}/etc/subversion; }' \
+ apr/config.layout \
+ apr-util/config.layout
+
+%build
+ # configure package
%if "%{with_perl}" == "yes"
bindings="${bindings}${bindings+,}perl"
%endif
@@ -148,6 +156,8 @@
# build package
%{l_make} %{l_mflags}
+
+ # build Perl bindings
%if "%{with_perl}" == "yes"
( cd apr; ln -s .libs/libapr-0.a . ) || exit $?
( cd apr-util; ln -s .libs/libaprutil-0.a . ) || exit $?
@@ -155,6 +165,8 @@
subversion/bindings/swig/perl/native/blib/arch/auto/SVN/{_Client,_Delta,_Fs,_Ra,_Repos,_Wc}
%{l_make} %{l_mflags} swig-pl
%endif
+
+ # build Python bindings
%if "%{with_python}" == "yes"
mv libtool libtool.orig
ln -s %{l_prefix}/bin/libtool .
@@ -165,46 +177,48 @@
# install package
rm -rf $RPM_BUILD_ROOT
%{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
+
+ # install Perl bindings
+%if "%{with_perl}" == "yes"
+ %{l_make} %{l_mflags} install-swig-pl DESTDIR=$RPM_BUILD_ROOT
+ %{l_prefix}/bin/perl-openpkg -F- fixate >/dev/null
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_swig_perl*
+%endif
+
+ # install Python bindings
+%if "%{with_python}" == "yes"
+ %{l_make} %{l_mflags} install-swig-py DESTDIR=$RPM_BUILD_ROOT
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_swig_py*
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python/libsvn/_*.a
+ mv $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python \
+ $RPM_BUILD_ROOT%{l_prefix}/lib/python
+%endif
+
+ # adjust APR installation for SVN local namespace
( cd $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
for i in *; do
- mv $i ../subversion-1/svn_$i
+ mv $i ../subversion-1/svn_$i
done
) || exit $?
%{l_shtool} subst \
- -e 's;^\(#include <\)\(apr.*\)$;\1svn_\2;' \
- $RPM_BUILD_ROOT/%{l_prefix}/include/subversion-1/svn*.h
+ -e 's;^\(#include <\)\(apr.*\)$;\1svn_\2;' \
+ $RPM_BUILD_ROOT/%{l_prefix}/include/subversion-1/svn*.h
( cd $RPM_BUILD_ROOT%{l_prefix}/lib
for i in libapr*; do
mv $i `echo "$i" | sed -e 's;^libapr\(.*\)$;libsvn_apr\1;'`
done
) || exit $?
-%if "%{with_perl}" == "yes"
- %{l_make} %{l_mflags} install-swig-pl DESTDIR=$RPM_BUILD_ROOT
-%endif
-%if "%{with_python}" == "yes"
- %{l_make} %{l_mflags} install-swig-py DESTDIR=$RPM_BUILD_ROOT
-%endif
# strip down installation
rm -f $RPM_BUILD_ROOT%{l_prefix}/bin/apr-config
+ rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
rm -rf $RPM_BUILD_ROOT%{l_prefix}/include/apr-0
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/svn-revision.txt
rm -f $RPM_BUILD_ROOT%{l_prefix}/include/subversion-1/mod_dav_svn.h
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/apr.exp
rm -rf $RPM_BUILD_ROOT%{l_prefix}/share/doc
rm -rf $RPM_BUILD_ROOT%{l_prefix}/build
rm -f $RPM_BUILD_ROOT%{l_prefix}/man/man1/neon*
strip $RPM_BUILD_ROOT%{l_prefix}/bin/* >/dev/null 2>&1 || true
-%if "%{with_perl}" == "yes"
- %{l_prefix}/bin/perl-openpkg -F- fixate >/dev/null
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_swig_perl*
-%endif
-%if "%{with_python}" == "yes"
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/libsvn_swig_py*
- rm -f $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python/libsvn/_*.a
- mv $RPM_BUILD_ROOT%{l_prefix}/lib/svn-python \
- $RPM_BUILD_ROOT%{l_prefix}/lib/python
-%endif
# install svn-config(1) tool
%{l_shtool} install -c -m 755 \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
