diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2018-02-08 20:21:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-08 20:21:22 +0100 |
| commit | bd90807da307dc205f24386f1b96546dd1b039c5 (patch) | |
| tree | c7b3334ea7b2ca71b1755ab402fa63e6f6d48c32 /dist | |
| parent | ee2ca2e3926e10fcc6e4bd9d0ba8ab7bbcb074f4 (diff) | |
| parent | 6d2c803b8e9b5b53e34936abf700e3891e37c447 (diff) | |
Merge pull request #4982 from vespa-engine/balder/remove-filedistribution-cpp
Balder/remove filedistribution cpp
Diffstat (limited to 'dist')
| -rw-r--r-- | dist/vespa.spec | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec index b0d8ffd19a1..5c1703bbdbe 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -34,7 +34,6 @@ BuildRequires: Judy-devel BuildRequires: cmake3 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 @@ -66,7 +65,6 @@ BuildRequires: openssl-devel BuildRequires: rpm-build BuildRequires: make BuildRequires: vespa-cppunit-devel >= 1.12.1-6 -BuildRequires: vespa-libtorrent-devel >= 1.0.11-6 BuildRequires: systemd BuildRequires: flex >= 2.5.0 BuildRequires: bison >= 3.0.0 @@ -103,9 +101,8 @@ Requires: net-tools Requires: llvm3.9 Requires: devtoolset-7-gdb Requires: vespa-boost >= 1.59.0-6 -Requires: vespa-zookeeper-c-client >= 3.4.9-6 -%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-boost/lib;/opt/vespa-libtorrent/lib;/opt/vespa-zookeeper-c-client/lib;/opt/vespa-cppunit/lib -%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-libtorrent/include;/opt/vespa-zookeeper-c-client/include;/opt/vespa-cppunit/include +%define _extra_link_directory /usr/lib64/llvm3.9/lib;/opt/vespa-boost/lib;/opt/vespa-cppunit/lib +%define _extra_include_directory /usr/include/llvm3.9;/opt/vespa-boost/include;/opt/vespa-cppunit/include %endif %if 0%{?fedora} %if 0%{?fc25} @@ -132,14 +129,13 @@ Requires: boost >= 1.64 %define _vespa_llvm_include_directory /usr/include/llvm4.0 %endif Requires: zookeeper >= 3.4.9 -%define _extra_link_directory /opt/vespa-libtorrent/lib;/opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}} -%define _extra_include_directory /opt/vespa-libtorrent/include;/opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}} +%define _extra_link_directory /opt/vespa-cppunit/lib%{?_vespa_llvm_link_directory:;%{_vespa_llvm_link_directory}} +%define _extra_include_directory /opt/vespa-cppunit/include%{?_vespa_llvm_include_directory:;%{_vespa_llvm_include_directory}} %define _vespa_boost_lib_suffix %{nil} %endif Requires: java-1.8.0-openjdk Requires: openssl Requires: vespa-cppunit >= 1.12.1-6 -Requires: vespa-libtorrent >= 1.0.11-6 Requires(pre): shadow-utils # Ugly workaround because vespamalloc/src/vespamalloc/malloc/mmap.cpp uses the private |