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: 04-Aug-2013 23:35:02 Branch: rpm-5_4 Handle: 2013080421350100 Modified files: (Branch: rpm-5_4) rpm devtool.conf Log: - revert disabling GIT_SSL_NO_VERIFY: either export in env, or add the cert. - revert to perl-URPM svn repository: the ABF git repo is for packaging. Summary: Revision Changes Path 2.365.2.81 +7 -7 rpm/devtool.conf ____________________________________________________________________________ patch -p0 <<'@@ .' Index: rpm/devtool.conf ============================================================================ $ cvs diff -u -r2.365.2.80 -r2.365.2.81 devtool.conf --- rpm/devtool.conf 1 Aug 2013 14:31:13 -0000 2.365.2.80 +++ rpm/devtool.conf 4 Aug 2013 21:35:01 -0000 2.365.2.81 @@ -27,14 +27,14 @@ case "${name}" in libgit2) if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then - cmd="env GIT_SSL_NO_VERIFY=true git pull" + cmd="git pull" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} ) else - cmd="env GIT_SSL_NO_VERIFY=true git clone https://github.com/libgit2/libgit2.git" + cmd="git clone git://github.com/libgit2/libgit2.git" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR} && ${cmd} ) - fi + fi ;; gpsee) if [ -d ${DEVTOOL_SRCDIR}/${name}/.hg ]; then @@ -51,21 +51,21 @@ fi ;; perl-URPM) - if [ -d ${DEVTOOL_SRCDIR}/${name}/.git ]; then - cmd="env GIT_SSL_NO_VERIFY=true git pull" + if [ -d ${DEVTOOL_SRCDIR}/${name}/.svn ]; then + cmd="svn up" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR}/${name} && ${cmd} && \ cp ../scripts/URPM-Makefile.am ./Makefile.am && \ cp ../scripts/URPM-Makefile.PL.in ./Makefile.PL.in \ ) else - cmd="env GIT_SSL_NO_VERIFY=true git clone https://abf.rosalinux.ru/openmandriva/perl-URPM.git" + cmd="svn checkout http://svn.mandriva.com/svn/soft/rpm/perl-URPM/trunk perl-URPM" echo "===> ${name} (${cmd})" ( cd ${DEVTOOL_SRCDIR} && ${cmd} && \ cp scripts/URPM-Makefile.am ${name}/Makefile.am && \ cp scripts/URPM-Makefile.PL.in ${name}/Makefile.PL.in \ ) - fi + fi ;; *) release=MODULE_TAG_`echo ${name} | tr '[a-z/\-]' '[A-Z__]'` @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository rpm-cvs@rpm5.org