[389-commits] configure configure.ac Makefile.am Makefile.in rpm.mk rpm/rpmverrel.sh

[Nathan Kinder]

 Makefile.am      |   41 -----------------------------------------
 Makefile.in      |   43 -------------------------------------------
 configure        |    9 ---------
 configure.ac     |    7 -------
 rpm.mk           |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++
 rpm/rpmverrel.sh |   11 +++++++++++
 6 files changed, 62 insertions(+), 100 deletions(-)

New commits:
commit bf49d6a6b7a7865b29de5b1441bc08b4426ba3a2
Author: Nathan Kinder <nkinder(a)redhat.com&gt;
Date:   Sun Apr 21 20:35:48 2013 -0700

    Allow rpm builds to be run without configure
    
    The previous patch that added support to build RPM packages required
    you to run configure before we could even create a SRPM.  We had to
    do this since Makefile is generated by automake when configure is
    run.  This isn't useful when you just want to create a SRPM to use
    for performing mock builds since the system you are creating a SRPM
    on might not even have the proper build dependencies availble.
    
    This patch removes the need to run configure when building RPMS. A
    new Makefile is added that is only used for RPM related tasks. A
    target to build a SRPM was also added to allow one to create a SRPM
    for using with mock builds.  To build a SRPM or RPMS with this patch,
    you can just run one of the following commands with a freshly checked
    out source tree:
    
        make -f rpm.mk srpms
        make -f rpm.mk rpms
    
    The rpms, srpms, and source tarball will be creates in a dist
    directory in the build tree.

diff --git a/Makefile.am b/Makefile.am
index a35f8e4..7f00b07 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,15 +6,6 @@ COLON := $(NULLSTRING):# a colon
 QUOTE := $(NULLSTRING)"# a double quote"
 
 #------------------------
-# RPM Packaging
-#------------------------
-RPMBUILD ?= $(PWD)/rpmbuild
-RPM_VERSION=@rpm_version@
-RPM_RELEASE=@rpm_release@
-RPM_NAME_VERSION=$(PACKAGE)-$(RPM_VERSION)
-TARBALL=$(RPM_NAME_VERSION).tar.bz2
-
-#------------------------
 # Compiler Flags
 #------------------------
 BUILDNUM := $(shell perl $(srcdir)/buildnum.pl)
@@ -1684,35 +1675,3 @@ git-archive:
 	fi ; \
 	git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2
 
-local-archive:
-	-mkdir -p dist/$(RPM_NAME_VERSION)
-	rsync -a --exclude=dist --exclude=.git --exclude=rpmbuild $(srcdir)/.
dist/$(RPM_NAME_VERSION)
-
-tarballs: local-archive
-	-mkdir -p dist/sources
-	cd dist; tar cfj sources/$(TARBALL) $(RPM_NAME_VERSION)
-	rm -rf dist/$(RPM_NAME_VERSION)
-
-rpmroot:
-	rm -rf $(RPMBUILD)
-	mkdir -p $(RPMBUILD)/BUILD
-	mkdir -p $(RPMBUILD)/RPMS
-	mkdir -p $(RPMBUILD)/SOURCES
-	mkdir -p $(RPMBUILD)/SPECS
-	mkdir -p $(RPMBUILD)/SRPMS
-
-rpmdistdir:
-	mkdir -p dist/rpms
-	mkdir -p dist/srpms
-
-rpms: rpmroot rpmdistdir tarballs
-	cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/
-	cp $(srcdir)/rpm/$(PACKAGE)-* $(RPMBUILD)/SOURCES/
-	sed -e s/__VERSION__/$(RPM_VERSION)/ -e s/__RELEASE__/$(RPM_RELEASE)/ \
-                $(srcdir)/rpm/$(PACKAGE).spec.in > $(RPMBUILD)/SPECS/$(PACKAGE).spec
-	rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec
-	cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/
-	cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/
-	cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/
-	rm -rf $(RPMBUILD)
-
diff --git a/Makefile.in b/Makefile.in
index b34d1f6..c1f207e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1310,8 +1310,6 @@ prefix = @prefix@
 program_transform_name = @program_transform_name@
 propertydir = $(datadir)@propertydir@
 psdir = @psdir@
