File obs-server-2.10-0001-Revert-dist-Prepare-obs-se... of Package obs-server

Overview Repositories Revisions Requests Users Attributes Meta

File obs-server-2.10-0001-Revert-dist-Prepare-obs-server.spec-to-use-bundle_ge.patch of Package obs-server

From 29508eac1205e950bcd5e605f4fbc2374ad2b951 Mon Sep 17 00:00:00 2001
From: Oleg Girko <ol@infoserver.lv>
Date: Tue, 4 May 2021 02:22:46 +0100
Subject: [PATCH] Revert "[dist] Prepare obs-server.spec to use bundle_gems
 service"

This reverts commit 13201bda129fbf45960c9f1ced2da1fd18a743b9.
---
 dist/obs-server.spec | 2 +-
 src/api/Makefile     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/obs-server.spec b/dist/obs-server.spec
index 89849b535f..0be79db3d5 100644
--- a/dist/obs-server.spec
+++ b/dist/obs-server.spec
@@ -941,7 +941,7 @@ usermod -a -G docker obsservicerun
 /srv/www/obs/docs
 
 /srv/www/obs/api/config/locales
-%dir /srv/www/obs/api/vendor
+/srv/www/obs/api/vendor
 /srv/www/obs/api/vendor/diststats
 
 #
diff --git a/src/api/Makefile b/src/api/Makefile
index 48a4d72dfb..ebc98532f5 100644
--- a/src/api/Makefile
+++ b/src/api/Makefile
@@ -17,7 +17,6 @@ prepare_dirs:
 
 prepare_rake: prepare_dirs
 	cp -a * $(DESTDIR)$(OBS_API_PREFIX)
-	cp -a .bundle $(DESTDIR)$(OBS_API_PREFIX)
 	rm $(DESTDIR)$(OBS_API_PREFIX)/Makefile
 	rm $(DESTDIR)$(OBS_API_PREFIX)/Procfile
 	touch $(DESTDIR)$(OBS_API_PREFIX)/log/production.log
@@ -49,6 +48,7 @@ log_files:
 	$(foreach logfile,$(OBS_API_LOGS),$(shell touch $(DESTDIR)$(OBS_API_PREFIX)/log/$(logfile) ))
 
 build: config
+	$(shell [ -d $(DESTDIR)/srv/www/obs/api/.bundle ] && rm -rf $(DESTDIR)/srv/www/obs/api/.bundle)
 	# we need to have *something* as secret key
 	echo "" | sha256sum| cut -d\  -f 1 > $(DESTDIR)/srv/www/obs/api/config/secret.key
 	cd $(DESTDIR)/srv/www/obs/api ;\
-- 
2.35.3

Places

File obs-server-2.10-0001-Revert-dist-Prepare-obs-server.spec-to-use-bundle_ge.patch of Package obs-server

Places