Accepting request 595927 from home:AndreasStieger:branches:devel:tools:scm:svn
- Apache Subversion 1.10.0 Alpha3 - dropped patches: * subversion-1.8.11-autocheck-time.patch, upstream * subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required OBS-URL: https://build.opensuse.org/request/show/595927 OBS-URL: https://build.opensuse.org/package/show/devel:tools:scm:svn/subversion?expand=0&rev=263
This commit is contained in:
committed by
Git OBS Bridge
parent
91270f3dd4
commit
d15082a604
3
subversion-1.10.0-alpha3.tar.bz2
Normal file
3
subversion-1.10.0-alpha3.tar.bz2
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ac6c8e56a2fd505579c21c7ccb335eb2f89356bc90971ed9fe6f752f6100cc3d
|
||||
size 8419244
|
75
subversion-1.10.0-alpha3.tar.bz2.asc
Normal file
75
subversion-1.10.0-alpha3.tar.bz2.asc
Normal file
@@ -0,0 +1,75 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIrBAABCAAdFiEEbrYLY3zlrL8kSaLa2yfpl0Ka8gwFAllvbz0ACgkQ2yfpl0Ka
|
||||
8gwIuA+7B9ikMlzQOZO6TvOKi6EuYs0eX96kCvbfNpKASTxKnnCHgIaOyEIAQiXA
|
||||
OPNeMsrRrmypk4AjODHzMrhQNGzZ3k4JEzbpzmVspDM6bQo2ULjZLzXXAxopPul6
|
||||
AJFUkG+E5gwh0JDcnIbXYX9DSxEWziO664pRuKLfuZRVJn8PPdo1zT2OTrEo5391
|
||||
5qhcl1h956AJfUOvhqkI3VsTUIbTMezO+NNl+doOIccXByrv28irXzmLnSA8TbVm
|
||||
5mGaV52kUavGqoxxsBAQUFIqYuh3eenQSTBBXt+KLbtu0fDKkYqS/Zezek3qrBzL
|
||||
k8FM8I96nDg8RaK+ngaKCXLzxei+2xkc4q88Dd5diJUdITtu+f2qFf6o5n2aJMjA
|
||||
rpKl0s/7Lqmjfm/C2xAhndyE/rbFUrwMWnthCv29bgi6UNdvtI7sTD5tes8N3+jY
|
||||
j9pOsRSI5cY4YGGTOZxEx4EuQnl7gyxEKUqAxYTzZsIqKCS55K+GRfNMyH2AMA4Y
|
||||
uMM1vmPghIJGUcHk2W3PIy8fJox/+AvsmgPH3UyiffxzBeUMowvHldEFsjOS829A
|
||||
8dW8YexYvHpccTRHUMqONrg+rTqV9H3oLn7XaauitI5OcyrLXhYduILXGOkvF5oX
|
||||
yv2TSWbHOPslNicQzLvVpEAXFOwkJPuFwrlrvQmw
|
||||
=6bjd
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v1
|
||||
|
||||
iQIcBAABAgAGBQJZb9WbAAoJEJnsdBtXkhrMG6gP/i+NkDB/6+iCVxh3Bmp9LiQb
|
||||
d7gNrdEu4nJx+/w9lhfTTVIYh/AhdMJ1aYUNKjLnFvGSZbnVsV1iGVDalLB6tKbG
|
||||
9R1AG079fUJt3OfLXYD07ay8FO8IN9D2xu4Sx5Eq3ntayDv7R3o7fiF8tEU/qlYw
|
||||
yscqYEZDxZIN/sTbyNhrpB6q1LBH3yHezSCwRhk4Ps57Do/2JpXGiilCDKUDKovc
|
||||
s2j0vDqKLeEnGukX0CXJbgyCQ+tTsO0SvjrfHXr2lj+aVjaiwBw7Z5QOSJQLIbmj
|
||||
sCDZicNEP1FAYS108M1QiRPBGGFdpPPnqvJ4WxfxGO7R/YnEC4vkdcK9zXSwdMUG
|
||||
KJ1aAyib8jTKtMzhYwvkMwUOMkj2fNmw+Lo7OvfILRZXYzOdxJhVc2su0Qi/1ZQT
|
||||
pZo23NOXaQTJhQfquBMW4fCxAt1SWuLFkrT8gZl5EU6GBHus3FsNQPiiWslf+w3+
|
||||
e0mdSG1NMrBudJw8+oLMf2WlHXAmLie5icZTVijzwFffV7eV8v8J7U4cq/pf/Ayl
|
||||
4/DHaYCjYo8C0cuoOQiuEM/2Lpi5Rwc6f2gCFRZZhryK5Vs6Qa3syVOJ4MS9oFEJ
|
||||
1E0E63wPOgUO/ReVSCMkXpCmHiwPCvsc/HpjLyLliuP6Bj88KyQvSk6yB6RJQCJ7
|
||||
3Q8/OyuOQzR+7mLFN+DR
|
||||
=CZD2
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABCgAGBQJZcM1pAAoJEBvKZYajR5Q/iSEP/jDgWCM/trossOkjSjOqXkNr
|
||||
4Opa8vyRG+50ff50IRC8ae/YGsoZl+eAYNbAFIPpPAdaC0BLHcP33hAAsHQZrRvI
|
||||
5NvLeq2J9pa5PW5R4fISPm+JGt2r/t3HBbEnY4yRIVvqxlBNgS8RRWzpvSq3E1yE
|
||||
QlkH3CJsCUwSmD0ATdAAnF0CJ3NwNcMajaag3DZeqbZB12NveLlu/nFfL9M0v5vB
|
||||
JkPymjxU8U/J57QllYKEifLyoX6wXALBW/6nnBSqDmf/Yqx/19yjj+1irUltc9s7
|
||||
5OSod1VFmfip7SS13rdPNktI7UVt8MeUBHszbA5mYSEgRTQc7VTcjjbcwl9UYSMN
|
||||
91NA2jCRJPeK5r5KC7Mq6Y7g92gCskliHawiZVbqqFiXpdnUxERcvBlfIbayJjDZ
|
||||
fahk02AktY+5jP8Qka52J4EYpxXvlNZzrPLqh9qLre0WXJ8YWwc+SMC2fKiZjB5U
|
||||
0UTE9ki/WQJuMkdjWQqtgXZq5LnI5NIPGe9t7aioRCoGKAojRsrop0EH/VKml8L3
|
||||
qL5X23V1lnw5n0yxdZ5qqM63kL9WJ71Gs1hbGsBfadWBFnyIxU/yyFM2Z7+RH/Uw
|
||||
JZy7Y68b3MhI8QxpAqE+bZJ8M1S+G4n2Cg8zDKn/q/m0JLOog1Is1R+AzzD9EQ1i
|
||||
3y5bQOOk/bzPww1JJWXM
|
||||
=akUz
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEcBAABAgAGBQJZccvbAAoJEE99uqmaWblz/pgH/jJ/KUYOaNSzp9Qv4OnWMWaW
|
||||
O2hFtC/Q0c0cbWW2u5RxbR6dAMBX2czz+6jtH6z2UEs+jXVrXOAhojL6ZpJm7Bbu
|
||||
GNo9/CQZNHzLChmty6vOPoXjFsnmmz5EIpHPG9KxeULUlUYmzIgrBC1GR37q0yUz
|
||||
PlLpxJrfq93j57KNIdwj46cPRalH6Ha0A+hlUZlyLFG0aRR5jqry6hN5/hzD0WmI
|
||||
bkPhOCRZHXXmh4OJEw04aRJZoGO6tXjmjtHAC/uiaGbm/JWMD45v8b5XLrRKYPWS
|
||||
m8Y7F8/weNLJkWkunh6T8XF+4RciPqAZkUhtJDZ52Zj2Y5KsF3l6AHwXYfaqzuM=
|
||||
=cvW4
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIcBAABAgAGBQJZdwXBAAoJEMSmxiXMyOHfDUAP/03avJDYzZITXd/GlO1vNEyK
|
||||
HMFXRBK4+8ntYmfWAvmSPqN2xnjAMo9bjLwPR2M1ed9Ccq89zmRFwOYtvtCADv8h
|
||||
wOUYj3SlTVrFfiewIN5HBNblLfWeD+Yl2wqMUsBGB88xwWPNb6Mc5k6+CXgGx8fi
|
||||
PDuRJuv5hzsLwVCk7LbFNPd8CRaGBcW/TMfaPHmWtUH76/39Xg5fjGghq908Ez62
|
||||
/nLx4o9btb2nX+ZcuDrOo5LWxLYVgNaHD0FbS2Tb2GEAcCnunTslktAFJ0sSdJXl
|
||||
Zd/GsazKPqenlgX/0RgQ05K6uYZONsI91uIae7Lf4yWif+tmO3upKfyy4HYpBPy3
|
||||
KIgN5q/BzkeB+JLUBRtAZnX5R4GgV+K+Gidp+Q7Lx9hl2vuN8dt9GwAbDAwHzEhP
|
||||
+0jXd4NluFrS1aCdj90/rfZRY0bQs5HwQoCDu+4QJ0t+4Hk3lu/df5KRWy/1Y0Co
|
||||
4VdKb64+pAHpVyWXMpR41hHADyAsyV4VArdFPSJpLur4F7h5q1wMzcy4CkFVEpTB
|
||||
8QlI7qllu9+UY5J9ckygAv/Dk6n7OnAAQTQUe/8xi12fz+oQOei6dvpWAOp4On1F
|
||||
AwYWBn6+7M00UIkbysA4HrpDoLm6Y5O18BxFh/76zokR/6Fz7WqFuHDJA19M1ghu
|
||||
wkDQEQZ11ol2wyTwpaPv
|
||||
=XtnK
|
||||
-----END PGP SIGNATURE-----
|
@@ -12,13 +12,13 @@ patch by David Kimdon <dwhedon@debian.org>. The basic theory is:
|
||||
build/generator/gen_base.py | 3 ++-
|
||||
3 files changed, 11 insertions(+), 8 deletions(-)
|
||||
|
||||
Index: subversion-1.9.0-beta1/Makefile.in
|
||||
Index: subversion-1.10.0-alpha2/Makefile.in
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/Makefile.in 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/Makefile.in 2015-03-06 23:33:25.000000000 +0100
|
||||
@@ -255,10 +255,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
|
||||
COMPILE_GMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GMOCK_INCLUDES) -o $@ -c
|
||||
COMPILE_CXXHL_GMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GMOCK_INCLUDES) -o $@ -c
|
||||
--- subversion-1.10.0-alpha2.orig/Makefile.in 2017-02-24 15:56:33.957214744 +0100
|
||||
+++ subversion-1.10.0-alpha2/Makefile.in 2017-02-24 15:56:33.985214981 +0100
|
||||
@@ -256,10 +256,10 @@ COMPILE_CXXHL_CXX = $(LT_COMPILE_CXX) $(
|
||||
COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
|
||||
COMPILE_CXXHL_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX) $(CXXHL_INCLUDES) $(GOOGLEMOCK_INCLUDES) -o $@ -c
|
||||
|
||||
-LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(libdir)
|
||||
-LINK_LIB = $(LINK) $(LT_SO_VERSION)
|
||||
@@ -31,7 +31,7 @@ Index: subversion-1.9.0-beta1/Makefile.in
|
||||
|
||||
# special link rule for mod_dav_svn
|
||||
LINK_APACHE_MOD = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS) -rpath $(APACHE_LIBEXECDIR) -avoid-version -module $(APACHE_LDFLAGS)
|
||||
@@ -837,7 +837,9 @@ $(SWIG_PL_DIR)/native/Makefile.PL: $(SWI
|
||||
@@ -845,7 +845,9 @@ $(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
|
||||
@@ -42,11 +42,11 @@ Index: subversion-1.9.0-beta1/Makefile.in
|
||||
|
||||
# There is a "readlink -f" command on some systems for the same purpose,
|
||||
# but it's not as portable (e.g. Mac OS X doesn't have it). These should
|
||||
Index: subversion-1.9.0-beta1/build.conf
|
||||
Index: subversion-1.10.0-alpha2/build.conf
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/build.conf 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/build.conf 2015-03-06 23:32:05.000000000 +0100
|
||||
@@ -561,7 +561,7 @@ lang = python
|
||||
--- subversion-1.10.0-alpha2.orig/build.conf 2017-02-20 12:52:46.000000000 +0100
|
||||
+++ subversion-1.10.0-alpha2/build.conf 2017-02-24 15:56:33.985214981 +0100
|
||||
@@ -567,7 +567,7 @@ lang = python
|
||||
path = subversion/bindings/swig/python/libsvn_swig_py
|
||||
libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
|
||||
apriconv apr python swig
|
||||
@@ -55,7 +55,7 @@ Index: subversion-1.9.0-beta1/build.conf
|
||||
install = swig-py-lib
|
||||
# need special build rule to include -DSWIGPYTHON
|
||||
compile-cmd = $(COMPILE_SWIG_PY)
|
||||
@@ -586,7 +586,7 @@ type = swig_lib
|
||||
@@ -592,7 +592,7 @@ type = swig_lib
|
||||
lang = ruby
|
||||
path = subversion/bindings/swig/ruby/libsvn_swig_ruby
|
||||
libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
|
||||
@@ -64,11 +64,11 @@ Index: subversion-1.9.0-beta1/build.conf
|
||||
install = swig-rb-lib
|
||||
# need special build rule to include
|
||||
compile-cmd = $(COMPILE_SWIG_RB)
|
||||
Index: subversion-1.9.0-beta1/build/generator/gen_base.py
|
||||
Index: subversion-1.10.0-alpha2/build/generator/gen_base.py
|
||||
===================================================================
|
||||
--- subversion-1.9.0-beta1.orig/build/generator/gen_base.py 2015-03-06 23:32:00.000000000 +0100
|
||||
+++ subversion-1.9.0-beta1/build/generator/gen_base.py 2015-03-06 23:32:05.000000000 +0100
|
||||
@@ -497,7 +497,7 @@ class TargetLinked(Target):
|
||||
--- subversion-1.10.0-alpha2.orig/build/generator/gen_base.py 2016-03-16 03:57:40.000000000 +0100
|
||||
+++ subversion-1.10.0-alpha2/build/generator/gen_base.py 2017-02-24 15:56:33.985214981 +0100
|
||||
@@ -591,7 +591,7 @@ class TargetLinked(Target):
|
||||
self.install = options.get('install')
|
||||
self.compile_cmd = options.get('compile-cmd')
|
||||
self.sources = options.get('sources', '*.c *.cpp')
|
||||
@@ -77,7 +77,7 @@ Index: subversion-1.9.0-beta1/build/generator/gen_base.py
|
||||
|
||||
self.external_lib = options.get('external-lib')
|
||||
self.external_project = options.get('external-project')
|
||||
@@ -550,6 +550,7 @@ class TargetExe(TargetLinked):
|
||||
@@ -645,6 +645,7 @@ class TargetExe(TargetLinked):
|
||||
extmap = self.gen_obj._extension_map
|
||||
self.objext = extmap['exe', 'object']
|
||||
self.filename = build_path_join(self.path, name + extmap['exe', 'target'])
|
||||
|
@@ -1,88 +0,0 @@
|
||||
------------------------------------------------------------------------
|
||||
r1665652 | astieger | 2015-03-10 20:19:04 +0100 (Tue, 10 Mar 2015) | 13 lines
|
||||
Changed paths:
|
||||
M /subversion/trunk/subversion/tests/cmdline/davautocheck.sh
|
||||
M /subversion/trunk/subversion/tests/cmdline/svnserveautocheck.sh
|
||||
|
||||
Follow-up to r1421594: Fix (svnserve|dav)autocheck when time is only a
|
||||
built-in.
|
||||
|
||||
Some shells do not treat variable contents as a keyword, which in the
|
||||
case of time makes the script fail if it is a built-in but not a
|
||||
command.
|
||||
|
||||
* subversion/tests/cmdline/svnserveautocheck.sh,
|
||||
subversion/tests/cmdline/davautocheck.sh:
|
||||
Turn TIME_CMD into a function.
|
||||
|
||||
Approved by: breser, danielsh
|
||||
|
||||
------------------------------------------------------------------------
|
||||
Index: trunk/subversion/tests/cmdline/svnserveautocheck.sh
|
||||
===================================================================
|
||||
--- trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665651)
|
||||
+++ trunk/subversion/tests/cmdline/svnserveautocheck.sh (revision 1665652)
|
||||
@@ -92,11 +92,7 @@
|
||||
fi
|
||||
}
|
||||
|
||||
-if type time > /dev/null; then
|
||||
- TIME_CMD=time
|
||||
-else
|
||||
- TIME_CMD=""
|
||||
-fi
|
||||
+if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi
|
||||
|
||||
MAKE=${MAKE:-make}
|
||||
|
||||
@@ -121,13 +117,13 @@
|
||||
|
||||
BASE_URL=svn://127.0.0.1:$SVNSERVE_PORT
|
||||
if [ $# = 0 ]; then
|
||||
- $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL"
|
||||
+ TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL"
|
||||
r=$?
|
||||
else
|
||||
cd "$ABS_BUILDDIR/subversion/tests/cmdline/"
|
||||
TEST="$1"
|
||||
shift
|
||||
- $TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $*
|
||||
+ TIME_CMD "./${TEST}_tests.py" "--url=$BASE_URL" $*
|
||||
r=$?
|
||||
cd - > /dev/null
|
||||
fi
|
||||
Index: trunk/subversion/tests/cmdline/davautocheck.sh
|
||||
===================================================================
|
||||
--- trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665651)
|
||||
+++ trunk/subversion/tests/cmdline/davautocheck.sh (revision 1665652)
|
||||
@@ -596,13 +596,8 @@
|
||||
exit
|
||||
fi
|
||||
|
||||
+if type time > /dev/null ; then TIME_CMD() { time "$@"; } ; else TIME_CMD() { "$@"; } ; fi
|
||||
|
||||
-if type time > /dev/null; then
|
||||
- TIME_CMD=time
|
||||
-else
|
||||
- TIME_CMD=""
|
||||
-fi
|
||||
-
|
||||
MAKE=${MAKE:-make}
|
||||
|
||||
say "starting the tests..."
|
||||
@@ -620,13 +615,13 @@
|
||||
fi
|
||||
|
||||
if [ $# = 0 ]; then
|
||||
- $TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR
|
||||
+ TIME_CMD "$MAKE" check "BASE_URL=$BASE_URL" $SSL_MAKE_VAR
|
||||
r=$?
|
||||
else
|
||||
(cd "$ABS_BUILDDIR/subversion/tests/cmdline/"
|
||||
TEST="$1"
|
||||
shift
|
||||
- $TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@")
|
||||
+ TIME_CMD "$ABS_SRCDIR/subversion/tests/cmdline/${TEST}_tests.py" "--url=$BASE_URL" $SSL_TEST_ARG "$@")
|
||||
r=$?
|
||||
fi
|
||||
|
@@ -1,31 +0,0 @@
|
||||
From: Andreas Stieger <andreas.stieger@gmx.de>
|
||||
Date: Wed, 07 May 2014 20:55:04 +0100
|
||||
Subject: Allow building against blacklisted Apache httpd 2.4.6
|
||||
References: [bnc#864308]
|
||||
Upstream: no
|
||||
|
||||
Apache httpd in openSUSE 13.1 is 2.4.6. The mod_dav in this version
|
||||
is problematic for Apache Subversion and it is blacklisted in via
|
||||
configure macros in the 1.8.9 release of svn and up.
|
||||
|
||||
The relevant patches have been applied to the apache2 package in
|
||||
openSUSE:13.1:Update and the update has been released, [bnc#864308].
|
||||
This patch enables building Subversion against this fixed package.
|
||||
|
||||
---
|
||||
build/ac-macros/apache.m4 | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
Index: subversion-1.9.1/build/ac-macros/apache.m4
|
||||
===================================================================
|
||||
--- subversion-1.9.1.orig/build/ac-macros/apache.m4 2015-09-03 15:13:26.505496972 +0200
|
||||
+++ subversion-1.9.1/build/ac-macros/apache.m4 2015-09-03 15:14:20.843043405 +0200
|
||||
@@ -102,7 +102,7 @@ if test -n "$APXS" && test "$APXS" != "n
|
||||
HTTPD_PATCH=`$SED -ne '/^#define AP_SERVER_PATCHLEVEL_NUMBER/p' "$APXS_INCLUDE/ap_release.h" | $SED -e 's/^.*NUMBER *//'`
|
||||
HTTPD_VERSION="${HTTPD_MAJOR}.${HTTPD_MINOR}.${HTTPD_PATCH}"
|
||||
case "$HTTPD_VERSION" in
|
||||
- 2.2.25 | 2.4.[[5-6]])
|
||||
+ 2.2.25 | 2.4.5)
|
||||
AC_MSG_RESULT([broken])
|
||||
AC_MSG_ERROR([Apache httpd version $HTTPD_VERSION includes a broken mod_dav; use a newer version of httpd])
|
||||
;;
|
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c3b118333ce12e501d509e66bb0a47bcc34d053990acab45559431ac3e491623
|
||||
size 7881909
|
@@ -1,54 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIrBAABCAAdFiEEbrYLY3zlrL8kSaLa2yfpl0Ka8gwFAlmF8r4ACgkQ2yfpl0Ka
|
||||
8gyd0A+/dd2ZvDzZIJitLIAXU0TunXaN7NXSDP/VMACIbrbcC04juokneVDV5/TA
|
||||
lTNEvxyiKHmuL5xTMZk3e2XgYIhA9SGHQapHq+nGhIhkN3EoP/biAoQIh9IaWbSi
|
||||
OmHmEyJKLUrv9YHnJBDusF6z8JF271AK/f+z+CkvmaW0gJ7a7oH41gg6/JI00/DR
|
||||
pbQeqvUuIP28+AbslTSBw7Her1ZhujDydHOw71US6WwXwtwDXTwSWTzGMOBnPHH3
|
||||
4FbH6MkI/cDDM4sOaqQrbEG8x4fYZI9AZ7h+v/8Ba+osxVkRAs6S6l2Srd9FSJnr
|
||||
BdVBWnvlOTaEj4BvnsqnDOA0geF9EmZhigkcBY8qFb5kp4ao7AwILavpl1Fn6r2F
|
||||
8tJzDx7IBoYxp9EGuUNZvB15yMgQkUUiX/8mnlp6baXUogoUPJhSgCn/znL0SGp5
|
||||
xzhA5AbTkPZZlxwr5Iwe5fvw66Ip9pNsx6eCTPDrAjVywxCSbstsDbn/hPQYNuhl
|
||||
H1pPfChHkSeF/typy3oWgXHS7R+rRHry/Qx/8c0IPdN+9FB1w5q/v+baOWt7hU6o
|
||||
iGaTLBth7rEgJlJorCXUo6OxykRpF1D9iloAp3TJOoEnqOuMll07j9Ua15IjibVo
|
||||
nCj9/qHCfeZ1Xg72IV+TF2KKoghryKcG5GMSVhrK
|
||||
=vy8Y
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCAAdFiEEqER5D7V0NgbulZIHdteI4e0aWZwFAlmIUakACgkQdteI4e0a
|
||||
WZzNIwf/Zro4sQeshagnhHhJL4Ob0G+nFEApZ0B0JMj49yQv/DeylaVPvjjU+4pk
|
||||
76vMUyDFvHzauISSM0tjIbEgeqm2fKRgrCQSDjBpkijvmU1+HRAkskcDapiz9n4C
|
||||
nkxdL+/TMjv7d55AcLyNrl+BpgRX66yzPhnl5JnbUu/4mYMr8MnYF/o/b05uk4n1
|
||||
8yoU+joJKnaoObvJhXomjmo4JYYFegTO4JksgS1pZJ7oe8q9FIB9k9uLv3n0O2Za
|
||||
YoR7B4CTxqELh+Lz2HxmlMJByx9NrR5W30kMoszcTVdktqDG3DQH0S0/H8GMEAbU
|
||||
bJF3RNbxFixIzSKGK091JRMERtCOrg==
|
||||
=ofDa
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
Version: GnuPG v2
|
||||
|
||||
iQIcBAABCgAGBQJZiD7sAAoJEDdqPP0RCxyV5B4P+wTVFyAbJQLj/m7AfvRq+A0R
|
||||
DzfEstGS5MfDY8w+kA1Ge4EkT+uBiH4z1ZH1SJam0ci7Dr8ThB31IZtXQs3Na20C
|
||||
h5GJdIMsmEi+H5Sa7X636dlhs7yC8cVI8yFpH6tWtRNcFcrozRpG2YAzRDT2z2gt
|
||||
p6s1acgCTDpefUi2+3e+P598WX8Sf33ORzLGgYiiHyp4426ygpICzR3LFrkOBxC8
|
||||
TwBX17W4ZcOgHSENcvfOi+3TFy4LNA0OK+fL+eUJ4ZzLWWzfk1qpR8q8RQuHjRRB
|
||||
GNd2unLiq723DYjCbB/0jnN1lULSRFdnJPNuGBEQAxfrzsDtyvQ++/nYxPOcsRCL
|
||||
XtN5mxFCL2kA9WAQL167agkqEfKjHlUquyGcmDLyIHYwPm7Xc1VFRBDUZNpGJ2a6
|
||||
/8USss78dIjnbXrABCLd+Dc0qCSpETvE4LSxNQaF1cQzZGk7Wnt/xxSvJs0XRGUO
|
||||
DIgIdtBbecSiQj1JmS3O6DvzLkTxwfAZ3KZT2JDjeu2L8mdmO+O2kcyvdJcJE0J9
|
||||
fUxzzzwk1S/GHX74DtPMnOPsetD1TuNeK5/fAVcEvLW9Ey+5wbOuISUOgvZuE875
|
||||
A8sE9zMQfXqxT8IBZ+h6pxjK8rJqgh/rOGXzSNrHASyw0pChcp4KnVtx6OYClwrE
|
||||
hwqSlsJ3AzNKpuiDKi26
|
||||
=qVpp
|
||||
-----END PGP SIGNATURE-----
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEcBAABAgAGBQJZiVoZAAoJEE99uqmaWblzjp0H/iKFBfjKmKlJslnjDVT2KOFr
|
||||
pECP0xKYJmvXySfohqBYi9hKrOjYoJTHvqWTsEmWSVUhLuopNgK7MUkJkaicGX/X
|
||||
pJ3L+LLDLrGJknoED5rBntQXpNQiF5B66v4GxRudRlY+IREBEl9EQD3Kun5755eV
|
||||
/9Rq3LAAk6m4vTmN/jHcd0vV+ecJaIxSSKbr7ItQnor+5ef4mMvp1BlKIiMJitse
|
||||
019de7R1emxijjxUGsu2g8pTwmVf8RegoxCY9K6o/WEuly+bk7njYXbrnxQXfT45
|
||||
IXF1LKO0+5BFJcM4/GfUCthVjBrL2mChRT3z2SjxSnd3Qn4jh3lyx+cp58BHRL8=
|
||||
=IR/q
|
||||
-----END PGP SIGNATURE-----
|
@@ -1,19 +1,21 @@
|
||||
diff -urN subversion-1.8.10.old/Makefile.in subversion-1.8.10/Makefile.in
|
||||
--- subversion-1.8.10.old/Makefile.in 2014-08-19 14:05:55.226069730 +0200
|
||||
+++ subversion-1.8.10/Makefile.in 2014-08-19 14:55:21.696069376 +0200
|
||||
@@ -791,7 +791,7 @@
|
||||
if test "`$(READLINK_PL) $(SWIG_PL_DIR)`" != "`$(READLINK_PL) $(SWIG_PL_SRC_DIR)`"; then \
|
||||
ln -sf $(SWIG_PL_SRC_DIR)/native/*.c $(SWIG_PL_DIR)/native; \
|
||||
Index: subversion-1.10.0-alpha2/Makefile.in
|
||||
===================================================================
|
||||
--- subversion-1.10.0-alpha2.orig/Makefile.in 2017-02-24 15:57:25.605638431 +0100
|
||||
+++ subversion-1.10.0-alpha2/Makefile.in 2017-02-24 15:57:25.617638527 +0100
|
||||
@@ -865,7 +865,7 @@ swig-pl: $(swig-pl_DEPS)
|
||||
fi; \
|
||||
done; \
|
||||
fi
|
||||
- cd $(SWIG_PL_DIR)/native; $(MAKE) OPTIMIZE="" OTHERLDFLAGS="$(SWIG_LDFLAGS)"
|
||||
+ cd $(SWIG_PL_DIR)/native; $(MAKE)
|
||||
|
||||
check-swig-pl: swig-pl swig-pl-lib
|
||||
cd $(SWIG_PL_DIR)/native; $(MAKE) test
|
||||
diff -urN subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||
--- subversion-1.8.10.old/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:05:55.198069730 +0200
|
||||
+++ subversion-1.8.10/subversion/bindings/swig/perl/native/Makefile.PL.in 2014-08-19 14:41:23.190069476 +0200
|
||||
@@ -86,7 +86,7 @@
|
||||
Index: subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in
|
||||
===================================================================
|
||||
--- subversion-1.10.0-alpha2.orig/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.561638078 +0100
|
||||
+++ subversion-1.10.0-alpha2/subversion/bindings/swig/perl/native/Makefile.PL.in 2017-02-24 15:57:25.617638527 +0100
|
||||
@@ -85,7 +85,7 @@ my %config = (
|
||||
" -I$svnlib_builddir",
|
||||
" -I$swig_srcdir -g"),
|
||||
OBJECT => q/$(O_FILES)/,
|
||||
|
@@ -1,3 +1,12 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 12 08:45:18 UTC 2018 - astieger@suse.com
|
||||
|
||||
- Apache Subversion 1.10.0 Alpha3
|
||||
testing only, not suitable for production
|
||||
- dropped patches:
|
||||
* subversion-1.8.11-autocheck-time.patch, upstream
|
||||
* subversion-1.9.0-allow-httpd-2.4.6.patch, no longer required
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 12 08:19:41 UTC 2018 - tchvatal@suse.com
|
||||
|
||||
|
54604
subversion.keyring
54604
subversion.keyring
File diff suppressed because it is too large
Load Diff
@@ -33,16 +33,17 @@
|
||||
%if ! %{defined _fillupdir}
|
||||
%define _fillupdir %{_localstatedir}/adm/fillup-templates
|
||||
%endif
|
||||
%define tarversion 1.10.0-alpha3
|
||||
%bcond_without python_ctypes
|
||||
%bcond_with all_regression_tests
|
||||
Name: subversion
|
||||
Version: 1.9.7
|
||||
Version: 1.10.0~alpha3
|
||||
Release: 0
|
||||
Summary: Subversion version control system
|
||||
License: Apache-2.0
|
||||
Group: Development/Tools/Version Control
|
||||
URL: https://subversion.apache.org
|
||||
Source0: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2
|
||||
Url: https://subversion.apache.org
|
||||
Source0: https://dist.apache.org/repos/dist/release/subversion/%{name}-%{tarversion}.tar.bz2
|
||||
Source1: subversion.conf
|
||||
Source2: subversion.README.SUSE
|
||||
Source4: contrib-1485350.tar.bz2
|
||||
@@ -53,7 +54,7 @@ Source15: svnserve.tmpfiles
|
||||
Source42: subversion.svngrep.sh
|
||||
Source43: subversion.svndiff.sh
|
||||
Source50: https://people.apache.org/keys/group/subversion.asc#/subversion.keyring
|
||||
Source51: https://www.apache.org/dist/subversion/%{name}-%{version}.tar.bz2.asc
|
||||
Source51: https://dist.apache.org/repos/dist/release/subversion/%{name}-%{tarversion}.tar.bz2.asc
|
||||
Source92: %{name}.rpmlintrc
|
||||
Patch11: subversion.libtool-verbose.patch
|
||||
Patch20: subversion-swig-perl-install_vendor.patch
|
||||
@@ -62,8 +63,6 @@ Patch30: subversion-1.8.0-rpath.patch
|
||||
Patch37: subversion-no-build-date.patch
|
||||
Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch
|
||||
Patch40: subversion-perl-underlinking.patch
|
||||
Patch45: subversion-1.8.11-autocheck-time.patch
|
||||
Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch
|
||||
BuildRequires: apache-rpm-macros
|
||||
BuildRequires: apache2-devel >= 2.2.0
|
||||
BuildRequires: apache2-prefork
|
||||
@@ -78,10 +77,10 @@ BuildRequires: glib2-devel
|
||||
BuildRequires: java-devel >= 1.6.0
|
||||
BuildRequires: junit
|
||||
BuildRequires: krb5-devel
|
||||
BuildRequires: libgnome-keyring-devel
|
||||
BuildRequires: libstdc++-devel
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: pkgconfig(libsecret-1)
|
||||
# Test dependency
|
||||
BuildRequires: python-pysqlite
|
||||
# Python 2.7 or later is required to run autogen.sh
|
||||
@@ -231,7 +230,7 @@ Bash command line completion support for %{name} - completion of subcommands,
|
||||
parameters and keywords for the svn command and other tools.
|
||||
|
||||
%prep
|
||||
%setup -q -a 4
|
||||
%setup -q -a 4 -n %{name}-%{tarversion}
|
||||
%patch11 -p1
|
||||
%patch20 -p1
|
||||
%patch23 -p1
|
||||
@@ -239,8 +238,6 @@ parameters and keywords for the svn command and other tools.
|
||||
%patch37 -p1
|
||||
%patch39
|
||||
%patch40 -p1
|
||||
%patch45 -p1
|
||||
%patch48 -p1
|
||||
|
||||
%build
|
||||
# Re-boot strap, needed for patch37
|
||||
|
Reference in New Issue
Block a user