Browse Source

Ticket 48397 - Fix cwd and rpmsources target

Bug Description:  The rpmbuild directory is placed into CWD instead of the build
directory.

The sources for the rpm must be manually downloaded.

Fix Description:  Move the rpmbuild directory target to the autotools build
directory.

Add a new make target that, rpmsources that will fetch the required sources.

https://fedorahosted.org/389/ticket/48397

Author: wibrown

Review by: mreynolds
William Brown 10 years ago
parent
commit
22ec6b2f3d
2 changed files with 9 additions and 2 deletions
  1. 4 1
      Makefile.am
  2. 5 1
      Makefile.in

+ 4 - 1
Makefile.am

@@ -1950,7 +1950,7 @@ git-archive:
 
 # RPM-related tasks
 
-RPMBUILD ?= $(PWD)/rpmbuild
+RPMBUILD ?= $(abs_builddir)/rpmbuild
 
 rpmroot:
 	$(MKDIR_P) $(RPMBUILD)/BUILD
@@ -1965,6 +1965,9 @@ rpmbrprep: dist-bzip2 rpmroot
 	cp $(srcdir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES
 	sed -e "s/__VERSION__/$(RPM_VERSION)/" -e "s/__RELEASE__/$(RPM_RELEASE)/" -e "s/__NUNC_STANS_ON__/$(NUNC_STANS_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); \

+ 5 - 1
Makefile.in

@@ -10788,7 +10788,7 @@ git-archive:
 
 # RPM-related tasks
 
-RPMBUILD ?= $(PWD)/rpmbuild
+RPMBUILD ?= $(abs_builddir)/rpmbuild
 
 rpmroot:
 	$(MKDIR_P) $(RPMBUILD)/BUILD
@@ -10803,6 +10803,10 @@ rpmbrprep: dist-bzip2 rpmroot
 	cp $(srcdir)/rpm/389-ds-base-devel.README $(RPMBUILD)/SOURCES
 	sed -e "s/__VERSION__/$(RPM_VERSION)/" -e "s/__RELEASE__/$(RPM_RELEASE)/" -e "s/__NUNC_STANS_ON__/$(NUNC_STANS_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