diff options
| author | Bjørn Christian Seime <bjorn.christian@seime.no> | 2017-09-25 17:05:35 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-25 17:05:35 +0200 |
| commit | 16999350589b9f8ccdc9cb36cb361ef2a0c86fa8 (patch) | |
| tree | da0012fd653c37cbba4a5beab8853ee5e5c6a414 | |
| parent | 24c01879774c1474777b4ff26b92a5bbbd02c051 (diff) | |
| parent | 7af86988aee2f0eb97b9439b2142ef56429450a8 (diff) | |
Merge pull request #3526 from vespa-engine/toregge/restore-fedora-port-after-maven-requirement-change
Re-port to Fedora after maven requirement changes.
| -rw-r--r-- | dist/vespa.spec | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index 0e91419e00e..d034d1de051 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -30,12 +30,14 @@ 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 @@ -49,7 +51,6 @@ 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 @@ -113,7 +114,9 @@ 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} \ |