Request 2213 (accepted)

Overview

Request 2213 (accepted)

Ship correct variants of sys.config and vm.args

Created by sicherha about 6 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit guam

Submit package home:sicherha:branches:Kolab:16 / guam to package Kolab:Winterfell / guam

guam.spec Changed

@@ -22,7 +22,7 @@
 
 Name:               guam
 Version:            0.9.4
-Release:            1%{?dist}
+Release:            2%{?dist}
 Summary:            A Smart Reverse IMAP Proxy
 
 Group:              System Environment/Daemons
@@ -140,7 +140,10 @@
     %{buildroot}%{_var}/log/%{name}/
 
 # Configuration
-install -m 644 %{SOURCE100} %{buildroot}%{_sysconfdir}/%{name}/sys.config
+cp _build/default/rel/%{name}/etc/sys.config \
+    %{buildroot}%{_sysconfdir}/%{name}/sys.config
+cp _build/default/rel/%{name}/vm.args \
+    %{buildroot}%{_sysconfdir}/%{name}/vm.args
 
 # Service scripts
 %if 0%{?with_systemd}
@@ -164,8 +167,8 @@
 %endif
 
 pushd %{buildroot}%{_erllibdir}/%{name}-%{version}/releases/%{version}/
-ln -sfv ../../../../../../..%{_sysconfdir}/%{name}/sys.config sys.config
-mv vm.args ../../../../../../..%{_sysconfdir}/%{name}/vm.args
+rm sys.config vm.args
+ln -sv ../../../../../../..%{_sysconfdir}/%{name}/sys.config sys.config
 ln -sv ../../../../../../..%{_sysconfdir}/%{name}/vm.args vm.args
 popd
 
@@ -240,6 +243,9 @@
 %endif
 
 %changelog
+* Thu Apr 19 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-2
+- Ship correct variants of sys.config and vm.args
+
 * Sun Apr 15 2018 Christoph Erhardt <kolab@sicherha.de> - 0.9.4-1
 - Release version 0.9.4

debian.changelog Changed

debian.rules Changed

@@ -35,17 +35,24 @@
 	cp -a _build/default/rel/guam/lib/kolab_guam-$(DEB_VERSION_UPSTREAM)/ebin \
 		$(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/
 
+	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/sys.config
+	rm _build/default/rel/guam/releases/$(DEB_VERSION_UPSTREAM)/vm.args
+
 	cp -a _build/default/rel/guam/releases \
 		$(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/
 
-	mv $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config \
-		 $(DESTDIR)/etc/guam/sys.config
+	if [ -f "/etc/plesk-release" ]; then \
+		cp ../SOURCES/plesk.sys.config \
+			$(DESTDIR)/etc/guam/sys.config ; \
+	else \
+		cp _build/default/rel/guam/etc/sys.config \
+			$(DESTDIR)/etc/guam/sys.config ; \
+	fi
 
 	ln -s ../../../../../../../etc/guam/sys.config \
 		$(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/sys.config
 
-	mv $(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/vm.args \
-		$(DESTDIR)/etc/guam/vm.args
+	cp _build/default/rel/guam/vm.args $(DESTDIR)/etc/guam/vm.args
 
 	ln -s ../../../../../../../etc/guam/vm.args \
 		$(DESTDIR)/usr/lib/erlang/lib/guam-$(DEB_VERSION_UPSTREAM)/releases/$(DEB_VERSION_UPSTREAM)/vm.args

guam.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2213 0

Request History

sicherha created request about 6 years ago

Ship correct variants of sys.config and vm.args

sicherha accepted request about 6 years ago

Please add a comment