From 327c9d33448cb00576ed1672fdf2c9d25f000f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Mon, 30 Nov 2015 09:30:41 +0100
Subject: [PATCH] [dist] do not run executables from docdir

SLE 11 is building again now
---
 dist/Makefile        | 8 ++++----
 dist/obs-server.spec | 3 +--
 dist/obsapisetup     | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/dist/Makefile b/dist/Makefile
index fc463baa59a..d40dee4c134 100644
--- a/dist/Makefile
+++ b/dist/Makefile
@@ -1,13 +1,13 @@
-CONTRIB_DIR=$(DESTDIR)/usr/share/doc/packages/obs-api/contrib
+SERVER_DIR=/usr/lib/obs/server
 
 all: install
 
 install: install_obsapisetup
 
 install_obsapisetup:
-	install -m 755 ./obsapisetup $(DESTDIR)/etc/init.d/obsapisetup
-	[ -d $(CONTRIB_DIR) ] || mkdir -p $(CONTRIB_DIR)
-	install -m 755 ./setup-appliance.sh $(CONTRIB_DIR)/setup-appliance.sh
+	install -m 755 obsapisetup $(DESTDIR)/etc/init.d/obsapisetup
+	[ -d $(DESTDIR)$(SERVER_DIR) ] || mkdir -p $(DESTDIR)$(SERVER_DIR)
+	install -m 755 setup-appliance.sh $(DESTDIR)$(SERVER_DIR)/setup-appliance.sh
 
 ta: test_all
 
diff --git a/dist/obs-server.spec b/dist/obs-server.spec
index d852267b2c4..8f529368113 100644
--- a/dist/obs-server.spec
+++ b/dist/obs-server.spec
@@ -738,7 +738,6 @@ chown %{apache_user}:%{apache_group} /srv/www/obs/api/log/production.log
 /srv/www/obs/api/config/initializers
 %dir /srv/www/obs/api/config/environments
 %dir /srv/www/obs/api/files
-%dir %{_docdir}/%{obs_api_pkg_name}/contrib
 %dir /srv/www/obs/api/db
 /srv/www/obs/api/Gemfile
 /srv/www/obs/api/Gemfile.lock
@@ -764,7 +763,7 @@ chown %{apache_user}:%{apache_group} /srv/www/obs/api/log/production.log
 /srv/www/obs/api/bin
 /srv/www/obs/api/test
 /srv/www/obs/docs
-%{_docdir}/%{obs_api_pkg_name}/contrib/setup-appliance.sh
+/usr/lib/obs/server/setup-appliance.sh
 
 /srv/www/obs/api/config/locales
 %dir /srv/www/obs/api/vendor
diff --git a/dist/obsapisetup b/dist/obsapisetup
index 21bc65e7da1..47120f29d87 100755
--- a/dist/obsapisetup
+++ b/dist/obsapisetup
@@ -38,7 +38,7 @@ rc_reset
 case "$1" in
 	start)
 		[[ $HOME == '' ]] && export HOME=/root
-		/usr/share/doc/packages/obs-api/contrib/setup-appliance.sh --non-interactive --setup-only
+		/usr/lib/obs/server/setup-appliance.sh --non-interactive --setup-only
 		rc_status -v
 	;;
 	stop)