aboutsummaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
authorEirik Nygaard <eirik@yahoo-inc.com>2016-06-20 09:07:10 +0200
committerGitHub <noreply@github.com>2016-06-20 09:07:10 +0200
commitcf0398a0fcd0076ceb4bda258fb7e791eb0b90de (patch)
treee89a797b9d5509208ee3610b62ecde11187bdf64 /dist
parent144c3c95465defcad3b645fefd38883ec9a3b450 (diff)
parent1df88efe191af87317c6c2d775fe6f16825ce752 (diff)
Merge pull request #96 from yahoo/aressem/rpm-symlinks-were-put-in-the-wrong-place
Put the symlinks in correct place. Add the whole jars/ folder.
Diffstat (limited to 'dist')
-rw-r--r--dist/vespa.spec11
1 files changed, 6 insertions, 5 deletions
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 92a8f13c258..1b29fd69a4f 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -122,10 +122,11 @@ mkdir -p %{buildroot}/%{_prefix}/var/vespa/cache/config/
mkdir -p %{buildroot}/%{_prefix}/var/vespa/cmdlines/
mkdir -p %{buildroot}/%{_prefix}/var/zookeeper/
-ln -s %{_prefix}/lib/jars/config-model-fat.jar %{buildroot}/%{_prefix}/conf/configserver-app/config-model-fat.jar
-ln -s %{_prefix}/lib/jars/orchestrator-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/orchestrator.jar
-ln -s %{_prefix}/lib/jars/node-repository-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/node-repository.jar
-ln -s %{_prefix}/lib/jars/zkfacade-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/zkfacade.jar
+ln -s %{_prefix}/lib/jars/config-model-fat.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/config-model-fat.jar
+ln -s %{_prefix}/lib/jars/configserver-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/configserver.jar
+ln -s %{_prefix}/lib/jars/orchestrator-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/orchestrator.jar
+ln -s %{_prefix}/lib/jars/node-repository-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/node-repository.jar
+ln -s %{_prefix}/lib/jars/zkfacade-jar-with-dependencies.jar %{buildroot}/%{_prefix}/conf/configserver-app/components/zkfacade.jar
ln -s %{_prefix}/conf/configserver-app/components %{buildroot}/%{_prefix}/lib/jars/config-models
%clean
@@ -191,7 +192,7 @@ exit 0
%{_prefix}/libexec/vespa/start-logd
%{_prefix}/libexec/vespa/stop-configserver
%{_prefix}/var/db/vespa/config_server/serverdb/classes/*.def
-%{_prefix}/lib/jars/*.jar
+%{_prefix}/lib/jars/*
%{_prefix}/lib/perl5/site_perl/Yahoo/Vespa/*.pm
%{_prefix}/lib64/*.so
%{_prefix}/bin/*