packaging: introduce Python3 support as buildrpm --python3

Just overrule the HGPYTHON3 warning.

contrib/packaging/buildrpm

@@ -1,160 +1,166 b''
 #!/bin/bash -e
 #
 # Build a Mercurial RPM from the current repo
 #
 # Tested on
 # - Fedora 20
 # - CentOS 5
 # - centOS 6
 
 . $(dirname $0)/packagelib.sh
 
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
+PYTHONEXE=python2
 
 while [ "$1" ]; do
     case "$1" in
     --prepare )
         shift
         BUILD=
         ;;
+    --python3)
+        shift
+        PYTHONEXE=python3
+        ;;
     --withpython | --with-python)
         shift
         PYTHONVER=2.7.16
         PYTHONMD5=f1a2ace631068444831d01485466ece0
         ;;
     --rpmbuilddir )
         shift
         RPMBUILDDIR="$1"
         shift
         ;;
     * )
         echo "Invalid parameter $1!" 1>&2
         exit 1
         ;;
     esac
 done
 
 cd "`dirname $0`/../.."
 
 specfile=$PWD/contrib/packaging/mercurial.spec
 if [ ! -f $specfile ]; then
     echo "Cannot find $specfile!" 1>&2
     exit 1
 fi
 
 if [ ! -d .hg ]; then
     echo 'You are not inside a Mercurial repository!' 1>&2
     exit 1
 fi
 
 gethgversion
 
 if [ -z "$type" ] ; then
    release=1
 else
     release=0.9_$type
 fi
 
 if [ -n "$distance" ] ; then
     release=$release+${distance}_${node}
 fi
 
 if [ "$PYTHONVER" ]; then
     release=$release+$PYTHONVER
     RPMPYTHONVER=$PYTHONVER
 else
     RPMPYTHONVER=%{nil}
 fi
 
 mkdir -p $RPMBUILDDIR/{SOURCES,BUILD,SRPMS,RPMS}
 $HG archive -t tgz $RPMBUILDDIR/SOURCES/mercurial-$version-$release.tar.gz
 if [ "$PYTHONVER" ]; then
 (
     mkdir -p build
     cd build
     PYTHON_SRCFILE=Python-$PYTHONVER.tgz
     [ -f $PYTHON_SRCFILE ] || curl -Lo $PYTHON_SRCFILE http://www.python.org/ftp/python/$PYTHONVER/$PYTHON_SRCFILE
     if [ "$PYTHONMD5" ]; then
         echo "$PYTHONMD5 $PYTHON_SRCFILE" | md5sum -w -c
     fi
     ln -f $PYTHON_SRCFILE $RPMBUILDDIR/SOURCES/$PYTHON_SRCFILE
 
     DOCUTILSVER=`sed -ne "s/^%global docutilsname docutils-//p" $specfile`
     DOCUTILS_SRCFILE=docutils-$DOCUTILSVER.tar.gz
     [ -f $DOCUTILS_SRCFILE ] || curl -Lo $DOCUTILS_SRCFILE http://downloads.sourceforge.net/project/docutils/docutils/$DOCUTILSVER/$DOCUTILS_SRCFILE
     DOCUTILSMD5=`sed -ne "s/^%global docutilsmd5 //p" $specfile`
     if [ "$DOCUTILSMD5" ]; then
         echo "$DOCUTILSMD5 $DOCUTILS_SRCFILE" | md5sum -w -c
     fi
     ln -f $DOCUTILS_SRCFILE $RPMBUILDDIR/SOURCES/$DOCUTILS_SRCFILE
 )
 fi
 
 mkdir -p $RPMBUILDDIR/SPECS
 rpmspec=$RPMBUILDDIR/SPECS/mercurial.spec
 
 sed -e "s,^Version:.*,Version: $version," \
     -e "s,^Release:.*,Release: $release," \
