This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project iwhd.git.
The branch, gnulib has been updated via 4d64b213464a20f4c28921b3ed68c0240d9c99dd (commit) from 162167233c1f92809060154dbed4be3146c5f504 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- http://repo.or.cz/w/iwhd.git/commit/4d64b213464a20f4c28921b3ed68c0240d9c99dd
commit 4d64b213464a20f4c28921b3ed68c0240d9c99dd Author: Jim Meyering meyering@redhat.com Date: Thu Dec 16 16:55:54 2010 +0100
build: make the "rpm" rule work once again
* Makefile.am (rpm): Accommodate a version number string like "0.0.273-1621", that contains a hyphen: s/-/./ (iwhd.spec): Depend on Makefile, not Makefile.am, so that a version number change provokes an update.
diff --git a/Makefile.am b/Makefile.am index fa7edb8..4360dd4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,18 +58,38 @@ iwhd_SOURCES = EXTRA_iwhd_SOURCES = qlexer.l
+VERSION_no_hyphen = $$(echo $(VERSION)|tr - _) + MOSTLYCLEANFILES += iwhd.spec MAINTAINERCLEANFILES += iwhd.spec -iwhd.spec: iwhd.spec.in Makefile.am +iwhd.spec: iwhd.spec.in Makefile rm -f $@-t $@ - sed 's/@''VERSION@/$(VERSION)/' $< > $@-t + v=$$(echo $(VERSION)|tr - .); + sed 's/[@]VERSION@/'"$$v"/ $< > $@-t chmod a=r $@-t mv $@-t $@
+# The following rule accommodates pre-release version number strings +# like "0.0.273-1621" that contain a "-". Repack the tarball +# to one with "." substituted for any - in the version string. .PHONY: rpm rpm: dist iwhd.spec chmod 644 $(distdir).tar.gz - rpmbuild -ta $(distdir).tar.gz + case $(VERSION) in + *-*) + v=$$(echo $(VERSION)|tr - .); + base=$(PACKAGE)-$$v; + tgz=$$base.tar.gz; + tar xf $(distdir).tar.gz + && rm -rf $$base $$tgz + && mv $(distdir) $$base + && tar -czf - $$base > $$tgz + && rpmbuild -ta $$tgz; e=$$? + rm -rf $$base $$tgz; + exit $$e + ;; + *) rpmbuild -ta $(distdir).tar.gz ;; + esac
iwhd_CPPFLAGS = $(HAIL_CFLAGS) -I$(top_srcdir)/lib iwhd_LDADD = -----------------------------------------------------------------------
Summary of changes: Makefile.am | 26 +++++++++++++++++++++++--- 1 files changed, 23 insertions(+), 3 deletions(-)
repo.or.cz automatic notification. Contact project admin jim@meyering.net if you want to unsubscribe, or site admin admin@repo.or.cz if you receive no reply.
iwhd-commit@lists.fedorahosted.org