fixed debian changelog, rpm package signing and mageia update
This commit is contained in:
@@ -196,7 +196,7 @@ AC_DEFUN([AX_INIT_STANDARD_PROJECT], [
|
|||||||
CHANGELOG=$(<ChangeLog)
|
CHANGELOG=$(<ChangeLog)
|
||||||
AC_SUBST(CHANGELOG)
|
AC_SUBST(CHANGELOG)
|
||||||
_AM_SUBST_NOTMAKE([CHANGELOG])
|
_AM_SUBST_NOTMAKE([CHANGELOG])
|
||||||
DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};/^\t\* /{s,,,;H;g;s,^,\t* ,;s,\n\([[^ ]]*\) *, \1\n\t ,}' ChangeLog)
|
DEB_CHANGELOG=$(sed '/^[[^\t]]/{h;N;d};s,\t, ,g;/^ \* /{s,,,;H;g;s,^, * ,;s,\n\([[^ ]]*\) *, \1\n ,}' ChangeLog)
|
||||||
if test -z "$DEB_CHANGELOG"; then
|
if test -z "$DEB_CHANGELOG"; then
|
||||||
DEB_CHANGELOG=" * see file ChangeLog and project management web site"
|
DEB_CHANGELOG=" * see file ChangeLog and project management web site"
|
||||||
fi
|
fi
|
||||||
@@ -206,7 +206,7 @@ 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 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
|
PACKAGER=$(gpg -K --lock-never 2>/dev/null | sed -n 's,uid *\(\[[ultimate\]] *\)\?,,p' | head -1)
|
||||||
if -z "${PACKAGER}"; then
|
if -z "${PACKAGER}"; then
|
||||||
PACKAGER="$AUTHOR"
|
PACKAGER="$AUTHOR"
|
||||||
fi
|
fi
|
||||||
@@ -560,6 +560,7 @@ AC_DEFUN([AX_USE_RPM_PACKAGING], [
|
|||||||
EXTRA_DIST += \${PACKAGE_NAME}.spec.in
|
EXTRA_DIST += \${PACKAGE_NAME}.spec.in
|
||||||
rpm: dist
|
rpm: dist
|
||||||
rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
|
rpmbuild -ba --define "_topdir \$\$(pwd)" --define "_sourcedir \$\$(pwd)" \${PACKAGE_NAME}.spec
|
||||||
|
rpmsign --define "_gpg_name \${PACKAGER}" --addsign RPMS/*/*.rpm SRPMS/*.rpm
|
||||||
clean-rpm-targets:
|
clean-rpm-targets:
|
||||||
-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
|
-rm -rf BUILD BUILDROOT RPMS SPECS SRPMS
|
||||||
distclean-rpm-targets:
|
distclean-rpm-targets:
|
||||||
|
@@ -256,7 +256,7 @@ enabled=1
|
|||||||
gpgcheck=0
|
gpgcheck=0
|
||||||
EOF
|
EOF
|
||||||
fi
|
fi
|
||||||
UPDATE_TOOL=$(test -x /usr/sbin/urpmi && echo urpmi.update -a)
|
UPDATE_TOOL=$((docker exec ${DOCKER_ID} test -x /usr/sbin/urpmi && echo urpmi.update -a) || true)
|
||||||
if test -n "${UPDATE_TOOL}"; then
|
if test -n "${UPDATE_TOOL}"; then
|
||||||
docker exec ${DOCKER_ID} ${UPDATE_TOOL}
|
docker exec ${DOCKER_ID} ${UPDATE_TOOL}
|
||||||
fi
|
fi
|
||||||
|
Reference in New Issue
Block a user