-rpm_release = @rpm_release@
-rpm_version = @rpm_version@
 sampledatadir = $(datadir)@sampledatadir@
 sasl_inc = @sasl_inc@
 sasl_lib = @sasl_lib@
@@ -1348,10 +1346,6 @@ NULLSTRING :=
 SPACE := $(NULLSTRING) # the space is between the ) and the #
 COLON := $(NULLSTRING):# a colon
 QUOTE := $(NULLSTRING)"# a double quote"
-RPM_VERSION = @rpm_version@
-RPM_RELEASE = @rpm_release@
-RPM_NAME_VERSION = $(PACKAGE)-$(RPM_VERSION)
-TARBALL = $(RPM_NAME_VERSION).tar.bz2
 
 #------------------------
 # Compiler Flags
@@ -10909,11 +10903,6 @@ uninstall-man: uninstall-man1 uninstall-man8
 	uninstall-updateDATA uninstall-updateSCRIPTS
 
 
-#------------------------
-# RPM Packaging
-#------------------------
-RPMBUILD ?= $(PWD)/rpmbuild
-
 clean-local:
 	-rm -rf dist
 	-rm -rf selinux-built
@@ -10993,38 +10982,6 @@ git-archive:
 	fi ; \
 	git archive --prefix=$(distdir)/ $$gittag | bzip2 > $$srcdistdir/$(distdir).tar.bz2
 
-local-archive:
-	-mkdir -p dist/$(RPM_NAME_VERSION)
-	rsync -a --exclude=dist --exclude=.git --exclude=rpmbuild $(srcdir)/.
dist/$(RPM_NAME_VERSION)
-
-tarballs: local-archive
-	-mkdir -p dist/sources
-	cd dist; tar cfj sources/$(TARBALL) $(RPM_NAME_VERSION)
-	rm -rf dist/$(RPM_NAME_VERSION)
-
-rpmroot:
-	rm -rf $(RPMBUILD)
-	mkdir -p $(RPMBUILD)/BUILD
-	mkdir -p $(RPMBUILD)/RPMS
-	mkdir -p $(RPMBUILD)/SOURCES
-	mkdir -p $(RPMBUILD)/SPECS
-	mkdir -p $(RPMBUILD)/SRPMS
-
-rpmdistdir:
-	mkdir -p dist/rpms
-	mkdir -p dist/srpms
-
-rpms: rpmroot rpmdistdir tarballs
-	cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/
-	cp $(srcdir)/rpm/$(PACKAGE)-* $(RPMBUILD)/SOURCES/
-	sed -e s/__VERSION__/$(RPM_VERSION)/ -e s/__RELEASE__/$(RPM_RELEASE)/ \
-                $(srcdir)/rpm/$(PACKAGE).spec.in > $(RPMBUILD)/SPECS/$(PACKAGE).spec
-	rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec
-	cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/
-	cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/
-	cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/
-	rm -rf $(RPMBUILD)
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/configure b/configure
index 5c57f94..2e4c799 100755
--- a/configure
+++ b/configure
@@ -616,8 +616,6 @@ ac_default_prefix=/opt/$PACKAGE_NAME
 ac_subst_vars='am__EXEEXT_FALSE
 am__EXEEXT_TRUE
 LTLIBOBJS
-rpm_release
-rpm_version
 vendor
 capbrand
 brand
@@ -3345,10 +3343,6 @@ case $host_os in *\ *) host_os=`echo "$host_os" | sed
's/ /-/g'`;; esac
 
 
 
-# Set the version and release for developer RPM builds
-rpm_version=$RPM_VERSION
-rpm_release=$RPM_RELEASE
-
 # Checks for programs.
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -21168,9 +21162,6 @@ fi
 
 
 
-
-
-
 # AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code])
 
 $as_echo "#define LDAP_DEBUG 1" >>confdefs.h
diff --git a/configure.ac b/configure.ac
index 7d61149..c6edbfa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,6 @@ AC_SUBST([CONSOLE_VERSION])
 AM_MAINTAINER_MODE
 AC_CANONICAL_HOST
 
-# Set the version and release for developer RPM builds
-rpm_version=$RPM_VERSION
-rpm_release=$RPM_RELEASE
-
 # Checks for programs.
 AC_PROG_CXX
 AC_PROG_CC
