From b145a70464c8c8f600ce2a0830c4ff27c57d849e Mon Sep 17 00:00:00 2001 From: Przemyslaw Czerpak Date: Wed, 24 Oct 2007 01:55:41 +0000 Subject: [PATCH] 2007-10-24 03:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) * harbour/harbour-ce-spec * harbour/make_rpmce.sh * automatically update version number * harbour/doc/howtobld.txt * set svn:keywords=Id * harbour/contrib/libnf/Makefile - removed test.prg --- harbour/ChangeLog | 11 +++++++++++ harbour/contrib/libnf/Makefile | 1 - harbour/harbour-ce-spec | 2 +- harbour/make_rpmce.sh | 9 +++++++-- 4 files changed, 19 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6acf1c2d58..df8622c5c0 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -8,6 +8,17 @@ 2002-12-01 13:30 UTC+0100 Foo Bar */ +2007-10-24 03:55 UTC+0200 Przemyslaw Czerpak (druzus/at/priv.onet.pl) + * harbour/harbour-ce-spec + * harbour/make_rpmce.sh + * automatically update version number + + * harbour/doc/howtobld.txt + * set svn:keywords=Id + + * harbour/contrib/libnf/Makefile + - removed test.prg + 2007-10-24 03:25 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * include/hbclass.ch * include/hbsetup.ch diff --git a/harbour/contrib/libnf/Makefile b/harbour/contrib/libnf/Makefile index e07d1c6032..1903161d3c 100644 --- a/harbour/contrib/libnf/Makefile +++ b/harbour/contrib/libnf/Makefile @@ -134,7 +134,6 @@ PRG_SOURCES= \ sysmem.prg \ tbwhile.prg \ tempfile.prg \ - test.prg \ vertmenu.prg \ vidcur.prg \ vidmode.prg \ diff --git a/harbour/harbour-ce-spec b/harbour/harbour-ce-spec index 2225a485de..798beafc9b 100644 --- a/harbour/harbour-ce-spec +++ b/harbour/harbour-ce-spec @@ -25,7 +25,7 @@ ###################################################################### %define name harbour-ce -%define version 1.1.1 +%define version 0.0.0 %define releasen 0 %define hb_pref hbce %define hb_ccpath /opt/mingw32ce/bin diff --git a/harbour/make_rpmce.sh b/harbour/make_rpmce.sh index 051475e2a0..f5aa59301e 100755 --- a/harbour/make_rpmce.sh +++ b/harbour/make_rpmce.sh @@ -46,6 +46,10 @@ get_rpmmacro() echo -n "${R}" } +cd `dirname $0` +. bin/hb-func.sh +hb_ver=`get_hbver` + NEED_RPM="make gcc binutils bash cegcc-mingw32ce" FORCE="" @@ -92,8 +96,9 @@ then else RPMDIR=`get_rpmmacro "_topdir"` fi - cp ${hb_filename} ${RPMDIR}/SOURCES/ - cp harbour-ce-spec ${RPMDIR}/SPECS/harbour-ce.spec + mv ${hb_filename} ${RPMDIR}/SOURCES/ + sed -e "s/^%define version .*$/%define version ${hb_ver}/g" \ + harbour-ce-spec > ${RPMDIR}/SPECS/harbour-ce.spec if which rpmbuild &>/dev/null then RPMBLD="rpmbuild"