Changeset 532
- Timestamp:
- Dec 19, 2017, 8:01:49 AM (7 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Makefile.in
r531 r532 928 928 rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 929 929 @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 \ 932 940 RPMTOP=/usr/src; \ 933 941 fi; \ … … 948 956 rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 949 957 @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 \ 952 968 RPMTOP=/usr/src; \ 953 969 fi; \ -
trunk/docs/Changelog
r531 r532 3 3 * fix compiler warning because of deprecated _BSD_SOURCE macro 4 4 * 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 5 8 6 9 4.2.3: -
trunk/samhain.spec.in
r495 r532 14 14 Packager: Andre Oliveira da Costa <brblueser@uol.com.br> 15 15 Provides: %{name} 16 %if 0%{?suse_version} 17 Requires(pre): shadow 18 %else 16 19 Requires(pre): shadow-utils 20 %endif 17 21 18 22 # dummy (fix configure warning) … … 202 206 %if "%{withpwd_prg}" == "xDSH_WITH_SERVER" 203 207 @sbindir@/@install_name@ctl 208 @sbindir@/@install_name@admin.pl 204 209 %exclude @sbindir@/@install_name@_setpwd 205 210 %endif … … 214 219 215 220 %changelog 221 * Mon Dec 18 2017 Rainer Wichmann 222 - patch for SLES12 by Pirmin 223 - fix missing yuleadmin.pl file 224 216 225 * Tue Oct 23 2012 Rainer Wichmann 217 226 - fixes for yule installation
Note:
See TracChangeset
for help on using the changeset viewer.