fix build issues - utf-8 gpg uid still not supported for most rpm based distros
This commit is contained in:
		@@ -206,8 +206,8 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
 | 
				
			|||||||
  AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
 | 
					  AUTHOR_NAME=$(echo $AUTHOR | sed 's, *[[<(]].*$,,')
 | 
				
			||||||
  AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
 | 
					  AUTHOR_URL=$(echo $AUTHOR | sed 's,.*(\(http[[^)]]*\)).*,\1,')
 | 
				
			||||||
  AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
 | 
					  AUTHOR_MAIL=$(echo $AUTHOR | sed 's,.*<\(.*@.*\)>.*,\1,')
 | 
				
			||||||
  PACKAGER=$(gpg -K --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
 | 
					  PACKAGER=$(gpg -K --display-charset utf-8 --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
 | 
				
			||||||
  if -z "${PACKAGER}"; then
 | 
					  if test -z "${PACKAGER}"; then
 | 
				
			||||||
    PACKAGER="$AUTHOR"
 | 
					    PACKAGER="$AUTHOR"
 | 
				
			||||||
  fi
 | 
					  fi
 | 
				
			||||||
  AX_SUBST(AUTHOR)
 | 
					  AX_SUBST(AUTHOR)
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1534,7 +1534,7 @@ else
 | 
				
			|||||||
fi)
 | 
					fi)
 | 
				
			||||||
Source0: %{name}-%{version}.tar.gz
 | 
					Source0: %{name}-%{version}.tar.gz
 | 
				
			||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 | 
					BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 | 
				
			||||||
BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-sign, rpm-build$(
 | 
					BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-build$(
 | 
				
			||||||
    if testtag AX_USE_CXX; then
 | 
					    if testtag AX_USE_CXX; then
 | 
				
			||||||
      echo -n ", binutils-devel, gcc-c++"
 | 
					      echo -n ", binutils-devel, gcc-c++"
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
@@ -1552,7 +1552,7 @@ BuildRequires: gnupg, ${VCSDEPENDS} make, automake, autoconf, rpm-sign, rpm-buil
 | 
				
			|||||||
$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 | 
					$(if testtag AX_USE_DOXYGEN; then echo -n "BuildRequires: graphviz"; fi)
 | 
				
			||||||
%endif
 | 
					%endif
 | 
				
			||||||
%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
 | 
					%if 0%{?fedora} || 0%{?rhel} || 0%{?rhl} || 0%{?centos} || 0%{?centos_ver} || 0%{?centos_version} || 0%{?mageia}
 | 
				
			||||||
BuildRequires: which, pkgconfig$(
 | 
					BuildRequires: which, rpm-sign, pkgconfig$(
 | 
				
			||||||
    if testtag AX_USE_LIBTOOL; then
 | 
					    if testtag AX_USE_LIBTOOL; then
 | 
				
			||||||
      echo -n ", cppunit-devel"
 | 
					      echo -n ", cppunit-devel"
 | 
				
			||||||
    fi
 | 
					    fi
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -10,7 +10,7 @@ mode="deb"
 | 
				
			|||||||
img="ubuntu:latest"
 | 
					img="ubuntu:latest"
 | 
				
			||||||
repos=()
 | 
					repos=()
 | 
				
			||||||
keys=()
 | 
					keys=()
 | 
				
			||||||
envs=("-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 | 
					envs=("-e LANG=${LANG}" "-e HOME=/home/$(id -un)" "-e TERM=xterm" "-e DEBIAN_FRONTEND=noninteractive" "-e DEBCONF_NONINTERACTIVE_SEEN=true")
 | 
				
			||||||
dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
 | 
					dirs=("-v $(pwd):/workdir" "-v ${HOME}/.gnupg:/home/$(id -un)/.gnupg")
 | 
				
			||||||
packages=()
 | 
					packages=()
 | 
				
			||||||
targets="all check distcheck"
 | 
					targets="all check distcheck"
 | 
				
			||||||
@@ -216,6 +216,8 @@ if ! docker exec ${DOCKER_ID} getent passwd $(id -u) > /dev/null 2>&1; then
 | 
				
			|||||||
fi
 | 
					fi
 | 
				
			||||||
case $mode in
 | 
					case $mode in
 | 
				
			||||||
    (deb|apt)
 | 
					    (deb|apt)
 | 
				
			||||||
 | 
					        docker exec ${DOCKER_ID} locale-gen ${LANG}
 | 
				
			||||||
 | 
					        docker exec ${DOCKER_ID} update-locale LANG=${LANG}
 | 
				
			||||||
        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
 | 
					        OPTIONS='-o Dpkg::Options::=--force-confdef -o Dpkg::Options::=--force-confnew -y --force-yes --no-install-suggests --no-install-recommends'
 | 
				
			||||||
        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
 | 
					        for f in 'libpam-systemd:amd64' 'policykit*' 'colord'; do
 | 
				
			||||||
            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
 | 
					            docker exec ${DOCKER_ID} bash -c "echo 'Package: $f' >> /etc/apt/preferences"
 | 
				
			||||||
@@ -256,10 +258,6 @@ enabled=1
 | 
				
			|||||||
gpgcheck=0
 | 
					gpgcheck=0
 | 
				
			||||||
EOF
 | 
					EOF
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
        UPDATE_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi.update -a) || true)
 | 
					 | 
				
			||||||
        if test -n "${UPDATE_TOOL}"; then
 | 
					 | 
				
			||||||
            docker exec ${DOCKER_ID} ${UPDATE_TOOL}
 | 
					 | 
				
			||||||
        fi
 | 
					 | 
				
			||||||
        INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
 | 
					        INSTALL_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/bin/zypper && echo zypper install -y) ||  (docker exec ${DOCKER_ID} test -x /usr/bin/dnf && echo dnf install -y) || (docker exec ${DOCKER_ID} test -x /usr/bin/yum && echo yum install -y) || (docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi --auto))
 | 
				
			||||||
        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget
 | 
					        docker exec ${DOCKER_ID} ${INSTALL_TOOL} rpm-build automake libtool subversion gcc-c++ pkgconfig wget
 | 
				
			||||||
        #i=0
 | 
					        #i=0
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -35,7 +35,7 @@ TO_INSTALL=
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
if test -e debian/control.in -a ! -e debian/control; then
 | 
					if test -e debian/control.in -a ! -e debian/control; then
 | 
				
			||||||
    for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
 | 
					    for f in $(sed -n 's, *AX_DEB_DEPEND_IFEXISTS(\([^)]*\)).*,\1,p' configure.ac); do
 | 
				
			||||||
        if test -n "$(${DO} apt-cache policy -q ${f})" && ! "$(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')" && ! ${DO} dpkg -l "${f}"; then
 | 
					        if test -n "$(${DO} apt-cache policy -q ${f})" && ((! $(${DO} apt-cache policy ${f} 2>&1 | grep -q 'N: Unable to locate package')) && (! ${DO} dpkg -l "${f}")); then
 | 
				
			||||||
            TO_INSTALL+=" ${f}"
 | 
					            TO_INSTALL+=" ${f}"
 | 
				
			||||||
        fi
 | 
					        fi
 | 
				
			||||||
    done
 | 
					    done
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user