pool/subversion
SHA256
11
0
Fork 1
Code Issues Pull Requests Activity

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

Browse Source
This commit is contained in:
OBS User unknown
2007-12-13 20:03:06 +00:00
committed by Git OBS Bridge
parent b2295ae736
commit 1791f94662
3 changed files with 56 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
subversion-1.5.x-no-neon-la.patch Normal file
View File

@@ -0,0 +1,13 @@
Index: build/ac-macros/neon.m4
===================================================================
--- build/ac-macros/neon.m4.orig 2007-10-08 04:23:55.000000000 +0200
+++ build/ac-macros/neon.m4 2007-11-26 23:12:19.000000000 +0100
@@ -143,7 +143,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
test "$svn_allowed_neon" = "any"; then
svn_allowed_neon_on_system="yes"
SVN_NEON_INCLUDES=[`$neon_config --cflags | sed -e 's/-D[^ ]*//g'`]
- NEON_LIBS=`$neon_config --la-file`
+ NEON_LIBS=`$neon_config --libs`
CFLAGS=["$CFLAGS `$neon_config --cflags | sed -e 's/-I[^ ]*//g'`"]
svn_lib_neon="yes"
break

14
subversion.changes
View File

@@ -1,3 +1,17 @@
-------------------------------------------------------------------
Thu Dec 13 20:33:45 CET 2007 - mrueckert@suse.de
- remove openldap2-devel from the buildrequires:
subversion itself does not use openldap. the missing dependency
in libapr-util1 was added there.
-------------------------------------------------------------------
Tue Nov 27 00:57:52 CET 2007 - crrodriguez@suse.de
- neon-config should be called with --libs instead of --la-file
in order to fix build with recent neon package
- fix -devel package dependencies
-------------------------------------------------------------------
Mon Nov 26 10:23:15 CET 2007 - olh@suse.de

45
subversion.spec
View File

@@ -11,15 +11,15 @@
# norootforbuild
Name: subversion
BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages openldap2-devel python-devel swig
BuildRequires: apache2-devel db-devel gcc-c++ java2-devel-packages python-devel swig zlib-devel
%if 0%{?suse_version} > 1030
BuildRequires: libneon-devel
%else
BuildRequires: neon-devel
BuildRequires: neon-devel openldap2-devel
%endif
BuildRequires: sqlite-devel
Version: 1.5.0
Release: 20
Release: 21
#
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
#
@@ -59,6 +59,7 @@ Patch32: subversion.fallback-to-ipv4.patch
Patch33: subversion.header_wrappers.patch
Patch34: subversion.allowed-neon.patch
Patch35: subversion.java14.patch
Patch36: subversion-1.5.x-no-neon-la.patch
#
%description
@@ -71,7 +72,8 @@ but has major enhancements compared to CVS.
Group: Development/Libraries/C and C++
Summary: Development package for Subversion developers
Requires: subversion = %{version}
Requires: neon-devel libexpat-devel gdbm-devel db-devel zlib-devel openssl-devel libapr-util1-devel libapr1-devel python-devel openldap2-devel
# this pulls in libapr1-devel and libexpat-devel
Requires: libapr-util1-devel
%description devel
The subversion-devel package includes the static libraries and include
@@ -147,6 +149,7 @@ esac
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36
%build
with_jdk=none
@@ -221,11 +224,7 @@ export LDFLAGS=-pie
CFLAGS="$CFLAGS -fstack-protector"
%endif
export CXXFLAGS="$CFLAGS"
./configure \
--prefix=%{_prefix} \
--infodir=%{_infodir} \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
%configure \
--with-editor="vim -c 'set tw=72 et' " \
--with-neon=%{_prefix} \
--with-apr=%{_prefix} \
@@ -235,7 +234,8 @@ export CXXFLAGS="$CFLAGS"
$with_jdk \
--with-jikes=no \
--enable-swig-bindings \
--disable-mod-activation
--disable-mod-activation \
--disable-static
make %{?jobs:-j%jobs}
#
if [ "$with_jdk" != "" ] ; then
@@ -308,17 +308,23 @@ ln -sv /etc/init.d/svnserve $RPM_BUILD_ROOT/usr/sbin/rcsvnserve
cp -aL %{S:10} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.svnserve
mkdir -p $RPM_BUILD_ROOT/%{_fwdefdir}
install -m 644 %{S:12} $RPM_BUILD_ROOT/%{_fwdefdir}/svnserve
#
#useless libtool stuff
rm -f %{buildroot}%{_libdir}/*.la
%clean
rm -rf $RPM_BUILD_ROOT
%preun
%stop_on_removal svnserve
%post
%{fillup_and_insserv -n svnserve svnserve}
%{run_ldconfig}
/sbin/ldconfig
%postun
%restart_on_update svnserve
%{insserv_cleanup}
/sbin/ldconfig
%post -n subversion-python -p /sbin/ldconfig
@@ -355,7 +361,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libsvn_repos*.so.*
%{_libdir}/libsvn_subr*.so.*
%{_libdir}/libsvn_wc*.so.*
%doc %{_mandir}/man?/svn*
%{_mandir}/man?/svn*
#
/usr/share/emacs
@@ -378,10 +384,9 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root)
%dir /usr/include/subversion-1
%dir %{_includedir}/subversion-1
%{_libdir}/libsvn_*.so
%{_libdir}/libsvn*.la
/usr/include/subversion-1/*
%{_includedir}/subversion-1/*
%files tools
%defattr(-,root,root)
@@ -398,6 +403,14 @@ rm -rf $RPM_BUILD_ROOT
%{apache_libexecdir}/mod_authz_svn.*
%changelog
* Thu Dec 13 2007 - mrueckert@suse.de
- remove openldap2-devel from the buildrequires:
subversion itself does not use openldap. the missing dependency
in libapr-util1 was added there.
* Tue Nov 27 2007 - crrodriguez@suse.de
- neon-config should be called with --libs instead of --la-file
in order to fix build with recent neon package
- fix -devel package dependencies
* Mon Nov 26 2007 - olh@suse.de
- update to rev 28023
various bugfixes