Hello community, here is the log from the commit of package subversion checked in at Wed Jul 16 00:26:37 CEST 2008. -------- --- subversion/subversion.changes 2008-06-26 10:51:47.000000000 +0200 +++ subversion/subversion.changes 2008-07-12 14:58:00.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Jul 11 09:39:33 CEST 2008 - poeml@suse.de + +- build fixes to get the Factory package building in the Build + Service again: + * change BuildRequires java2-devel-packages to java-devel, which + seems to be more universally defined + * don't build javahl bindings on 10.1/SLE10 or older -- build + doesn't work with that currently. + * fix build on SLES9 -- by not applying + subversion.libtool-pie-flags.patch there and + fixing LDFLAGS in the Makefile to use the correct libdir + * add workaround for (bnc#395110) -- build error on 10.1/sle10 on + x86_64: add update-alternatives to BuildRequires (but not on + sles9 where the package didn't exist) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ subversion.spec ++++++ --- /var/tmp/diff_new_pack.dm6894/_old 2008-07-16 00:23:07.000000000 +0200 +++ /var/tmp/diff_new_pack.dm6894/_new 2008-07-16 00:23:07.000000000 +0200 @@ -12,7 +12,10 @@ Name: subversion -BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages python-devel swig zlib-devel +%if 0%{?suse_version} > 910 +BuildRequires: update-alternatives +%endif +BuildRequires: apache2-devel db-devel gcc-c++ java-devel python-devel swig zlib-devel %if 0%{?suse_version} > 1030 BuildRequires: libneon-devel %else @@ -20,7 +23,7 @@ %endif BuildRequires: sqlite-devel Version: 1.5.0 -Release: 99 +Release: 105 # %define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services # @@ -156,7 +159,9 @@ %patch11 -p1 # %patch20 -p1 +%if 0%{?suse_version} > 930 %patch23 -p1 +%endif %patch31 -p1 %patch33 -p1 %patch34 -p1 @@ -186,6 +191,10 @@ break fi done +%if 0%{?suse_version} < 1020 + # disable javahl bindings + with_jdk=none +%endif if [ "$with_jdk" != "none" ] ; then with_jdk="--with-jdk=$with_jdk --enable-javahl" echo with_jdk > with_jdk @@ -209,12 +218,11 @@ # ### these possibly need further discussion # swig_pydir = @libdir@/svn-python/libsvn # swig_pydir_extra = @libdir@/svn-python/svn -mv Makefile.in{,.} -sed " +sed --in-place=~ " s@^swig_pydir = .*@swig_pydir = %{site_python}/libsvn@ s@^swig_pydir_extra = .*@swig_pydir_extra = %{site_python}/svn@ -" < Makefile.in. > Makefile.in -diff -u Makefile.in. Makefile.in || true +" Makefile.in +diff -u Makefile.in~ Makefile.in || true sh -x autogen.sh for i in subversion/bindings/javahl/native/*.cpp do @@ -248,6 +256,9 @@ --enable-swig-bindings \ --disable-mod-activation \ --disable-static +%if 0%{?suse_version} == 910 +sed --in-place=~ "s,\/usr\/lib ,%{_libdir} ,g" Makefile +%endif make %{?jobs:-j%jobs} # if [ "$with_jdk" != "" ] ; then @@ -421,6 +432,19 @@ %{apache_libexecdir}/mod_authz_svn.* %changelog +* Fri Jul 11 2008 poeml@suse.de +- build fixes to get the Factory package building in the Build + Service again: + * change BuildRequires java2-devel-packages to java-devel, which + seems to be more universally defined + * don't build javahl bindings on 10.1/SLE10 or older -- build + doesn't work with that currently. + * fix build on SLES9 -- by not applying + subversion.libtool-pie-flags.patch there and + fixing LDFLAGS in the Makefile to use the correct libdir + * add workaround for (bnc#395110) -- build error on 10.1/sle10 on + x86_64: add update-alternatives to BuildRequires (but not on + sles9 where the package didn't exist) * Thu Jun 19 2008 olh@suse.de - add svn_apply_autoprops.py to subversion-tools (bnc#401638) * Thu Jun 19 2008 olh@suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org