+    -e "s/^%global pythonexe .*/%global pythonexe $PYTHONEXE/" \
     $specfile > $rpmspec
 
 echo >> $rpmspec
 echo "%changelog" >> $rpmspec
 
 if echo $version | grep '+' > /dev/null 2>&1; then
     latesttag="`echo $version | sed -e 's/+.*//'`"
     $HG log -r .:"$latesttag" -fM \
         --template '{date|hgdate}\t{author}\t{desc|firstline}\n' | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 changelog = []
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     changelog.append((datestr(hgdate, "%F"), tok[1], hgdate, tok[2]))
 prevtitle = ""
 for l in sorted(changelog, reverse=True):
     title = "* %s %s" % (datestr(l[2], "%a %b %d %Y"), l[1])
     if prevtitle != title:
         prevtitle = title
         print
         print(title)
     print("- %s" % l[3].strip())
 ' >> $rpmspec
 
 else
 
     $HG log \
          --template '{date|hgdate}\t{author}\t{desc|firstline}\n' \
          .hgtags | python -c '
 import sys, time
 
 def datestr(date, format):
     return time.strftime(format, time.gmtime(float(date[0]) - date[1]))
 
 for l in sys.stdin.readlines():
     tok = l.split("\t")
     hgdate = tuple(int(v) for v in tok[0].split())
     print("* %s %s\n- %s" % (datestr(hgdate, "%a %b %d %Y"), tok[1], tok[2]))
 ' >> $rpmspec
 
 fi
 
 sed -i \
     -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \
     $rpmspec
 
 if [ "$BUILD" ]; then
     rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean
     if [ $? = 0 ]; then
         echo
         echo "Built packages for $version-$release:"
         find $RPMBUILDDIR/*RPMS/ -type f -newer $rpmspec
     fi
 else
     echo "Prepared sources for $version-$release $rpmspec are in $RPMBUILDDIR/SOURCES/ - use like:"
     echo "rpmbuild --define '_topdir $RPMBUILDDIR' -ba $rpmspec --clean"
 fi

contrib/packaging/mercurial.spec

@@ -1,167 +1,171 b''
 %global emacs_lispdir %{_datadir}/emacs/site-lisp
 
 %define withpython %{nil}
 
 %if "%{?withpython}"
 
 %global pythonver %{withpython}
 %global pythonname Python-%{withpython}
 %global docutilsname docutils-0.14
 %global docutilsmd5 c53768d63db3873b7d452833553469de
 %global pythonhg python-hg
 %global hgpyprefix /opt/%{pythonhg}
 # byte compilation will fail on some some Python /test/ files
 %global _python_bytecompile_errors_terminate_build 0
 
 %else
 
 %global pythonexe python2
 %global pythonver %(%{pythonexe} -c 'import sys;print(".".join(map(str, sys.version_info[:2])))')
 
 %endif
 
 Summary: A fast, lightweight Source Control Management system
 Name: mercurial
 Version: snapshot
 Release: 0
 License: GPLv2+
 Group: Development/Tools
 URL: https://mercurial-scm.org/
 Source0: %{name}-%{version}-%{release}.tar.gz
 %if "%{?withpython}"
 Source1: %{pythonname}.tgz
 Source2: %{docutilsname}.tar.gz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires: make, gcc, gettext
 %if "%{?withpython}"
 BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel
 %else
-BuildRequires: python >= 2.7, python-devel, python-docutils >= 0.5
-Requires: python >= 2.7
+BuildRequires: python >= %{pythonver}, python-devel, python-docutils >= 0.5
+Requires: python >= %{pythonver}
 %endif
 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
 #Requires: tk
 
 %description
 Mercurial is a fast, lightweight source control management system designed
 for efficient handling of very large distributed projects.
 
 %prep
 
 %if "%{?withpython}"
 %setup -q -n mercurial-%{version}-%{release} -a1 -a2
 # despite the comments in cgi.py, we do this to prevent rpmdeps from picking /usr/local/bin/python up
 sed -i '1c#! /usr/bin/env %{pythonexe}' %{pythonname}/Lib/cgi.py
 %else
 %setup -q -n mercurial-%{version}-%{release}
 %endif
 
 %build
 
+export HGPYTHON3=1
+
 %if "%{?withpython}"
 
 PYPATH=$PWD/%{pythonname}
 cd $PYPATH
 ./configure --prefix=%{hgpyprefix}
 make all %{?_smp_mflags}
 cd -
 
 cd %{docutilsname}
 LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py build
 cd -
 
 # verify Python environment
 LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYPATH/python -c 'import sys, zlib, bz2, ssl, curses, readline'
 
 # set environment for make
 export PATH=$PYPATH:$PATH
 export LD_LIBRARY_PATH=$PYPATH
 export CFLAGS="-L $PYPATH"
 export PYTHONPATH=$PWD/%{docutilsname}
 
 %endif
 
 make all PYTHON=%{pythonexe}
 make -C contrib/chg
 
 sed -i -e '1s|#!/usr/bin/env python$|#!/usr/bin/env %{pythonexe}|' contrib/hg-ssh
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
+export HGPYTHON3=1
+
 %if "%{?withpython}"
 
 PYPATH=$PWD/%{pythonname}
 cd $PYPATH
 make install DESTDIR=$RPM_BUILD_ROOT
 # these .a are not necessary and they are readonly and strip fails - kill them!
 rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a
 cd -
 
 cd %{docutilsname}
 LD_LIBRARY_PATH=$PYPATH $PYPATH/python setup.py install --root="$RPM_BUILD_ROOT"
 cd -
 
 PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{hgpyprefix} MANDIR=%{_mandir}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . )
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )
 
 %else
 
 make install PYTHON=%{pythonexe} DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} MANDIR=%{_mandir}
 
 %endif
 
 install -m 755 contrib/chg/chg $RPM_BUILD_ROOT%{_bindir}/
 install -m 755 contrib/hgk $RPM_BUILD_ROOT%{_bindir}/
 install -m 755 contrib/hg-ssh $RPM_BUILD_ROOT%{_bindir}/
 
 bash_completion_dir=$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
 mkdir -p $bash_completion_dir
 install -m 644 contrib/bash_completion $bash_completion_dir/mercurial.sh
 
 zsh_completion_dir=$RPM_BUILD_ROOT%{_datadir}/zsh/site-functions
 mkdir -p $zsh_completion_dir
 install -m 644 contrib/zsh_completion $zsh_completion_dir/_mercurial
 
 mkdir -p $RPM_BUILD_ROOT%{emacs_lispdir}
 install -m 644 contrib/mercurial.el $RPM_BUILD_ROOT%{emacs_lispdir}/
 install -m 644 contrib/mq.el $RPM_BUILD_ROOT%{emacs_lispdir}/
 
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/mercurial/hgrc.d
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
 %doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi
 %doc %attr(644,root,root) %{_mandir}/man?/hg*
 %doc %attr(644,root,root) contrib/*.svg
 %dir %{_datadir}/zsh/
 %dir %{_datadir}/zsh/site-functions/
 %{_datadir}/zsh/site-functions/_mercurial
 %dir %{_datadir}/emacs/site-lisp/
 %{_datadir}/emacs/site-lisp/mercurial.el
 %{_datadir}/emacs/site-lisp/mq.el
 %{_bindir}/hg
 %{_bindir}/chg
 %{_bindir}/hgk
 %{_bindir}/hg-ssh
 %dir %{_sysconfdir}/bash_completion.d/
 %config(noreplace) %{_sysconfdir}/bash_completion.d/mercurial.sh
 %dir %{_sysconfdir}/mercurial
 %dir %{_sysconfdir}/mercurial/hgrc.d
 %if "%{?withpython}"
 %{_bindir}/%{pythonhg}
 %{hgpyprefix}
 %else
 %{_libdir}/python%{pythonver}/site-packages/%{name}-*-py%{pythonver}.egg-info
 %{_libdir}/python%{pythonver}/site-packages/%{name}
 %{_libdir}/python%{pythonver}/site-packages/hgext
 %{_libdir}/python%{pythonver}/site-packages/hgext3rd
 %{_libdir}/python%{pythonver}/site-packages/hgdemandimport
 %endif