Changeset 547 for trunk

Timestamp:

May 1, 2019, 1:33:39 PM (6 years ago)

Author:

katerina

Message:

Fix for ticket #438 (problems with RPM spec file).

File:

• trunk/samhain.spec.in (modified) (4 diffs)

trunk/samhain.spec.in

@@ -73 +73 @@
 make
 %if "%{withpwd_prg}" == "xDSH_WITH_CLIENT"
-%if 0%{?password}
+%if "%{password}" != ""
         ./samhain_setpwd samhain new %{password}
         mv samhain samhain.old
@@ -115 +115 @@
 
 %post
-if test "x@sh_lkm@" = x; then
-   :
-else
-   if test -f /sbin/depmod; then
-     /sbin/depmod -a
-   fi
-fi
 if [ "$1" -ge 1 ]; then
         # Activate boot-time start up
@@ -193 +186 @@
 %files -f sh_file_list
 %defattr(-,root,root)
-%dir @mylockdir@
-%dir @mylogdir@
+%if "@mylockdir@" != "/run" || "@mylockdir@" != "/var/run"
+        %dir @mylockdir@
+%endif
+%if "@mylogdir@" != "/var/log"
+        %dir @mylogdir@
+%endif
 %doc docs/BUGS COPYING docs/Changelog 
 %doc LICENSE docs/FAQ.html docs/HOWTO* docs/MANUAL-2_4.* docs/README*
@@ -219 +216 @@
 
 %changelog
+* Wed May 01 2019 Rainer Wichmann
+- remove obsolete part fpr sh_lkm
+- add fixes by Franky Van L. (password, directory ownership)
+
 * Mon Dec 18 2017 Rainer Wichmann
 - patch for SLES12 by Pirmin