diff options
| author | François Andriot <albator78@libertysurf.fr> | 2017-06-26 23:10:56 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2017-06-26 23:10:56 +0200 |
| commit | 608d97009e5cad1da8c2e585fee7537d579c064d (patch) | |
| tree | ce3b5c15e47dfdc99bf83d8aad94817ddd964698 /redhat/build | |
| parent | f5fb93e00bc4656f22a61a8e04d227aae47e1dc4 (diff) | |
| download | tde-packaging-608d97009e5cad1da8c2e585fee7537d579c064d.tar.gz tde-packaging-608d97009e5cad1da8c2e585fee7537d579c064d.zip | |
RPM: updates for Mageia 6
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/get_latest_built_package_version.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/is_latest_package_built.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh index a361ff7b7..ec7e63a8c 100755 --- a/redhat/build/get_latest_built_package_version.sh +++ b/redhat/build/get_latest_built_package_version.sh @@ -12,7 +12,7 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION}) VERSION=$(rpm -qp --qf "%{version}-%{release}" "${RPM}") VERSION=${VERSION%.opt} VERSION=${VERSION%.[a-z]*} -VERSION=${VERSION/-*_/\~} +VERSION=${VERSION/-*_0/\~} echo $VERSION diff --git a/redhat/build/is_latest_package_built.sh b/redhat/build/is_latest_package_built.sh index 5f9a442a7..2054957e4 100755 --- a/redhat/build/is_latest_package_built.sh +++ b/redhat/build/is_latest_package_built.sh @@ -10,13 +10,13 @@ RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" # If package version contains a "~": it's a pre-release if [ "${BUILT/\~/}" != "${BUILT}" ]; then if [ "${BUILT#*\~}" = "${TARBALL#*\~}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + echo "Latest development package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi # Nominal case: no "~" caracter else - if [ "${TARBALL%-*}" = "${BUILT%-*}" ]; then - echo "Latest package '${PKGNAME}' version '${BUILT}' is already built." + if [ "${TARBALL%-*}" = "${BUILT%-*}" ] || [[ "${BUILT}" =~ [0-9\.]*-${TARBALL}_[0-9]* ]]; then + echo "Latest stable package '${PKGNAME}' version '${BUILT}' is already built." exit 0 fi fi |