Changeset 532


Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.in

    r531 r532  
    928928        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    929929        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
    930         if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
    931         if ! test -d "$$RPMTOP"; then \
     930        if test x"$$RPMTOP" = x; then \
     931          try_RPMTOP=`echo $${HOME}/rpmbuild`; \
     932        else \
     933          if test ! -d "$${try_RPMTOP}"; then \
     934            try_RPMTOP=`echo $${HOME}/rpmbuild`; \
     935          fi; \
     936        fi; \
     937        if test -d "$${try_RPMTOP}"; then \
     938          RPMTOP="$${try_RPMTOP}"; \
     939        else \
    932940          RPMTOP=/usr/src; \
    933941        fi; \
     
    948956        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    949957        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
    950         if test x"$$RPMTOP" = x; then RPMTOP=`echo $$HOME/rpmbuild`; fi; \
    951         if ! test -d "$$RPMTOP"; then \
     958        if test x"$$RPMTOP" = x; then \
     959          try_RPMTOP=`echo $${HOME}/rpmbuild`; \
     960        else \
     961          if test ! -d "$${try_RPMTOP}"; then \
     962            try_RPMTOP=`echo $${HOME}/rpmbuild`; \
     963          fi; \
     964        fi; \
     965        if test -d "$${try_RPMTOP}"; then \
     966          RPMTOP="$${try_RPMTOP}"; \
     967        else \
    952968          RPMTOP=/usr/src; \
    953969        fi; \
  • trunk/docs/Changelog

    r531 r532  
    33        * fix compiler warning because of deprecated _BSD_SOURCE macro
    44        * fix 'make deb' for Debian stretch (reported by Alasdair)
     5        * add RPM spec file patch for SLES12 (by Pirmin)
     6        * better fix for RPMTOP detection
     7        * fix missing entry for yuleadmin.pl in RPM spec file
    58
    694.2.3:
  • trunk/samhain.spec.in

    r495 r532  
    1414Packager: Andre Oliveira da Costa <brblueser@uol.com.br>
    1515Provides: %{name}
     16%if 0%{?suse_version}
     17Requires(pre): shadow
     18%else
    1619Requires(pre): shadow-utils
     20%endif
    1721
    1822# dummy (fix configure warning)
     
    202206%if "%{withpwd_prg}" == "xDSH_WITH_SERVER"
    203207        @sbindir@/@install_name@ctl
     208        @sbindir@/@install_name@admin.pl
    204209        %exclude @sbindir@/@install_name@_setpwd
    205210%endif
     
    214219
    215220%changelog
     221* Mon Dec 18 2017 Rainer Wichmann
     222- patch for SLES12 by Pirmin
     223- fix missing yuleadmin.pl file
     224
    216225* Tue Oct 23 2012 Rainer Wichmann
    217226- fixes for yule installation
Note: See TracChangeset for help on using the changeset viewer.