Changeset 532 for trunk

Timestamp:

Dec 19, 2017, 8:01:49 AM (7 years ago)

Author:

katerina

Message:

Fix for ticket #426 (SLES12 spec file). Also fixes yule RPM and RPMTOPDIR detection.

Location:

trunk

Files:

• Makefile.in (modified) (2 diffs)
• docs/Changelog (modified) (1 diff)
• samhain.spec.in (modified) (3 diffs)

trunk/Makefile.in

@@ -928 +928 @@
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
-        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
-        if ! test -d "$$RPMTOP"; then \
+        if test x"$$RPMTOP" = x; then \
+          try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+        else \
+          if test ! -d "$${try_RPMTOP}"; then \
+            try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+          fi; \
+        fi; \
+        if test -d "$${try_RPMTOP}"; then \
+          RPMTOP="$${try_RPMTOP}"; \
+        else \
           RPMTOP=/usr/src; \
         fi; \
@@ -948 +956 @@
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
-        if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
-        if ! test -d "$$RPMTOP"; then \
+        if test x"$$RPMTOP" = x; then \
+          try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+        else \
+          if test ! -d "$${try_RPMTOP}"; then \
+            try_RPMTOP=`echo $${HOME}/rpmbuild`; \
+          fi; \
+        fi; \
+        if test -d "$${try_RPMTOP}"; then \
+          RPMTOP="$${try_RPMTOP}"; \
+        else \
           RPMTOP=/usr/src; \
         fi; \

trunk/docs/Changelog

@@ -3 +3 @@
         * fix compiler warning because of deprecated _BSD_SOURCE macro
         * fix 'make deb' for Debian stretch (reported by Alasdair)
+        * add RPM spec file patch for SLES12 (by Pirmin)
+        * better fix for RPMTOP detection
+        * fix missing entry for yuleadmin.pl in RPM spec file
 
 4.2.3:

trunk/samhain.spec.in

@@ -14 +14 @@
 Packager: Andre Oliveira da Costa <brblueser@uol.com.br>
 Provides: %{name}
+%if 0%{?suse_version}
+Requires(pre): shadow
+%else
 Requires(pre): shadow-utils
+%endif
 
 # dummy (fix configure warning)
@@ -202 +206 @@
 %if "%{withpwd_prg}" == "xDSH_WITH_SERVER"
         @sbindir@/@install_name@ctl
+        @sbindir@/@install_name@admin.pl
         %exclude @sbindir@/@install_name@_setpwd
 %endif
@@ -214 +219 @@
 
 %changelog
+* Mon Dec 18 2017 Rainer Wichmann
+- patch for SLES12 by Pirmin
+- fix missing yuleadmin.pl file
+
 * Tue Oct 23 2012 Rainer Wichmann
 - fixes for yule installation