diff --git a/subversion-1.8.14-httpd-version-number-detection.patch b/subversion-1.8.14-httpd-version-number-detection.patch deleted file mode 100644 index ad17d4f..0000000 --- a/subversion-1.8.14-httpd-version-number-detection.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur subversion-1.8.14.orig/build/ac-macros/apache.m4 subversion-1.8.14/build/ac-macros/apache.m4 ---- subversion-1.8.14.orig/build/ac-macros/apache.m4 Mon Jul 27 02:23:40 2015 -+++ subversion-1.8.14/build/ac-macros/apache.m4 Tue Jul 28 11:08:30 2015 -@@ -164,7 +164,7 @@ - if ! test -e $HTTPD ; then - HTTPD="`$APXS -q bindir`/`$APXS -q PROGNAME`" - fi -- HTTPD_VERSION=["`$HTTPD -v | $SED -e 's@^.*/\([0-9.]*\)\(.*$\)@\1@ ; 1q'`"] -+ HTTPD_VERSION=["`$HTTPD -v | $SED -e 's/^.*Apache\/\([0-9.]*\).*$/\1/' -e 1q`"] - AC_ARG_ENABLE(broken-httpd-auth, - AS_HELP_STRING([--enable-broken-httpd-auth], - [Allow building against httpd 2.4 with broken auth]), diff --git a/subversion-1.9.0-allow-httpd-2.4.6.patch b/subversion-1.9.0-allow-httpd-2.4.6.patch index 7441c85..8f9a975 100644 --- a/subversion-1.9.0-allow-httpd-2.4.6.patch +++ b/subversion-1.9.0-allow-httpd-2.4.6.patch @@ -16,16 +16,16 @@ 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.0-alpha2/build/ac-macros/apache.m4 +Index: subversion-1.9.1/build/ac-macros/apache.m4 =================================================================== ---- subversion-1.9.0-alpha2.orig/build/ac-macros/apache.m4 2013-11-26 22:18:56.000000000 +0100 -+++ subversion-1.9.0-alpha2/build/ac-macros/apache.m4 2015-01-24 14:55:32.000000000 +0100 -@@ -128,7 +128,7 @@ if test -n "$APXS" && test "$APXS" != "n - AC_MSG_CHECKING([mod_dav version]) - old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $SVN_APR_INCLUDES" -- blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[56]\")"] -+ blacklisted_versions_regex=["\"2\" \"\.\" (\"2\" \"\.\" \"25\"|\"4\" \"\.\" \"[5]\")"] - AC_EGREP_CPP([apache_version= *$blacklisted_versions_regex], - [ - #include "$APXS_INCLUDE/ap_release.h" +--- 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]) + ;; diff --git a/subversion-1.9.0.tar.bz2 b/subversion-1.9.0.tar.bz2 deleted file mode 100644 index 839127d..0000000 --- a/subversion-1.9.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fcb11db07e132cac6c72a969e222a592f849ef34dd8bd1c2f99fa1ad267a3fe6 -size 7743404 diff --git a/subversion-1.9.0.tar.bz2.asc b/subversion-1.9.0.tar.bz2.asc deleted file mode 100644 index ca3afc5..0000000 --- a/subversion-1.9.0.tar.bz2.asc +++ /dev/null @@ -1,91 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG/MacGPG2 v2.0.19 (Darwin) -Comment: GPGTools - http://gpgtools.org - -iQIcBAABCgAGBQJVtewiAAoJEBvKZYajR5Q/HuEP/A+Kbyt7W2Yf6/sXyH3BgvA3 -ydOescotK0m+opQBGFjyYsR14FYqPyR6d1GENBAE9SaZ3Kzl0C+fFy+d17DWcmin -MnWdfjabMYj33mKzaX5+uWFzGxfVbyG5TYEp2ZbcolGhmcZpmbO+DNLjCgGICH1i -T57UBfRY06srXiBPjwMdPSY1ztoyTQsx35MXsQ/I9owZfMQYUqU3eh3GYVkaZl7K -9iq294i2Q0TVwrrABup9BmHLmdQAkIJLZENJ65WLEGDBWwogiCoJyCCryV1U07j7 -W+4IqgkNwQ79YTwfjRI3ZuuT+cS72J++th0OnCFtetpQJp+KDA7mOoMYK19wnVIX -uUyLWV/z+0stJJST7QelHQEjYZX8zsjj/rRnrU7nyH5RYzNtkHaq24VuP14ca3WN -45OASWQkHMZtP453M4Yr0FVpxpOlhaJNePrPT+IfwE2057eCfQFWPRL75qPWneMt -iYbhFYojh2uEeLO1x+bVzH8K80GIkEGUJuRXk5ovOgOCjcENzhiRGXaravosxd8H -n4937gk6TrA+vY6XQubUZi55bqVhHW8PFl8OjkNQZ0a9krMjIS8I+zI3ntbP4lbY -URhqYJIgBRf8jN6mwAxtTY34V/2ethoPkAsr+ndM43HCgciTuE4y999Lk9D4SRsi -o7eUZZKP/QT4JKuxmcmq -=qfd2 ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVtk3aAAoJEJnsdBtXkhrMEEkQALc9MZEO9eX7wMZZb/GOzoPI -BmNOYmPqsNW5uOstoouhy1FQoDxCM8+tYx26H5sDxMDLtyqMieNKAAZo1biJl7nl -33LH8+Lnc5gd8PkvfeKLs/ofsTLlNDyJ0e0iQKhzeHyuWvjEwh5ATINukEMsxmXV -qRSPPrzpV5ymONZtJXXu29+4qY0N6KK//QdGau3b60UsU9mxK9JrUkdKOiYoNDhr -5MWRIx+ImVuP9m25a5InvlF4Zn5RPZlREGUW/8hfRSrqHzzPkmoeQLqG43pp2v9Q -U2p0Ss3OKmjajimdz9kw2419wXkJKw5leQFfETOKj5jTG5R96Eyvqmf2Uq7eVzZi -sReO1csokv/uk/uhOgtY2XKO/JUWfE75hruzoiKgJ1GQ0mVu9Vpi4xpzg4pHEUCh -oN3SKFs53tPkygAtVXr8QRce9/P5KNRPZ1o7g9wWKihDkM1WbMbHRRaftgqJWJpK -qsCV2KD2j4P3noidmcIxynxJFkJBfUy1zKpmHB+JlF5PRCaBLQXk+Tz9rD8YEeFU -3jrYdOpJMZaalsv8BNCSk8McMpLbzpTBFCCzUfIl/doVcUGaPIVey/Zm3ADphaaM -aOSQjEXkqwWie0JYRY9YQR+OC5dGkmwIvSo9Wtk9QqYZdWtUNf0AEBOVCQh+3ERX -iqzr3efpsPbLPFHprGQ7 -=g9Wu ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABCAAGBQJVtm+6AAoJEB+wZLhO7MSTdmQP/Ru+6FyjM/PplB1GKWJbi1xY -mzT8pAXb+fpll8ioaD73u7hSrDVQRgDGrDeXYHbGy7/n+mKccFZDDy0QgyQHXFRW -yaLzYzGG5tmEQZORlQdavWsTDs8ODMJ2O1sD5QQNL7YjZSmiBazs1h7RhZ8PfMj5 -JQEFch3stzsmcVO1lhb8Pt39EhIpQAuzG7zR7PBSR6nxghYetSau8mGD5dVnQCKA -B87l2tSYnjF59/Fz6balei4FY4v/XGP5YAmp1WfvxTzbaSOPHKmwT6S1rcPHcfGf -jetPJcHrFjN1L3xO2PZjwOoXp1VC/EPAZ7O24rFVTZPEBWJAUCH1wG13dYVtyBrs -9iXiW3Jf7hY7YMFZBhXp8zFNHVfuJeVm0zdi3l1x9BWQp4/kRNmcU/6agZIXWeFk -tb2qfXWADdN0AoSum+iTB29uBEuZoiZdnmU6fHRV9oEhhHJBrbkJPit0UYGkC2i0 -ttSAKD/E3e94kvFSu7STLa1EVV2mFtGrq0QiOWr+92/S8m6KoPt5C6nCOccwCNCH -rwfVfNasM+0O7ru+l2kGlMI53wFWqzC5uslUN7/VmCxaQeC3+LDOUPSa9VCIt2kI -/ozodeWBfuxsTdXjGKM6mtly3zMqM0J2eccSnTKiBjhXC8zX2BNr9H3NNoFliJUz -a0fterlPHDBxw5D7QJuo -=y1+Y ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABCAAGBQJVuhDnAAoJEHbXiOHtGlmcIuUH+wfNzW9wkwc7CZAtPQiXaJIe -jteGo8O81hg5gNgO+vqwQgg/yg6zcsxlfoO0a8EZNqP9tgd6xfBigNrTMFtr3EHB -E41PEiywqL7h6fOW5Z3JBCi6ijnUfEPA8Pb6zXs1TCDUPt1pTMIWCQeMOiz5iAA3 -tvqaitoPbpJEa1KAwGHtTKnvD0gBXC5cUSm4smcja/eZg2SNUgZoE7IUPMW0z79J -7ZBSvmHMPMz+SxzhCqfubRirnPMp/6BxpYEqAPDkBzV2oq8IYCCbI7nkHmmCCuAz -QeWkY4hHVqC7hukH7EdtLj+C3zM0C0OwJLWJr8CXjS+pXkkOrXvOtawFIgZrnXk= -=gnyl ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJVuykAAAoJEE99uqmaWblz3R8H/0DstQXzn7djDu9viG+hKcXT -c19Ctf+2uo4zLZvN28wNEwXKb1PDSUkGx3A9y86V9MVSUXTdquF7S4pzdWKHxXYH -aKsxxCEwXPMIC8Nlcefyl1TJ7OF7zkwQ4c3cDvY4KWbYgISL+SLaapmqcKc6lNy1 -XNvzj3M/T5v0W+/sUzKEdhwyCahtm5w2k+rabby0FLe3icpA8ZSc/nu8mrwJ++dl -JWp26J2tC0x8Xf4nFTehTs+hf52lAlUo7f+Ie/ElbWwKKW9AE/ZxVDDU+Qxk5SUW -Nl+knh/2S6neaapmiqplpmiVARlSP3vuRU85D+hIXovjowPzcjP0GitrNP31upY= -=2Gwk ------END PGP SIGNATURE----- ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQIcBAABAgAGBQJVwcE2AAoJEMSmxiXMyOHfyjcP/0F7uHNW/ItobbTrewZ5827c -kAOW8g83J5cDV1kNKdK1/PJQxAx/WqGDEian2liyjfouKFk9oBZPGigauIKgVJR+ -kzTV5VtSMYMzHrgfoxX8Ftcd/wwPWVONIlizx2DCSqvw9lCsMa94FmVNE4W8x0UN -CqfIuipS+A2uQrp6nY95jEGRUaM52vvva/5xfNFfEIGzNHsmHoL/HJGGGGicLXWX -DTzTnLVoxeIpvgNOv5FxietLyqFBYZKz6t49173+3agt1Q1IWlDKBHIrRabvv9MD -YLIzUbHLoPqs8/1S3uZyg08Y8kLCR/AE3oY+nbvK03RCwuj4X6Xietqp0yUWZJAY -PQ7Y43YMxG3h4fqb2tUMEyIrJFhfFnivKn+NaCW6ljoXqfTKaFCNZhDGijbAc7Cx -fVjwpFeIM+sE100Z7y56w2R7A1WUTOyJRaDAZ1UTAuQLTdsXNq8o2/0RhNcYKLmH -1B8rAgLpYae93/3Rr9oeO0fRU778rAyX9RdBU73UV1alrpiF2Z6+WiHLBRAUtZux -5VA3MzhA/cQkHR2ApTGiXHsPxM2Htjynrq3GH/lkOtnZTrETd3Uqh5q3PNu4Zm8W -q1jACaUNrVQiDrOow+1XBIJLBRpTqFpFxTqsJC1+Mfl4f+0GyduZXdnq5acJZhwJ -VFtfz0DHmC9aA4EfwKq9 -=XULr ------END PGP SIGNATURE----- diff --git a/subversion-1.9.1.tar.bz2 b/subversion-1.9.1.tar.bz2 new file mode 100644 index 0000000..e74a908 --- /dev/null +++ b/subversion-1.9.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91548f9fce38bdb2958848f54fd8007e357c22db09b7ef4763fc85cbcbc2c913 +size 7747098 diff --git a/subversion-1.9.1.tar.bz2.asc b/subversion-1.9.1.tar.bz2.asc new file mode 100644 index 0000000..d9b01a1 --- /dev/null +++ b/subversion-1.9.1.tar.bz2.asc @@ -0,0 +1,80 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG/MacGPG2 v2.0.19 (Darwin) +Comment: GPGTools - http://gpgtools.org + +iQIcBAABCgAGBQJV3yIbAAoJEBvKZYajR5Q/iNwP/2XSUZJWGpg7xmWmqUNfLAt7 +suGjc6juNT+0xQfr3EMuQpVrsINF3h3SJ2/R/NZQTJI8k3Xyvz0Fl5bP7w5+PY3c +sJJUSRmcNAtOG16NZNbT/svpUnMQhObzzgDMUR3pvYsAy4Y+H81Va56mL5rCveQ7 +sq8s5dL/IeQZyU3KLEd6D/ICds3qMA4GA2k+UEwKjKbVtkSBXh+OgLWnAJWc05Jj +MeVsDdtwABSrnJNembkXbD2nQi/Qz8mmAWKu1ZW63pYItan+XKAP8ryUTOYdQTBS +MNg+QpLwVQwtW+TEbRP39Hj1y8KS8XjvYKXQ1PcpkINMNxrWkspoAIkyhspTOBzn +9C+2383GV2Y2V4QhimlcmitXtyaQOYeyBAFpSP7zA0e0bQoFGgQDYwhDkls49QFf +nj/5VbyuN2mai+awDZfLZRu2k4hmbfYEOFJbWDN33Edg67gIOK/rp599hnI3Cibr +zrpLGfl05oQ2cW3Y8kIgcwSEJls+iR/8jQCjZjs+AEJAHc/HHY9aHvBZan9E3YQc +kUKl14neW8GO5JlBBMyYCTyi/nbeLWi3e+LMnc8h6itDk8uZ8f28UgOlw8ThaWFh +V2qaN6sjgQuHROBYLn0d5riS4SAbPEcKG0MzD4Z4opBxSDUg+8sHhG4tV/jLvxmr +VzM8h9uXhaj3GIlKpK2l +=c0qb +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJV3zKKAAoJEJnsdBtXkhrMZl4QAMAgV+PzrR39GCOOxB0ZWMy3 +FiaWmO6ewul4nOzlgsP2/kdy6SwNQjQCxOcDXZE2kpsHfcNT+Fc9nETZl8FAMcpy +XLmeB79057TlnP/Mrf1Tt6IXL/EQ/f099qsXYH883kw29D7lNyZ3U2eejnRygd2m +sCnXyzlH73YAzyAS/5CgP3PJZUGGI3cEWoDsyUs7gEXtpvxpJPlk2niSzHuKVjKR ++H/bTWBA1PfYeYEGQjepckQfLWfy34UXD5IDSTc4M7Bcq15e3xD8AT3VT+mBXLEe +ooj3tRScmHyUXIYbN6tJccHaE+wqhjURw7pN0fHUgt/dRv7jHq3IAhKYGegVBGwJ +zpOg3ef9FsiDelSb/R+kLFYAxmi/Xla23xLGtem1ApA59fNR4VR0eXDQRfDej13Q +VASHF67coTYAK73pc1qRi8mbnc+Q6rtRSgkcuOaYecuJ+xpW9qw/0vLKNWwY4x7u +P66U1qdc4bUaQSWKVB+dw+jSFeOFt84NiIrPFHKH6oOr1fR34G8VV5TR0mCQ9U2S +9tbCMM9SsXzLwDDGSh0ugiKGtI/R9wCQslgk5gdkURSwK4Um+VAeKvqIpFYcF7eV +IiS5a22AmQdZJQKdWRk20Zvq2WdQLGbWRCbO0XzbizvBe8jyNCx4u69iZ7AUEx8C +qbCaOis/raZoVpxFn+Ph +=nZm7 +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABCAAGBQJV3yUUAAoJEB+wZLhO7MSTKQYP/iE+Y8nnzvsD/UhzMAHMd9hF +8/GqbDcrCfgqRdKrycowGS8C0f6OvoO5dNBwbmys2CWNl7YsQnGKX0rRYjuN1IJX +izHZMEdnkNsqTnaYz2IENTHVM7dRcJ016NrMy4/hICauG1fqMLrAeMjYAaiuLe/u +gtCf5jIYtofJlRZIcmSXuQJn016iGtnNfX384mn/ho6YK3aYnDx/2+8BDJRVNAYx +awhhAQluLhW+BfY789BKvppSN0wwWlKz44ykPekWZ6Yswa9yyTNNOt9BWABgiZT1 +2mcCQN3BlwKxr1KlrSiGH6mfTdaOUV5Xly/W0Gw0mAGRqrCjSOy6KNd7xK1iHnHb +w0tt8FMvRrWjO0C8DHuhOXYIlLWX0IBmXuKKU5iM2yUhplo1WhvLRaEk+AV/nu9o +u3BZBF73JsAGi6Pwd3dh6LV3t7Bwbs0xFzVP+trjs0HKQ6WXt8f179MR1kqtkFht +dmHWonoZjirz2DislavYbkje1QaST227wfzZA/xdzzjC5KDmX69aP/138uWqFcpw +ho+9w+lDypD5v8V48DY5PIEYFrHU8TjKLG0xlMgCm5OPLDxZBVgrHKLE+Z0JiUjF +0aA0DAxk/C2nx6KCBCwDNhAWMs3VX9XUqJ+dTeM0p9cJH7byV5hLwDvaKmB1mKmf +LauPJS5rOO9pO3LJB9IL +=GmsD +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQIcBAABAgAGBQJV3zrjAAoJEMSmxiXMyOHfFXwP+gLQrnwxAS1whXm0QsPUX1iP +3krvIjiXdsx6Hi/a6I4ZCnfSLugUDl75lpWrGmxHN8RWgUQQtSWkTwzcUNUFTyeG +Zx9iB9V0fni2rM5WIYR6I138X6OITPnZGX8Ld4RM0V012leLN66hphSCbplADZlv +dpDCSPIlbGAWOx3rb4aVuIg2j9JFVAECLqqdHr9yM3e+amoSkHF+pwToRtboCBKG +JRi9y4MUqGcLLlxNeWv8nx90mlp+1oyM4lQ1/WCAPL3jfaWxMnHC/VAiqHpWFRmg +BY6oq2ZevxO/u5v7XMyJ6wGH3E0xDy3TDjh3i+9z2trNoF2/6hqZay/X0VP4Jbw5 +diE3i7vX/5sfRCTS4ycxTXN6MZUpCfFIFdTi1dHeZU9AF3nZseylJN/rqmqbS9np +VIMi8SwPzSRW4IEe3H8Fu52wjlO/GXnPCFfQoGJPHXDPfyZikKo71zSoJ1aN9ceZ +zAytslNv1lW+22tLoXEEz4s0MCIcZOpjnZk1kWNGEEZ5s0iYt626LMV9ac9cd1GP +fWEXrEJjb8zu31yBLGRm2t5BB8T3YQJvP5R1H/ZcJ7uBLHnDUV0dzc4ND6RWmHKu +Xc+X8XWy32cguuBl3KPnCQKFMrJ8jl52CW9HCyG/84qhYHBcoEYd8lCVDoaL65S0 +vUsN1ARWQzKIm9XIQ8rC +=Mvzg +-----END PGP SIGNATURE----- +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJV5XKqAAoJEE99uqmaWblzun4IAM3OD8Zhqlg8CHVCngTS6wAC +t5k4Iaj6UIC1BYrdZFZuAc5ZWTpsM29yabjpzjVC/Ca8J4lGQDrrXH6MkroLGGYy +z+S4pzXvg/nOeFIXx+/ow8wpftxs1hc/H/ciefQJPJ28cf9Wc9LT0K+sUkh9X9cb +2Pn+mmKCkXf/DqWMFkl3S7esHNKZRxXtvT9xFWGpCFfBB3eytJvWtbA0n2Qadgem +uHPtfMnLjy7I/ns1V3jd/Lt1gFRhxGK1cftav9MJ1pb/YJco8BK4D85tkkPAbdmY +Ocj1dOsbySchSQ+LbKYEw7QxH2FSx3R8s7lpyFF4MiYTcfXw1ChLKJvXDljNcV8= +=2J24 +-----END PGP SIGNATURE----- diff --git a/subversion.changes b/subversion.changes index ebeb026..fd60cbe 100644 --- a/subversion.changes +++ b/subversion.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Sep 3 13:28:33 UTC 2015 - astieger@suse.com + +- Apache Subversion 1.9.1: + * Fix crash with GPG-agent with non-canonical $HOME + * svn: expose expat and zlib versions in svn --version --verbose + * svn: improve help text for 'svn info --show-item' + * svnserve: fixed minor typo in help text + * Fix an error leak in FSFS verification + * Fix incomplete membuffer cache initialization + * svnfsfs: fix some bugs and inconsistencies in load-index + * Fix memory corruption in copy source SWIG bindings +- drop subversion-1.8.14-httpd-version-number-detection.patch, + change is upstream +- adjust subversion-1.9.0-allow-httpd-2.4.6.patch for upstream + changes + ------------------------------------------------------------------- Mon Aug 24 11:08:08 UTC 2015 - tchvatal@suse.com diff --git a/subversion.spec b/subversion.spec index 10f5c53..47421f8 100644 --- a/subversion.spec +++ b/subversion.spec @@ -23,9 +23,9 @@ %global _tmpfilesdir %{_libexecdir}/tmpfiles.d %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define apxs %{_sbindir}/apxs2 -%define apache_libexecdir %(%apxs -q LIBEXECDIR) -%define apache_sysconfdir %(%apxs -q SYSCONFDIR) -%define apache_mmn %(MMN="$(%apxs -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN") +%define apache_libexecdir %(%{apxs} -q LIBEXECDIR) +%define apache_sysconfdir %(%{apxs} -q SYSCONFDIR) +%define apache_mmn %(MMN="$(%{apxs} -q LIBEXECDIR)_MMN"; test -x "$MMN" && "$MMN") %define sqlite_minimum_version 3.7.12 # SLE 12 does not ship KDE %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} != 1 @@ -36,7 +36,7 @@ %bcond_without python_ctypes %bcond_with all_regression_tests Name: subversion -Version: 1.9.0 +Version: 1.9.1 Release: 0 Summary: Subversion version control system License: Apache-2.0 @@ -65,7 +65,6 @@ Patch39: subversion-fix-parallel-build-support-for-perl-bindings.patch Patch40: subversion-perl-underlinking.patch Patch44: subversion-1.8.11-swig-py-comment-3.patch Patch45: subversion-1.8.11-autocheck-time.patch -Patch46: subversion-1.8.14-httpd-version-number-detection.patch Patch48: subversion-1.9.0-allow-httpd-2.4.6.patch BuildRequires: apache2-devel >= 2.2.0 BuildRequires: apache2-prefork @@ -239,7 +238,6 @@ parameters and keywords for the svn command and other tools. %patch40 -p1 %patch44 -p1 %patch45 -p1 -%patch46 -p1 %patch48 -p1 %build @@ -397,6 +395,7 @@ rm -rf doc/doxygen/html/installdox %check export LANG=C LC_ALL=C + make %{?_smp_mflags} check CLEANUP=true || (cat fails.log; exit 1) make %{?_smp_mflags} check-javahl || (cat fails.log; exit 1) make %{?_smp_mflags} check-swig-pl || (cat fails.log; exit 1)