Merge pull request #5648 from cms-sw/python3.8

Python 3.8.2: updates (git, pcre) and cleanups (qt, pyqt, thriftpy)

autotools.spec

@@ -25,8 +25,8 @@ Source5: http://pkgconfig.freedesktop.org/releases/pkg-config-%{pkgconfig_versio
 
 # Update config.{guess,sub} scripts
 rm -f %{_tmppath}/config.{sub,guess}
-curl -L -k -s -o %{_tmppath}/config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-curl -L -k -s -o %{_tmppath}/config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
+%get_config_guess %{_tmppath}/config.guess
+%get_config_sub %{_tmppath}/config.sub
 for CONFIG_GUESS_FILE in $(find $RPM_BUILD_DIR -name 'config.guess')
 do
   rm -f $CONFIG_GUESS_FILE
@@ -62,6 +62,7 @@ pushd %_builddir/gettext-%{gettext_version}
   ./configure --prefix %i \
               --without-xz \
               --without-bzip2 \
+              --with-included-libxml \
               --disable-curses \
               --disable-openmp \
               --enable-relocatable \

blackhat.spec

@@ -20,8 +20,8 @@ sed -i -e 's|else return Cached_OLHA_user_normal|else return new Cached_OLHA_use
 
 # Update to detect aarch64 and ppc64le
 rm -f ./config.{sub,guess}
-curl -L -k -s -o ./config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
-curl -L -k -s -o ./config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
+%get_config_sub ./config.sub
+%get_config_guess ./config.guess
 chmod +x ./config.{sub,guess}
 
 ./configure --prefix=%i --with-QDpath=$QD_ROOT CXXFLAGS="-Wno-deprecated -I$OPENSSL_ROOT/include" LDFLAGS="-L$OPENSSL_ROOT/lib"

build-with-pip.file

@@ -113,6 +113,7 @@ if [ $(cat files.list | wc -l) -eq 1 ] ; then
       %{?PipPreBuildPy3:%PipPreBuildPy3}
       pip3 install --upgrade --upgrade-strategy only-if-needed --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy3:%PipBuildOptionsPy3} $PIPFILE
       PKG_NAME=$(pip3 show %{pip_name} --disable-pip-version-check | grep '^Name:' | sed 's|^Name: *||;s| ||g')
+      [ "${PKG_NAME}" = "" ] && exit 1
       DEPS=$(pip3 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py2-|' | tr '\n' ' ')
       if [ "$DEPS" != "" ] ; then
         echo "ERROR: Missing dependencies for %n (python3) found: $DEPS"
@@ -126,6 +127,7 @@ if [ $(cat files.list | wc -l) -eq 1 ] ; then
       %{?PipPreBuildPy2:%PipPreBuildPy2}
       pip2 install --upgrade --upgrade-strategy only-if-needed --no-cache-dir --disable-pip-version-check --user -v %{PipInstallOptions} %{PipBuildOptions} %{?PipBuildOptionsPy2:%PipBuildOptionsPy2}  $PIPFILE
       PKG_NAME=$(pip2 show %{pip_name} --disable-pip-version-check | grep '^Name:' | sed 's|^Name: *||;s| ||g')
+      [ "${PKG_NAME}" = "" ] && exit 1
       DEPS=$(pip2 check --disable-pip-version-check | grep "^${PKG_NAME}  *%{realversion}  *requires " | sed 's|,.*||;s|.* |py2-|' | tr '\n' ' ')
       if [ "$DEPS" != "" ] ; then
         echo "ERROR: Missing dependencies for %n (python2) found: $DEPS"

bz2lib.spec

@@ -2,7 +2,6 @@
 Source: http://www.bzip.org/%{realversion}/bzip2-%{realversion}.tar.gz
 %define cpu %(echo "%{cmsplatf}" | cut -f2 -d_)
 
-%define isdarwin %(case %{cmsos} in (osx*) echo 1 ;; (*) echo 0 ;; esac)
 
 %prep
 %setup -n bzip2-%{realversion}
@@ -12,15 +11,15 @@ sed -e 's/ -shared/ -dynamiclib/' \
     < Makefile-libbz2_so > Makefile-libbz2_dylib
 
 %build
-%if %isdarwin
+%ifarch darwin
 make %{makeprocesses} -f Makefile-libbz2_dylib
 %else
 make %{makeprocesses} -f Makefile-libbz2_so
 %endif
 
 %install
 make install PREFIX=%{i}
-%if %isdarwin
+%ifarch darwin
 %define soname dylib
 %else
 %define soname so

cascade.spec

@@ -29,8 +29,8 @@ LIBS="-lstdc++ -lz"
 
 # Update to detect aarch64 and ppc64le
 rm -f ./config.{sub,guess}
-curl -L -k -s -o ./config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
-curl -L -k -s -o ./config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
+%get_config_sub ./config.sub
+%get_config_guess ./config.guess
 chmod +x ./config.{sub,guess}
 
 ./configure $PLATF_CONFIG_OPTS --with-pythia6=$PYTHIA  --with-lhapdf=$LHAPDF --prefix=%i F77="$F77" LIBS="$LIBS"