[ha-wg-technical] [nakahira.kazutomo at oss.ntt.co.jp: [Linux-ha-dev] [PATCH] fix regexp for NUMCOMMITS in the Makefile of the resource-agents-3.9.1]

[Dejan Muhamedagic]

Hi Fabio,

This looks like one for you.

Cheers,

Dejan

----- Forwarded message from NAKAHIRA Kazutomo <nakahira.kazutomo at oss.ntt.co.jp> -----

Date: Wed, 22 Jun 2011 18:04:18 +0900
From: NAKAHIRA Kazutomo <nakahira.kazutomo at oss.ntt.co.jp>
To: High-Availability Linux Development List <linux-ha-dev at lists.linux-ha.org>
Reply-To: High-Availability Linux Development List
	<linux-ha-dev at lists.linux-ha.org>
Subject: [Linux-ha-dev] [PATCH] fix regexp for NUMCOMMITS in the Makefile of
	the resource-agents-3.9.1

Hi, all

I get the latest resource-agents source code and building RPM file,
then following error occurred in my test environment.

# ./autogen.sh; ./configure
# make rpm
(snip)
error: File
/tmp/build/resource-agents/resource-agents-3.1.9.9-20b27.tar.bz2: No
such file or directory
make: *** [rpm] Error 1

It seems that version number of the resource-agents
is wrong(3.9.1.9-20b27 is correct).

It is thought to be due to version number generation
procedure for spec file has problem.
(Version 3.9.1.9 must be eliminated trailing "9",
 but second "9" eliminated.)

Please see attached patch.

Best Regards,

-- 
NAKAHIRA Kazutomo
Infrastructure Software Technology Unit
NTT Open Source Software Center

diff --git Makefile.am Makefile.am
index bd8dbeb..28634c0 100644
--- Makefile.am
+++ Makefile.am
@@ -113,7 +113,7 @@ $(SPEC): $(SPEC).in
 	if [ -n "$$alphatag" ]; then \
 		echo VERSION HAS NUMCOMMITS && \
 		numcomm=`echo $$ver | sed -e 's/.*\.//'` && \
-		ver=`echo $$ver | sed -e 's/.'$$numcomm$$'//'`; \
+		ver=`echo $$ver | sed -e 's/.'$$numcomm'$$//'`; \
 	fi && \
 	if echo $$ver | grep -q "\.[[:digit:]]rc[[:digit:]]"; then \
 		rpmver=`echo $$ver | sed -e "s/rc[[:digit:]].*//g"` && \

_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev at lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/


----- End forwarded message -----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: Makafile.patch
Type: text/x-patch
Size: 494 bytes
Desc: not available
Url : http://lists.linux-foundation.org/pipermail/ha-wg-technical/attachments/20110622/be6e3058/attachment.bin