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 af3da3790597a12219edc31c6ef469f67b4a2555..bf7ea8ce054371d5574bc92f37181137e872400e 100644 (file)
--- 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 (file)
index b3953fc..0000000
--- 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 (file)
index 0000000..c51911a
--- /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 (file)
index 0000000..488dac3
--- /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 (file)
index 9fa0a73..0000000
--- 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 (file)
index 0000000..c3c339b
--- /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 (file)
index 0000000..c3c339b
--- /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