Changeset 58 for trunk


Ignore:
Timestamp:
Aug 22, 2006, 11:02:10 PM (18 years ago)
Author:
rainer
Message:

Improved routine to find rpm after build.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • trunk/Makefile.in

    r57 r58  
    882882rpm-light: rpmspec-light distrpm
    883883        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    884         @echo "Searching the RPM package ..."; \
    885         RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
     884        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
     885        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
     886        echo "Searching the RPM package below $$RPMTOP ..."; \
     887        RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
    886888        echo; \
    887889        if test x"$$RPMFILE" = x; then \
    … …  
    890892        else \
    891893          echo "Package $$RPMFILE built."; \
     894          echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
    892895          cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
    893896        fi; \
    … …  
    896899rpm: rpmspec-full distrpm
    897900        rpmbuild -ta ./$(PACKAGE)-$(VERSION).tar.gz;
    898         @echo "Searching the RPM package ..."; \
    899         RPMFILE=`find /usr/src -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
     901        @RPMTOP=`cat ~/.rpmmacros 2>/dev/null | grep '%_topdir' | awk '{ print $$2}'`; \
     902        if test x"$$RPMTOP" = x; then RPMTOP=/usr/src; fi; \
     903        echo "Searching the RPM package below $$RPMTOP ..."; \
     904        RPMFILE=`find $$RPMTOP -follow -maxdepth 4 -cnewer ./samhain.spec 2>/dev/null | grep '@install_name@-$(VERSION)' | grep '\.rpm' | grep -v '\.src\.'`; \
    900905        echo; \
    901906        if test x"$$RPMFILE" = x; then \
    … …  
    904909        else \
    905910          echo "Package $$RPMFILE built."; \
     911          echo "Copying it to ./$(PACKAGE)-$(VERSION).rpm"; \
    906912          cp $$RPMFILE ./$(PACKAGE)-$(VERSION).rpm; \
    907913        fi; \

  • trunk/docs/Changelog

    r57 r58  
    112.2.4:
     2        * improve routine to find rpm after build
    23        * add netbsd rc file from Brian Seklecki (taken from pkgsrc-wip)
    34        * fix error in manual (location of lock file)
Note: See TracChangeset for help on using the changeset viewer.