diff options
| author | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-25 18:07:07 +0200 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@oath.com> | 2017-09-25 18:07:07 +0200 |
| commit | 883794771ff7462878aad2486d8c33b0722e7761 (patch) | |
| tree | c185097a561acf31c3fcf27f05408b5b3c8fb9e3 /dist/vespa.spec | |
| parent | 8f7f39fcadd35b2cbcab0263fd74c7554ae388b3 (diff) | |
Revert "Re-port to Fedora after maven requirement changes."
This reverts commit 7af86988aee2f0eb97b9439b2142ef56429450a8.
Diffstat (limited to 'dist/vespa.spec')
| -rw-r--r-- | dist/vespa.spec | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index d034d1de051..0e91419e00e 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -30,14 +30,12 @@ BuildRequires: libatomic BuildRequires: Judy-devel %if 0%{?centos} BuildRequires: cmake3 -BuildRequires: rh-maven33 BuildRequires: llvm3.9-devel BuildRequires: vespa-boost-devel >= 1.59.0-6 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 @@ -51,6 +49,7 @@ BuildRequires: zookeeper-devel >= 3.4.9 BuildRequires: lz4-devel BuildRequires: libzstd-devel BuildRequires: zlib-devel +BuildRequires: rh-maven33 BuildRequires: libicu-devel BuildRequires: java-1.8.0-openjdk-devel BuildRequires: openssl-devel @@ -114,9 +113,7 @@ Vespa - The open big data serving engine %if 0%{?_devtoolset_enable:1} source %{_devtoolset_enable} || true %endif -%if 0%{?centos} scl enable rh-maven33 bash -%endif sh bootstrap.sh java mvn -nsu -T 2C install -DskipTests -Dmaven.javadoc.skip=true cmake3 -DCMAKE_INSTALL_PREFIX=%{_prefix} \ |