diff options
| author | Arnstein Ressem <aressem@gmail.com> | 2017-10-03 09:58:48 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-03 09:58:48 +0200 |
| commit | d9ba71ace2f44c965c7afcfe5240ca9eb83396a0 (patch) | |
| tree | b5b89c68d871efa2935ca1074ec217673da6e81c /dist | |
| parent | 81b9d23e0e85e73626ff6edea446741bb263b465 (diff) | |
| parent | 507da102402b558be886c5141a035d5b5e0046f2 (diff) | |
Merge pull request #3609 from vespa-engine/bjorncs/maven
Bjorncs/maven
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index a3e0ec4711f..bf6e49fdf85 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -16,12 +16,14 @@ URL: http://vespa.ai Source0: vespa-%{version}.tar.gz %if 0%{?centos} -BuildRequires: epel-release +BuildRequires: epel-release BuildRequires: centos-release-scl BuildRequires: devtoolset-6-gcc-c++ BuildRequires: devtoolset-6-libatomic-devel BuildRequires: devtoolset-6-binutils +BuildRequires: rh-maven33 %define _devtoolset_enable /opt/rh/devtoolset-6/enable +%define _rhmaven33_enable /opt/rh/rh-maven33/enable %endif %if 0%{?fedora} BuildRequires: gcc-c++ @@ -36,6 +38,7 @@ BuildRequires: vespa-zookeeper-c-client-devel >= 3.4.9-6 %endif %if 0%{?fedora} BuildRequires: cmake >= 3.9.1 +BuildRequires: maven %if 0%{?fc25} BuildRequires: llvm-devel >= 3.9.1 BuildRequires: boost-devel >= 1.60 @@ -49,7 +52,6 @@ BuildRequires: zookeeper-devel >= 3.4.9 BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel -BuildRequires: maven BuildRequires: libicu-devel BuildRequires: java-1.8.0-openjdk-devel BuildRequires: openssl-devel @@ -112,8 +114,11 @@ Vespa - The open big data serving engine %if 0%{?_devtoolset_enable:1} source %{_devtoolset_enable} || true %endif +%if 0%{?_rhmaven33_enable:1} +source %{_rhmaven33_enable} || true +%endif sh bootstrap.sh java -mvn -nsu -T 2C install -DskipTests -Dmaven.javadoc.skip=true +mvn -nsu -T 2C install -Dmaven.test.skip=true -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ -DJAVA_HOME=/usr/lib/jvm/java-openjdk \ -DEXTRA_LINK_DIRECTORY="%{_extra_link_directory}" \ @@ -147,18 +152,18 @@ chmod +x /etc/profile.d/vespa.sh exit 0 %post -%systemd_post vespa-configserver.service -%systemd_post vespa.service +%systemd_post vespa-configserver.service +%systemd_post vespa.service %preun %systemd_preun vespa.service %systemd_preun vespa-configserver.service %postun -%systemd_postun_with_restart vespa.service -%systemd_postun_with_restart vespa-configserver.service +%systemd_postun_with_restart vespa.service +%systemd_postun_with_restart vespa-configserver.service rm -f /etc/profile.d/vespa.sh -userdel vespa +userdel vespa %files %defattr(-,vespa,vespa,-) |