diff options
| author | Clark Williams <williams@redhat.com> | 2009-11-16 16:16:51 -0600 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2009-11-16 16:16:51 -0600 |
| commit | 18aeb5b777522236302916abefe22b89431383d5 (patch) | |
| tree | ffa186f1cc089e5b6c2fbb7c103c3961dd14b698 | |
| parent | 725e8dd67a14cdec821dbd74df4467d9a76558c7 (diff) | |
| download | mock-18aeb5b777522236302916abefe22b89431383d5.tar.gz mock-18aeb5b777522236302916abefe22b89431383d5.tar.xz mock-18aeb5b777522236302916abefe22b89431383d5.zip | |
version bump to 0.9.20mock-0.9.20
Added autoconf/automake mojo to choose rpmbuild-md5 if available
Signed-off-by: Clark Williams <williams@redhat.com>
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | mock.spec.in | 5 |
3 files changed, 17 insertions, 4 deletions
diff --git a/Makefile.am b/Makefile.am index 4fe1e7d..41ea8a2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -90,15 +90,21 @@ RPM_DEFINES = --define "_topdir $(TOPDIR)" \ --define "_specdir $(SPECDIR)" \ --define "_srcrpmdir $(SRCRPMDIR)" +if USE_MD5 +RPMBUILD := rpmbuild-md5 +else +RPMBUILD := rpmbuild +endif + .PHONY: rpm srpm help rpm: dist mkdir -p $(BUILDDIR) - rpmbuild $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec + $(RPMBUILD) $(RPM_DEFINES) -ba --nodeps $(PACKAGE_NAME).spec rm -rf $(BUILDDIR) srpm: dist mkdir -p $(BUILDDIR) - rpmbuild $(RPM_DEFINES) -bs --nodeps $(PACKAGE_NAME).spec + $(RPMBUILD) $(RPM_DEFINES) -bs --nodeps $(PACKAGE_NAME).spec rm -rf $(BUILDDIR) diff --git a/configure.ac b/configure.ac index b9ab9ca..fb7f8f6 100644 --- a/configure.ac +++ b/configure.ac @@ -4,12 +4,12 @@ #################################### # change version here. --> BOTH PLACES PLEASE! -AC_INIT([mock],[0.9.19]) +AC_INIT([mock],[0.9.20]) temp_RELEASE_NAME=mock temp_RELEASE_MAJOR=0 temp_RELEASE_MINOR=9 -temp_RELEASE_SUBLEVEL=19 +temp_RELEASE_SUBLEVEL=20 temp_RELEASE_EXTRALEVEL= #################################### @@ -53,6 +53,8 @@ PACKAGE_VERSION=[`echo ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${RE PACKAGE_STRING=[`echo ${RELEASE_NAME} ${RELEASE_MAJOR}.${RELEASE_MINOR}.${RELEASE_SUBLEVEL}${RELEASE_EXTRALEVEL}`] VERSION=$PACKAGE_VERSION +AM_CONDITIONAL(USE_MD5, test -e /usr/bin/rpmbuild-md5) + AC_SUBST([RELEASE_NAME]) AC_SUBST([RELEASE_MAJOR]) AC_SUBST([RELEASE_MINOR]) diff --git a/mock.spec.in b/mock.spec.in index 2d9d557..4cf6b38 100644 --- a/mock.spec.in +++ b/mock.spec.in @@ -97,6 +97,11 @@ fi %attr(02775, root, mock) %dir /var/cache/mock %changelog +* Fri Nov 13 2009 Clark Williams <williams@redhat.com>- 0.9.20-1 +- conditionalized import of uuid to avoid failure on RHEL5 +- added autoconf/automake mojo to prefer using rpmbuild-md5 for + cross-platform rpm compatibility + * Thu Nov 5 2009 Jesse Keating <jkeating@redhat.com>- 0.9.19-1 - Fix target arch for i386 on 12 and rawhide |