pool/subversion
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/subversion?expand=0&rev=43

Browse Source
This commit is contained in:
OBS User unknown 2008-07-15 22:26:38 +00:00 committed by Git OBS Bridge
parent 82490739f7
commit bf63b978bc
2 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
subversion.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
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)
-------------------------------------------------------------------
Thu Jun 19 17:45:53 CEST 2008 - olh@suse.de

36
subversion.spec
View File

@ -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 @@ BuildRequires: neon-devel openldap2-devel
%endif
BuildRequires: sqlite-devel
Version: 1.5.0
Release: 99
Release: 105
#
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
#
@ -156,7 +159,9 @@ esac
%patch11 -p1
#
%patch20 -p1
%if 0%{?suse_version} > 930
%patch23 -p1
%endif
%patch31 -p1
%patch33 -p1
%patch34 -p1
@ -186,6 +191,10 @@ with_jdk="$i"
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 @@ cat with_jdk.files
# ### 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 @@ export CXXFLAGS="$CFLAGS"
--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 @@ rm -rf $RPM_BUILD_ROOT
%{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