Add subversion 1.12.2 (#13158)

1 files changed, 73 insertions, 53 deletions

diff --git a/var/spack/repos/builtin/packages/subversion/package.py b/var/spack/repos/builtin/packages/subversion/package.py
index 29c897ecfb..de26e0dece 100644
--- a/var/spack/repos/builtin/packages/subversion/package.py
+++ b/var/spack/repos/builtin/packages/subversion/package.py
@@ -6,82 +6,102 @@
 from spack import *
 
 
-class Subversion(Package):
+class Subversion(AutotoolsPackage):
     """Apache Subversion - an open source version control system."""
+
     homepage = 'https://subversion.apache.org/'
-    url = 'http://archive.apache.org/dist/subversion/subversion-1.8.13.tar.gz'
+    url      = 'https://archive.apache.org/dist/subversion/subversion-1.12.2.tar.gz'
 
-    version('1.9.7',     sha256='c72a209c883e20245f14c4e644803f50ae83ae24652e385ff5e82300a0d06c3c')
-    version('1.9.6',     sha256='a400cbc46d05cb29f2d7806405bb539e9e045b24013b0f12f8f82688513321a7')
-    version('1.9.5',     sha256='280ba586c5d51d7b976b65d22d5e8e42f3908ed1c968d71120dcf534ce857a83')
-    version('1.9.3',     sha256='74cd21d2f8a2a54e4dbd2389fe1605a19dbda8ba88ffc4bb0edc9a66e143cc93')
-    version('1.8.17',    sha256='1b2cb9a0ca454035e55b114ee91c6433b9ede6c2893f2fb140939094d33919e4')
-    version('1.8.13',    sha256='17e8900a877ac9f0d5ef437c20df437fec4eb2c5cb9882609d2277e2312da52c')
+    version('1.12.2', sha256='f4927d6603d96c5ddabebbafe9a0f6833c18a891ff0ce1ea6ffd186ce9bc21f3')
+    version('1.9.7',  sha256='c72a209c883e20245f14c4e644803f50ae83ae24652e385ff5e82300a0d06c3c')
+    version('1.9.6',  sha256='a400cbc46d05cb29f2d7806405bb539e9e045b24013b0f12f8f82688513321a7')
+    version('1.9.5',  sha256='280ba586c5d51d7b976b65d22d5e8e42f3908ed1c968d71120dcf534ce857a83')
+    version('1.9.3',  sha256='74cd21d2f8a2a54e4dbd2389fe1605a19dbda8ba88ffc4bb0edc9a66e143cc93')
+    version('1.8.17', sha256='1b2cb9a0ca454035e55b114ee91c6433b9ede6c2893f2fb140939094d33919e4')
+    version('1.8.13', sha256='17e8900a877ac9f0d5ef437c20df437fec4eb2c5cb9882609d2277e2312da52c')
 
+    variant('serf', default=True,  description='Serf HTTP client library')
     variant('perl', default=False, description='Build with Perl bindings')
 
     depends_on('apr')
     depends_on('apr-util')
     depends_on('zlib')
-    depends_on('sqlite')
-    depends_on('serf')
+    depends_on('sqlite@3.8.2:')
+    depends_on('expat')
+    depends_on('lz4', when='@1.10:')
+    depends_on('utf8proc', when='@1.10:')
+    depends_on('serf', when='+serf')
 
     extends('perl', when='+perl')
     depends_on('swig@1.3.24:3.0.0', when='+perl')
     depends_on('perl-term-readkey', when='+perl')
 
-    # Optional: We need swig if we want the Perl, Python or Ruby
-    # bindings.
-    # depends_on('swig')
-    # depends_on('python')
-    # depends_on('perl')
-    # depends_on('ruby')
-
     # Installation has race cases.
     parallel = False
 
-    def install(self, spec, prefix):
-
-        # configure, build, install:
-        # Ref:
-        # http://www.linuxfromscratch.org/blfs/view/svn/general/subversion.html
-        options = ['--prefix=%s' % prefix]
-        options.append('--with-apr=%s' % spec['apr'].prefix)
-        options.append('--with-apr-util=%s' % spec['apr-util'].prefix)
-        options.append('--with-zlib=%s' % spec['zlib'].prefix)
-        options.append('--with-sqlite=%s' % spec['sqlite'].prefix)
-        options.append('--with-serf=%s' % spec['serf'].prefix)
+    # http://www.linuxfromscratch.org/blfs/view/svn/general/subversion.html
+    def configure_args(self):
+        spec = self.spec
+        args = [
+            '--with-apr={0}'.format(spec['apr'].prefix),
+            '--with-apr-util={0}'.format(spec['apr-util'].prefix),
+            '--with-sqlite={0}'.format(spec['sqlite'].prefix),
+            '--with-expat={0}:{1}:{2}'.format(
+                spec['expat'].headers.directories[0],
+                spec['expat'].libs.directories[0],
+                spec['expat'].libs.names[0]
+            ),
+            '--with-zlib={0}'.format(spec['zlib'].prefix),
+            '--without-apxs',
+            '--without-trang',
+            '--without-doxygen',
+            '--without-berkeley-db',
+            '--without-sasl',
+            '--without-libmagic',
+            '--without-kwallet',
+            '--without-jdk',
+            '--without-boost',
+        ]
+
+        if spec.satisfies('@1.10:'):
+            args.extend([
+                '--with-lz4={0}'.format(spec['lz4'].prefix),
+                '--with-utf8proc={0}'.format(spec['utf8proc'].prefix),
+            ])
+
+        if '+serf' in spec:
+            args.append('--with-serf={0}'.format(spec['serf'].prefix))
+        else:
+            args.append('--without-serf')
 
         if 'swig' in spec:
-            options.append('--with-swig=%s' % spec['swig'].prefix)
-        if 'perl' in spec:
-            options.append('PERL=%s' % spec['perl'].command.path)
+            args.append('--with-swig={0}'.format(spec['swig'].prefix))
+        else:
+            args.append('--without-swig')
 
-        configure(*options)
-        make()
-        if self.run_tests:
-            make('check')
-        make('install')
+        if '+perl' in spec:
+            args.append('PERL={0}'.format(spec['perl'].command.path))
 
-        if spec.satisfies('+perl'):
+        return args
+
+    def build(self, spec, prefix):
+        make()
+        if '+perl' in spec:
             make('swig-pl')
-            if self.run_tests:
-                make('check-swig-pl')
+            with working_dir(join_path(
+                    'subversion', 'bindings', 'swig', 'perl', 'native')):
+                perl = spec['perl'].command
+                perl('Makefile.PL', 'INSTALL_BASE={0}'.format(prefix))
+
+    def test(self):
+        make('check')
+        if '+perl' in self.spec:
+            make('check-swig-pl')
+
+    def install(self, spec, prefix):
+        make('install')
+        if '+perl' in spec:
             make('install-swig-pl-lib')
             with working_dir(join_path(
                     'subversion', 'bindings', 'swig', 'perl', 'native')):
-                perl = which('perl')
-                perl('Makefile.PL', 'INSTALL_BASE=%s' % prefix)
                 make('install')
-
-        # python bindings
-        # make('swig-py',
-        #     'swig-pydir=/usr/lib/python2.7/site-packages/libsvn',
-        #     'swig_pydir_extra=/usr/lib/python2.7/site-packages/svn')
-        # make('install-swig-py',
-        #     'swig-pydir=/usr/lib/python2.7/site-packages/libsvn',
-        #     'swig_pydir_extra=/usr/lib/python2.7/site-packages/svn')
-
-        # ruby bindings
-        # make('swig-rb')
-        # make('isntall-swig-rb')