RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 10-Mar-2012 18:39:51
Branch: rpm-5_4 Handle: 2012031017395000
Modified files: (Branch: rpm-5_4)
rpm CHANGES devtool.conf
Log:
- devtool: fix: translate dash to underscore for release tag envvar.
- devtool: add perl-URPM internal.
Summary:
Revision Changes Path
1.3501.2.226+2 -0 rpm/CHANGES
2.365.2.33 +25 -10 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3501.2.225 -r1.3501.2.226 CHANGES
--- rpm/CHANGES 10 Mar 2012 16:15:35 -0000 1.3501.2.225
+++ rpm/CHANGES 10 Mar 2012 17:39:50 -0000 1.3501.2.226
@@ -1,4 +1,6 @@
5.4.7 -> 5.4.8:
+ - jbj: devtool: fix: translate dash to underscore for release tag envvar.
+ - jbj: devtool: add perl-URPM internal.
- jbj: tests: enable additional tests.
- jbj: mongo: upgrade the tests from the mongo-c-driver. todo++.
- jbj: mongo: upgrade to latest mongo-c-driver.
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.365.2.32 -r2.365.2.33 devtool.conf
--- rpm/devtool.conf 7 Mar 2012 14:10:10 -0000 2.365.2.32
+++ rpm/devtool.conf 10 Mar 2012 17:39:50 -0000 2.365.2.33
@@ -3,7 +3,7 @@
##
%common
- MODULE_NAMES="beecrypt gpsee libgit2 lua neon popt rc syck"
+ MODULE_NAMES="beecrypt gpsee libgit2 lua neon perl-URPM popt rc syck"
MODULE_TAG_BASH="" # XXX bash is GPLv2 and cannot be
bundled w RPM
MODULE_TAG_BEECRYPT="rpm-5_4"
MODULE_TAG_DB=""
@@ -15,6 +15,7 @@
MODULE_TAG_LUA="rpm-5_4"
MODULE_TAG_NEON="rpm-5_4"
MODULE_TAG_PCRE=""
+ MODULE_TAG_PERL_URPM=""
MODULE_TAG_POPT=""
MODULE_TAG_RC=""
MODULE_TAG_SYCK="rpm-5_4"
@@ -26,18 +27,21 @@
case "${name}" in
libgit2)
if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then
- gitcmd="git pull"
- echo "===> ${name} (${gitcmd})"
- ( cd ${DEVTOOL_SRCDIR}/${name} && ${gitcmd} )
+ cmd="git pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
else
- gitcmd="git clone git://github.com/libgit2/libgit2.git"
- echo "===> ${name} (${gitcmd})"
- ( cd ${DEVTOOL_SRCDIR} && ${gitcmd} )
+ cmd="git clone git://github.com/libgit2/libgit2.git"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
fi
;;
gpsee)
if [ -d ${DEVTOOL_SRCDIR}/${name}/.hg ]; then
- cmd="hg fetch"
+ cmd="hg pull"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ cmd="hg up"
echo "===> ${name} (${cmd})"
( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
else
@@ -46,8 +50,19 @@
( cd ${DEVTOOL_SRCDIR} && ${cmd} )
fi
;;
+ perl-URPM)
+ if [ -d ${DEVTOOL_SRCDIR}/${name}/.svn ]; then
+ cmd="svn up"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} )
+ else
+ cmd="svn checkout
http://svn.mandriva.com/svn/soft/rpm/perl-URPM/trunk perl-URPM"
+ echo "===> ${name} (${cmd})"
+ ( cd ${DEVTOOL_SRCDIR} && ${cmd} )
+ fi
+ ;;
*)
- release=MODULE_TAG_`echo ${name} | tr '[a-z/]' '[A-Z_]'`
+ release=MODULE_TAG_`echo ${name} | tr '[a-z/\-]' '[A-Z__]'`
release=`eval echo \\$${release}`
if [ ".${release}" = . ]; then
if [ -d ${DEVTOOL_SRCDIR}/${name}/CVS ]; then
@@ -478,7 +493,7 @@
--without-bash \
--with-rc \
--without-js \
- --without-gpsee \
+ --with-gpsee=internal \
--with-python \
--with-pythonembed=/usr/lib:/usr/include/python2.6 \
--with-perl \
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
