diff --git a/make/rpmdist.mk b/make/rpmdist.mk index ad96320e..1c86266c 100644 --- a/make/rpmdist.mk +++ b/make/rpmdist.mk @@ -115,8 +115,6 @@ PKG_SH = $(PKG_SH_EXE) \ -m $(JWB_SCRIPT_DIR) -a $(RPM_ARCH) -p $(DIST_PCKG_DIR) -F $(PKG_FORMAT) \ -B $(RPM_UPLOAD_URLPREFIX) -A $(RPM_UPLOAD_FILE_ATTRIB) -# -t $(DIST_SRC_DIR) # wrong: contains $(RPM_PROJECT)-$(RPM_VERSION) but is expected differently - all: install: clean: pkg-clean @@ -129,7 +127,6 @@ pkg-upload-stable: pkg-upload-STABLE.dist pkg-upload-rc: pkg-upload-RC.dist pkg-clean: clean.rpm -#pkg-clean: clean.mkspec pkg-uninstall: config pkguninstall.dist pkg-build: pkg-build.dist pkg-install: config pkg-build pkginstall.dist @@ -141,20 +138,6 @@ pkg-upload-local: pkg-upload-local.dist clean.rpm: $(RM) -rf $(DIST_DIR) *.dist make/.cache-project.mk -#ifeq ($(PROJECT_DESCR_FILE),) -# -#clean.mkspec: -# -#else -# -#$(LOCAL_MKSPEC_SH): $(PROJECT_DESCR_FILE) -# sh $(JWB_SCRIPT_DIR)/create-mkspec.sh $< > $@.tmp -# mv $@.tmp $@ -# -#clean.mkspec: -# $(RM) -f $(LOCAL_MKSPEC_SH) $(LOCAL_MKSPEC_SH).tmp -# -#endif pkg-build.dist: $(VERSION_FILE) $(PKG_SH) build $(PKG_SH_BUILD_OPTS) @@ -172,23 +155,6 @@ src-dir.dist: mkdir -p $(DIST_SRC_DIR) touch $@ -#%.tar.gz: $(RPM_EXTRA_FILES) cpfiles.dist -# mkdir -p $(DIST_PCKG_DIR) -# tar --anchored $(addprefix --exclude=,$(GENERATED)) \ -# -czvf $@ -C $(dir $(DIST_SRC_DIR)) $(notdir $(DIST_SRC_DIR)) -# -#$(DIST_PCKG_SRPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) -# $(RPMBUILD) -ts $< -# cp $(SRPMS_DIR)/$(PCKG_RPM_SRC) $(dir $@)/ -# -#$(DIST_PCKG_RPM): $(DIST_PCKG_DIR)/$(PCKG_TAR) -# if [ $< -nt $(RPMS_DIR)/$(notdir $@) ]; then $(RPMBUILD) -tb $<; fi -# cp $(addprefix $(RPMS_DIR)/,$(notdir $(DIST_PCKG_RPM))) $(dir $@)/ -# -#$(DIST_PCKG_DIR)/CURRENT_%: $(TOPDIR)/VERSION -# echo $(CURRENT_$*) > $@ -# - pkgbuild.dist: $(DIST_PCKG_RPM) $(DIST_PCKG_SRPM) $(DIST_FILES) touch $@ @@ -205,13 +171,6 @@ pkginstall.dist: pkg-build.dist done touch $@ -#pkgupdate.dist: $(DIST_PCKG_RPM) -# @set -e; for p in $^; do \ -# echo + updating $$p ;\ -# sudo /bin/rpm -U --replacepkgs --replacefiles $$p; \ -# done -# touch $@ - pkguninstall.dist: $(Q)set -e; for s in devel run; do \ if $(RPM) -q $(RPM_PROJECT)-$$s > /dev/null 2>&1 ; then \ @@ -336,9 +295,6 @@ pkg-release: pkg-release-reinstall pkg-rebuild-reinstall: pkg-clean pkg-build pkg-reinstall -# doesn't work -# pkg-release-update: pkg-release pkg-update - pkg-release-reinstall: get-maintainer get-official $(PKG_SH) release $(PKG_SH_BUILD_OPTS) ifneq ($(TARGET_HOST),)