Changeset 58

Timestamp:

Aug 22, 2006, 11:02:10 PM (18 years ago)

Author:

rainer

Message:

Improved routine to find rpm after build.

Location:

trunk

Files:

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

trunk/Makefile.in

@@ -882 +882 @@
 rpm-light: rpmspec-light distrpm
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
-        @echo "Searching the RPM package ..."; \
-        RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
+        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
+        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; 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\.'`; \
         echo; \
         if test x"$$RPMFILE" = x; then \
@@ -890 +892 @@
         else \
           echo "Package $$RPMFILE built."; \
+          echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
           cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
         fi; \
@@ -896 +899 @@
 rpm: rpmspec-full distrpm
         rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz; 
-        @echo "Searching the RPM package ..."; \
-        RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
+        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
+        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; 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\.'`; \
         echo; \
         if test x"$$RPMFILE" = x; then \
@@ -904 +909 @@
         else \
           echo "Package $$RPMFILE built."; \
+          echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
           cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
         fi; \

trunk/docs/Changelog

@@ -1 +1 @@
 2.2.4:
+        * improve routine to find rpm after build
         * add netbsd rc file from Brian Seklecki (taken from pkgsrc-wip)
         * fix error in manual (location of lock file)