Update of /cvsroot/mhonarc/mhonarc/MHonArc
In directory subversions:/tmp/cvs-serv11694
Modified Files:
dev.mk
Log Message:
Skip rpm creation in snap mode.
Index: dev.mk
===================================================================
RCS file: /cvsroot/mhonarc/mhonarc/MHonArc/dev.mk,v
retrieving revision 2.8
retrieving revision 2.9
diff -C2 -r2.8 -r2.9
*** dev.mk 20 Jul 2003 03:26:59 -0000 2.8
--- dev.mk 27 Jul 2003 20:29:55 -0000 2.9
***************
*** 71,96 ****
rpm-bundle:
! @echo "Creating rpm..."
! @$(RM) -rf $(DIST_DIR)/rpmbuild
! $(MKDIR) -p $(DIST_DIR)/rpmbuild/BUILD \
! $(DIST_DIR)/rpmbuild/SOURCES\
! $(DIST_DIR)/rpmbuild/SPECS\
! $(DIST_DIR)/rpmbuild/SRPMS\
! $(DIST_DIR)/rpmbuild/RPMS\
! $(DIST_DIR)/rpmbuild/RPMS/noarch \
! $(DIST_DIR)/rpmbuild/buildroot
!
! $(CP) $(RPM_SPEC_FILE) $(DIST_DIR)/rpmbuild/SPECS
! (cd $(DIST_DIR)/rpmbuild/SOURCES && \
! $(LN) -s ../../$(VERSION_NAME).tar.gz)
!
! @(cd $(DIST_DIR)/rpmbuild && \
! $(RPMBUILD) --define='_topdir $(DIST_DIR)/rpmbuild' \
! --define='version $(RPM_VERSION)' \
! --define='release $(RPM_RELEASE)' \
! --buildroot $(DIST_DIR)/rpmbuild/buildroot \
! -bb SPECS/MHonArc.spec)
! $(MV) $(DIST_DIR)/rpmbuild/RPMS/noarch/*.rpm $(DIST_DIR)
! @$(RM) -rf $(DIST_DIR)/rpmbuild
tar-bundles:
--- 71,99 ----
rpm-bundle:
! @if [ "$(_SNAP_MODE)" != "1" ]; then \
! echo "Creating rpm..."; \
! $(RM) -rf $(DIST_DIR)/rpmbuild; \
! $(MKDIR) -p $(DIST_DIR)/rpmbuild/BUILD \
! $(DIST_DIR)/rpmbuild/SOURCES\
! $(DIST_DIR)/rpmbuild/SPECS\
! $(DIST_DIR)/rpmbuild/SRPMS\
! $(DIST_DIR)/rpmbuild/RPMS\
! $(DIST_DIR)/rpmbuild/RPMS/noarch \
! $(DIST_DIR)/rpmbuild/buildroot; \
! \
! $(CP) $(RPM_SPEC_FILE) $(DIST_DIR)/rpmbuild/SPECS; \
! (cd $(DIST_DIR)/rpmbuild/SOURCES && \
! $(LN) -s ../../$(VERSION_NAME).tar.gz); \
! \
! (cd $(DIST_DIR)/rpmbuild && \
! $(RPMBUILD) --define='_topdir $(DIST_DIR)/rpmbuild' \
! --define='version $(RPM_VERSION)' \
! --define='release $(RPM_RELEASE)' \
! --buildroot $(DIST_DIR)/rpmbuild/buildroot \
! -ba SPECS/MHonArc.spec); \
! $(MV) $(DIST_DIR)/rpmbuild/RPMS/noarch/*.rpm $(DIST_DIR); \
! $(MV) $(DIST_DIR)/rpmbuild/SRPMS/*.rpm $(DIST_DIR); \
! $(RM) -rf $(DIST_DIR)/rpmbuild; \
! fi
tar-bundles:
***************
*** 124,128 ****
version-check:
@if [ "$(_SNAP_MODE)" != "1" ]; then \
! $(PERL) etc/version-check.pl "$(_RELEASE_VERSION)" lib/mhamain.pl; \
fi
--- 127,133 ----
version-check:
@if [ "$(_SNAP_MODE)" != "1" ]; then \
! PERL5LIB=$(TOP)/lib \
! $(PERL) etc/version-check.pl "$(_RELEASE_VERSION)" \
! lib/mhamain.pl; \
fi
---------------------------------------------------------------------
To sign-off this list, send email to majordomo(_at_)mhonarc(_dot_)org with the
message text UNSUBSCRIBE MHONARC-DEV