update to 1.12.0 (#1702471)

Resolves: rhbz#1702471

sources

@@ -1 +1 @@
-SHA512 (subversion-1.11.1.tar.bz2) = 2d082f715bf592ffc6a19311a9320dbae2ff0ee126b0472ce1c3f10e9aee670f43d894889430e6d093620f7b69c611e9a26773bc7a2f8b599ec37540ecd84a8d
+SHA512 (subversion-1.12.0.tar.bz2) = 87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13

subversion-1.12.0-rpath.patch

@@ -1,10 +1,6 @@
-
+--- subversion-1.12.0/build.conf.rpath
-Only link libraries using -rpath, to avoid unnecessary RPATH tags in executables.
++++ subversion-1.12.0/build.conf
-
+@@ -572,7 +572,7 @@
-diff -uap subversion-1.10.0/build.conf.rpath subversion-1.10.0/build.conf
---- subversion-1.10.0/build.conf.rpath
-+++ subversion-1.10.0/build.conf
-@@ -568,7 +568,7 @@
  path = subversion/bindings/swig/python/libsvn_swig_py
  libs = libsvn_client libsvn_wc libsvn_ra libsvn_delta libsvn_subr
         apriconv apr python swig
@@ -13,7 +9,7 @@ diff -uap subversion-1.10.0/build.conf.rpath subversion-1.10.0/build.conf
  install = swig-py-lib
  # need special build rule to include -DSWIGPYTHON
  compile-cmd = $(COMPILE_SWIG_PY)
-@@ -594,7 +594,7 @@
+@@ -598,7 +598,7 @@
  lang = ruby
  path = subversion/bindings/swig/ruby/libsvn_swig_ruby
  libs = libsvn_client libsvn_wc libsvn_delta libsvn_subr apriconv apr ruby swig
@@ -22,21 +18,22 @@ diff -uap subversion-1.10.0/build.conf.rpath subversion-1.10.0/build.conf
  install = swig-rb-lib
  # need special build rule to include
  compile-cmd = $(COMPILE_SWIG_RB)
-diff -uap subversion-1.10.0/Makefile.in.rpath subversion-1.10.0/Makefile.in
+--- subversion-1.12.0/Makefile.in.rpath
---- subversion-1.10.0/Makefile.in.rpath
++++ subversion-1.12.0/Makefile.in
-+++ subversion-1.10.0/Makefile.in
+@@ -268,11 +268,11 @@
-@@ -264,10 +264,10 @@
+ COMPILE_SVNXX = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) -o $@ -c
- COMPILE_GOOGLEMOCK_CXX = $(LT_COMPILE_CXX_NOWARN) $(GOOGLEMOCK_LIB_INCLUDES) -o $@ -c
+ COMPILE_SVNXX_TEST = $(LT_COMPILE_CXX) $(SVNXX_INCLUDES) $(BOOST_TEST_CPPFLAGS) -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)
 -LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS) -rpath $(libdir)
 -LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION)
+-LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS)
 +LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(LT_LDFLAGS) $(CFLAGS) $(LDFLAGS)
 +LINK_LIB = $(LINK) $(LT_SO_VERSION) -rpath $(libdir)
 +LINK_CXX = $(LIBTOOL) $(LTCXXFLAGS) --mode=link $(CXX) $(LT_LDFLAGS) $(CXXFLAGS) $(LDFLAGS)
 +LINK_CXX_LIB = $(LINK_CXX) $(LT_SO_VERSION) -rpath $(libdir)
++LINK_SVNXX_TEST = $(LINK_CXX) $(BOOST_TEST_LDFLAGS) -no-install
  
  # 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) -shared

subversion.spec

@@ -36,8 +36,8 @@
 
 Summary: A Modern Concurrent Version Control System
 Name: subversion
-Version: 1.11.1
+Version: 1.12.0
-Release: 5%{?dist}
+Release: 1%{?dist}
 License: ASL 2.0
 URL: https://subversion.apache.org/
 
@@ -49,7 +49,7 @@ Source5: psvn-init.el
 Source6: svnserve.service
 Source7: svnserve.tmpfiles
 Source8: svnserve.sysconf
-Patch1: subversion-1.10.0-rpath.patch
+Patch1: subversion-1.12.0-rpath.patch
 Patch2: subversion-1.10.0-pie.patch
 Patch4: subversion-1.8.0-rubybind.patch
 Patch5: subversion-1.8.5-swigplWall.patch
@@ -206,7 +206,7 @@ This package includes supplementary tools for use with Subversion.
 %prep
 %setup -q
 %patch1 -p1 -b .rpath
-%patch2 -p1 -b .pie
+#patch2 -p1 -b .pie
 %patch4 -p1 -b .rubybind
 %patch5 -p1 -b .swigplWall
 %patch6 -p1 -b .r1857391
@@ -524,6 +524,9 @@ make check-javahl
 %endif
 
 %changelog
+* Wed May  1 2019 Joe Orton <jorton@redhat.com> - 1.12.0-1
+- update to 1.12.0 (#1702471)
+
 * Wed Apr 17 2019 Joe Orton <jorton@redhat.com> - 1.11.1-5
 - fix build with APR 1.7.0 (upstream r1857391)