#50684 Issue #50683 - Makefile.am contains unused RPM-related targets
Merged 3 months ago by mhonek. Opened 3 months ago by mhonek.

file modified
-40

@@ -2429,44 +2429,6 @@ 

  389-console-clean:

  	cd $(srcdir)/src/cockpit/389-console; make -f node_modules.mk clean

  

- # RPM-related tasks

- 

- RPMBUILD ?= $(abs_builddir)/rpmbuild

- 

- rpmroot:

- 	$(MKDIR_P) $(RPMBUILD)/BUILD

- 	$(MKDIR_P) $(RPMBUILD)/RPMS

- 	$(MKDIR_P) $(RPMBUILD)/SOURCES

- 	$(MKDIR_P) $(RPMBUILD)/SPECS

- 	$(MKDIR_P) $(RPMBUILD)/SRPMS

- 

- rpmbrprep: dist-bzip2 rpmroot

- 	cp $(distdir).tar.bz2 $(RPMBUILD)/SOURCES

- 	cp $(srcdir)/rpm/389-ds-base-git.sh $(RPMBUILD)/SOURCES

- 	cp $(srcdir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES

- 	sed -e "s/__VERSION__/$(RPM_VERSION)/" \

- 		-e "s/__RELEASE__/$(RPM_RELEASE)/" \

- 		-e "s/__VERSION_PREREL__/$(VERSION_PREREL)/" \

- 		-e "s/__RUST_ON__/$(RUST_ON)/" \

- 		-e "s/__CLANG_ON__/$(CLANG_ON)/" \

- 		-e "s/__PERL_ON__/$(PERL_ON)/" \

- 		-e "s/__MSAN_ON__/$(MSAN_ON)/" \

- 		-e "s/__TSAN_ON__/$(TSAN_ON)/" \

- 		-e "s/__UBSAN_ON__/$(UBSAN_ON)/" \

- 		-e "s/__ASAN_ON__/$(ASAN_ON)/" < $(abs_builddir)/rpm/389-ds-base.spec > $(RPMBUILD)/SPECS/389-ds-base.spec

- 

- # Requires rpmdevtools. Consider making this a dependancy of rpms.

- rpmsources: rpmbrprep

- 	spectool -g -S -C $(RPMBUILD)/SOURCES $(RPMBUILD)/SPECS/389-ds-base.spec

- 

- rpms: rpmbrprep

- 	cd $(RPMBUILD); \

- 	rpmbuild --define "_topdir $(RPMBUILD)" -ba SPECS/389-ds-base.spec

- 

- srpm: rpmbrprep

- 	cd $(RPMBUILD); \

- 	rpmbuild --define "_topdir $(RPMBUILD)" \

- 			 -bs SPECS/389-ds-base.spec

  

  if HAVE_DOXYGEN

  

@@ -2482,5 +2444,3 @@ 

  all-local: doxyfile.stamp

  

  endif

- 

- 

Bug Description:
Makefile.am contains some targets very similar to the ones in rpm.mk but
most likely unused by anyone and also untouched recently unlike the
rpm.mk ones.

Fix Description:
Remove the targets for cleanness and reducing confusion.

Fixes https://pagure.io/389-ds-base/issue/50683

Author: Matus Honek mhonek@redhat.com

Review by: ???

Works for me, all the build methods I use still work.

rebased onto 66a21bf

3 months ago

Pull-Request has been merged by mhonek

3 months ago
Metadata