From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 9 Feb 2012 15:47:05 +0000 (+0000)
Subject: Adapt RPM build to EL5
X-Git-Tag: argeo-slc-2.1.7~823
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=6f14bdedfe57ea658f2952dd6c752fbdbfd04886;hp=038f9fd2f7be36befe4427b4a85a55bddb207c4a;p=gpl%2Fargeo-slc.git

Adapt RPM build to EL5

git-svn-id: https://svn.argeo.org/slc/trunk@5032 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml
index af3da3790..bf7ea8ce0 100644
--- a/dist/slc/pom.xml
+++ b/dist/slc/pom.xml
@@ -105,13 +105,13 @@
 										</mapping>
 									</mappings>
 									<preinstallScriptlet>
-										<scriptFile>src/main/scripts/preinstall</scriptFile>
+										<scriptFile>src/main/scripts/preinstall-${rpm.release}</scriptFile>
 									</preinstallScriptlet>
 									<postinstallScriptlet>
 										<scriptFile>src/main/scripts/postinstall</scriptFile>
 									</postinstallScriptlet>
 									<preremoveScriptlet>
-										<scriptFile>src/main/scripts/preremove</scriptFile>
+										<scriptFile>src/main/scripts/preremove-${rpm.release}</scriptFile>
 									</preremoveScriptlet>
 									<requires>
 										<require>slc-libs</require>
diff --git a/dist/slc/src/main/scripts/preinstall b/dist/slc/src/main/scripts/preinstall
deleted file mode 100644
index b3953fc53..000000000
--- a/dist/slc/src/main/scripts/preinstall
+++ /dev/null
@@ -1,14 +0,0 @@
-if [ $1 = "1" ];then
-	APP=%{name}
-	
-	# create application user (EL5)
-	#useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP
-	
-	# create application user (EL6)
-	useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP
-	
-	# give read access to group on home
-	chmod g+r /var/lib/$APP
-	mkdir -p /var/lib/$APP/{conf,data}
-	chown $APP.$APP /var/lib/$APP/{conf,data}
-fi
\ No newline at end of file
diff --git a/dist/slc/src/main/scripts/preinstall-5 b/dist/slc/src/main/scripts/preinstall-5
new file mode 100644
index 000000000..c51911ab2
--- /dev/null
+++ b/dist/slc/src/main/scripts/preinstall-5
@@ -0,0 +1,11 @@
+if [ $1 = "1" ];then
+	APP=%{name}
+	
+	# create application user (EL5)
+	useradd -r --home-dir /var/lib/$APP --shell /sbin/nologin --create-home $APP
+	
+	# give read access to group on home
+	chmod g+r /var/lib/$APP
+	mkdir -p /var/lib/$APP/{conf,data}
+	chown $APP.$APP /var/lib/$APP/{conf,data}
+fi
\ No newline at end of file
diff --git a/dist/slc/src/main/scripts/preinstall-6 b/dist/slc/src/main/scripts/preinstall-6
new file mode 100644
index 000000000..488dac319
--- /dev/null
+++ b/dist/slc/src/main/scripts/preinstall-6
@@ -0,0 +1,11 @@
+if [ $1 = "1" ];then
+	APP=%{name}
+	
+	# create application user (EL6)
+	useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP
+	
+	# give read access to group on home
+	chmod g+r /var/lib/$APP
+	mkdir -p /var/lib/$APP/{conf,data}
+	chown $APP.$APP /var/lib/$APP/{conf,data}
+fi
\ No newline at end of file
diff --git a/dist/slc/src/main/scripts/preremove b/dist/slc/src/main/scripts/preremove
deleted file mode 100644
index 9fa0a738e..000000000
--- a/dist/slc/src/main/scripts/preremove
+++ /dev/null
@@ -1,9 +0,0 @@
-if [ $1 = "0" ];then
-	#APP=%{name} => doesn't work
-	APP=slc
-	/sbin/chkconfig --del $APP
-	userdel $APP
-	
-	# necessary for EL5? (breaks EL6)
-	#groupdel slc
-fi
diff --git a/dist/slc/src/main/scripts/preremove-5 b/dist/slc/src/main/scripts/preremove-5
new file mode 100644
index 000000000..c3c339b10
--- /dev/null
+++ b/dist/slc/src/main/scripts/preremove-5
@@ -0,0 +1,6 @@
+if [ $1 = "0" ];then
+	#APP=%{name} => doesn't work
+	APP=slc
+	/sbin/chkconfig --del $APP
+	userdel $APP
+fi
diff --git a/dist/slc/src/main/scripts/preremove-6 b/dist/slc/src/main/scripts/preremove-6
new file mode 100644
index 000000000..c3c339b10
--- /dev/null
+++ b/dist/slc/src/main/scripts/preremove-6
@@ -0,0 +1,6 @@
+if [ $1 = "0" ];then
+	#APP=%{name} => doesn't work
+	APP=slc
+	/sbin/chkconfig --del $APP
+	userdel $APP
+fi