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=24

Browse Source
This commit is contained in:
OBS User unknown 2008-01-26 16:38:52 +00:00 committed by Git OBS Bridge
parent cc467819bd
commit 7ec036d14e
12 changed files with 24 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
subversion-1.5.x-no-neon-la.patch
View File

@ -1,7 +1,9 @@
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
---
build/ac-macros/neon.m4 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/build/ac-macros/neon.m4
+++ b/build/ac-macros/neon.m4
@@ -143,7 +143,7 @@ AC_DEFUN(SVN_NEON_CONFIG,
test "$svn_allowed_neon" = "any"; then
svn_allowed_neon_on_system="yes"

4
subversion-1.5.x.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b441645960a9637a255f4aff385381a0d3a5f01b6f7812419f6b31e27c395dc6
size 8723273
oid sha256:d5953938f100366c1886aa843c3e4ebcaf1134f8c36edd8e4b730edf279dd3e5
size 8712997

2
subversion-swig-perl-install_vendor.patch
View File

@ -3,7 +3,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -652,7 +652,7 @@ check-swig-pl: swig-pl swig-pl-lib
@@ -653,7 +653,7 @@ check-swig-pl: swig-pl swig-pl-lib
cd $(SWIG_PL_DIR)/native; $(MAKE) test
install-swig-pl: swig-pl install-swig-pl-lib

6
subversion.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jan 26 11:30:54 CET 2008 - olh@suse.de
- update to rev 29054
some of our patches merged
-------------------------------------------------------------------
Tue Jan 22 13:52:08 CET 2008 - schwab@suse.de

2
subversion.java14.patch
View File

@ -5,7 +5,7 @@
--- a/configure.ac
+++ b/configure.ac
@@ -565,7 +565,7 @@ fi
@@ -559,7 +559,7 @@ fi
AC_PATH_PROGS(PYTHON, "$PYTHON", none)
# The minimum version for the JVM runtime for our Java bytecode.

2
subversion.perl.LD_RUN_PATH.patch
View File

@ -5,7 +5,7 @@ clear LD_RUN_PATH, it will end up as RPATH in ELF binaries
--- a/Makefile.in
+++ b/Makefile.in
@@ -643,7 +643,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
@@ -644,7 +644,7 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
./config.status subversion/bindings/swig/perl/native/Makefile.PL
$(SWIG_PL_DIR)/native/Makefile: $(SWIG_PL_DIR)/native/Makefile.PL $(swig-pl_native_Makefile_DEPS)

35
subversion.props.state_pos.patch
View File

@ -1,35 +0,0 @@
subversion/libsvn_wc/props.c: In function 'svn_wc__merge_props':
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
subversion/libsvn_wc/props.c:1166: warning: 'state_pos' is used uninitialized in this function
subversion/libsvn_wc/props.c:1145: note: 'state_pos' was declared here
---
subversion/libsvn_wc/props.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/subversion/libsvn_wc/props.c
+++ b/subversion/libsvn_wc/props.c
@@ -1160,7 +1160,7 @@ set_prop_merge_state(svn_wc_notify_state
svn_wc_notify_state_merged,
svn_wc_notify_state_obstructed,
svn_wc_notify_state_conflicted };
- int state_pos, i;
+ int state_pos = 0, i;
if (! state)
return;

16
subversion.py_req.patch
View File

@ -1,16 +0,0 @@
--- tools/server-side/svn_dav_log_parse.py
+++ tools/server-side/svn_dav_log_parse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.2
+#!/usr/bin/python
# ====================================================================
# Copyright (c) 2008 CollabNet. All rights reserved.
--- tools/server-side/test_svn_dav_log_parse.py
+++ tools/server-side/test_svn_dav_log_parse.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python2.2
+#!/usr/bin/python
# ====================================================================
# Copyright (c) 2008 CollabNet. All rights reserved.

16
subversion.spec
View File

@ -19,7 +19,7 @@ BuildRequires: neon-devel openldap2-devel
%endif
BuildRequires: sqlite-devel
Version: 1.5.0
Release: 33
Release: 35
#
%define _fwdefdir /etc/sysconfig/SuSEfirewall2.d/services
#
@ -45,11 +45,8 @@ Source12: subversion.sysconfig.svnserve.remoteaccess
Source13: subversion.xinetd.svnserve
Source42: subversion.svngrep.sh
Source43: subversion.svndiff.sh
Patch0: subversion.svn_cmdline_init-error_stream.patch
Patch1: subversion.svn_swig_pl_info_receiver.return.patch
#
Patch11: subversion.libtool-verbose.patch
Patch12: subversion.props.state_pos.patch
# build fixes
Patch20: subversion-swig-perl-install_vendor.patch
Patch23: subversion.libtool-pie-flags.patch
@ -60,7 +57,6 @@ Patch33: subversion.header_wrappers.patch
Patch34: subversion.allowed-neon.patch
Patch35: subversion.java14.patch
Patch36: subversion-1.5.x-no-neon-la.patch
Patch37: subversion.py_req.patch
#
%description
@ -152,11 +148,8 @@ case "$swig" in
esac
%setup -q -n subversion-1.5.x
#
%patch0 -p1
%patch1 -p1
#
%patch11 -p1
%patch12 -p1
#
%patch20 -p1
%patch23 -p1
@ -166,8 +159,7 @@ esac
%patch33 -p1
%patch34 -p1
%patch35 -p1
%patch36
%patch37
%patch36 -p1
%build
with_jdk=none
@ -314,6 +306,7 @@ rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/diff
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/po
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/test-scripts
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/buildbot
rm -rf $RPM_BUILD_ROOT/usr/share/subversion/tools/server-side/*svn_dav_log_parse*
#
#
#
@ -422,6 +415,9 @@ rm -rf $RPM_BUILD_ROOT
%{apache_libexecdir}/mod_authz_svn.*
%changelog
* Sat Jan 26 2008 olh@suse.de
- update to rev 29054
some of our patches merged
* Tue Jan 22 2008 schwab@suse.de
- Don't install obsolete vc-svn.
* Mon Jan 21 2008 ro@suse.de

22
subversion.svn_cmdline_init-error_stream.patch
View File

@ -1,22 +0,0 @@
---
subversion/libsvn_subr/cmdline.c | 2 ++
1 file changed, 2 insertions(+)
--- a/subversion/libsvn_subr/cmdline.c
+++ b/subversion/libsvn_subr/cmdline.c
@@ -82,6 +82,7 @@ svn_cmdline_init(const char *progname, F
#pragma convert(1208)
#endif
{
+ if (error_stream)
fprintf(error_stream, "%s: error: cannot open '/dev/null'\n",
progname);
return EXIT_FAILURE;
@@ -92,6 +93,7 @@ svn_cmdline_init(const char *progname, F
/* Ignore any errors encountered while attempting to change stream
buffering, as the streams should retain their default buffering
modes. */
+ if (error_stream)
setvbuf(error_stream, NULL, _IONBF, 0);
#ifndef WIN32
setvbuf(stdout, NULL, _IOLBF, 0);

2
subversion.svn_swig_perl.dep.patch
View File

@ -18,7 +18,7 @@
--- a/Makefile.in
+++ b/Makefile.in
@@ -636,15 +636,16 @@ clean-swig-headers:
@@ -637,15 +637,16 @@ clean-swig-headers:
extraclean-swig-headers: clean-swig-headers
$(EXTRACLEAN_SWIG_HEADERS)

15
subversion.svn_swig_pl_info_receiver.return.patch
View File

@ -1,15 +0,0 @@
---
subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
+++ b/subversion/bindings/swig/perl/libsvn_swig_perl/swigutil_pl.c
@@ -1155,7 +1155,7 @@ svn_error_t *svn_swig_pl_info_receiver(v
swig_type_info *infoinfo = _SWIG_TYPE("svn_info_t *");
if (!SvOK((SV *)baton))
- return;
+ return SVN_NO_ERROR;
svn_swig_pl_callback_thunk(CALL_SV, baton, &result, "sSS", path, info,
infoinfo, pool, POOLINFO);