@@ -690,9 +686,6 @@ AC_SUBST(brand)
 AC_SUBST(capbrand)
 AC_SUBST(vendor)
 
-AC_SUBST(rpm_version)
-AC_SUBST(rpm_release)
-
 # AC_DEFINE([USE_OLD_UNHASHED], [], [Use old unhashed code])
 AC_DEFINE([LDAP_DEBUG], [1], [LDAP debug flag])
 AC_DEFINE([LDAP_DONT_USE_SMARTHEAP], [1], [Don't use smartheap])
diff --git a/rpm.mk b/rpm.mk
new file mode 100644
index 0000000..dfbadc6
--- /dev/null
+++ b/rpm.mk
@@ -0,0 +1,51 @@
+RPMBUILD ?= $(PWD)/rpmbuild
+RPM_VERSION ?= $(shell $(PWD)/rpm/rpmverrel.sh version)
+RPM_RELEASE ?= $(shell $(PWD)/rpm/rpmverrel.sh release)
+PACKAGE = 389-ds-base
+RPM_NAME_VERSION = $(PACKAGE)-$(RPM_VERSION)
+TARBALL = $(RPM_NAME_VERSION).tar.bz2
+
+clean:
+	rm -rf dist
+	rm -rf rpmbuild
+
+local-archive:
+	-mkdir -p dist/$(RPM_NAME_VERSION)
+	rsync -a --exclude=dist --exclude=.git --exclude=rpmbuild . dist/$(RPM_NAME_VERSION)
+
+tarballs: local-archive
+	-mkdir -p dist/sources
+	cd dist; tar cfj sources/$(TARBALL) $(RPM_NAME_VERSION)
+	rm -rf dist/$(RPM_NAME_VERSION)
+
+rpmroot:
+	rm -rf $(RPMBUILD)
+	mkdir -p $(RPMBUILD)/BUILD
+	mkdir -p $(RPMBUILD)/RPMS
+	mkdir -p $(RPMBUILD)/SOURCES
+	mkdir -p $(RPMBUILD)/SPECS
+	mkdir -p $(RPMBUILD)/SRPMS
+
+rpmdistdir:
+	mkdir -p dist/rpms
+
+srpmdistdir:
+	mkdir -p dist/srpms
+
+rpmbuildprep:
+	cp dist/sources/$(TARBALL) $(RPMBUILD)/SOURCES/
+	cp rpm/$(PACKAGE)-* $(RPMBUILD)/SOURCES/
+	sed -e s/__VERSION__/$(RPM_VERSION)/ -e s/__RELEASE__/$(RPM_RELEASE)/ \
+		rpm/$(PACKAGE).spec.in > $(RPMBUILD)/SPECS/$(PACKAGE).spec
+
+srpms: rpmroot srpmdistdir tarballs rpmbuildprep
+	rpmbuild --define "_topdir $(RPMBUILD)" -bs $(RPMBUILD)/SPECS/$(PACKAGE).spec
+	cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/
+	rm -rf $(RPMBUILD)
+
+rpms: rpmroot srpmdistdir rpmdistdir tarballs rpmbuildprep
+	rpmbuild --define "_topdir $(RPMBUILD)" -ba $(RPMBUILD)/SPECS/$(PACKAGE).spec
+	cp $(RPMBUILD)/RPMS/*/$(RPM_NAME_VERSION)-*.rpm dist/rpms/
+	cp $(RPMBUILD)/RPMS/*/$(PACKAGE)-*-$(RPM_VERSION)-*.rpm dist/rpms/
+	cp $(RPMBUILD)/SRPMS/$(RPM_NAME_VERSION)-*.src.rpm dist/srpms/
+	rm -rf $(RPMBUILD)
diff --git a/rpm/rpmverrel.sh b/rpm/rpmverrel.sh
new file mode 100755
index 0000000..064b052
--- /dev/null
+++ b/rpm/rpmverrel.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# Source VERSION.sh to set the version
+# and release environment variables.
+source ./VERSION.sh
+
+if [ "$1" = "version" ]; then
+  echo $RPM_VERSION
+elif [ "$1" = "release" ]; then
+  echo $RPM_RELEASE
+fi