Changeset 461 for trunk

Timestamp:

Nov 17, 2014, 10:57:13 AM (10 years ago)

Author:

katerina

Message:

Fix for ticket #361 (searching RPM package after build).

Location:

trunk

Files:

• Makefile.in (modified) (1 diff)
• docs/Changelog (modified) (1 diff)

trunk/Makefile.in

@@ -986 +986 @@
         @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
         if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
+        if ! test -d "$$RPMTOP"; then \
+          RPMTOP=`echo $$HOME/rpmbuild`; \
+        fi; \
         echo "Searching the RPM package below $$RPMTOP ..."; \
         RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \

trunk/docs/Changelog

@@ +1 @@
+3.1.4:
+        * search RPM in $HOME/rpmbuild if test -d _topdir fails (CentOS
+          recommends '%(echo $HOME)/topdir', reported by E. Taft)
+
 3.1.3:
         * remove initgroups() from the popen call in unix entropy gatherer