RPM: many updates for upcoming R14.1.3

Signed-off-by: François Andriot <albator78@libertysurf.fr>

5 files changed, 7 insertions, 7 deletions

diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh
index a2e6698ad..9869d8730 100755
--- a/redhat/build/configure_repository.sh
+++ b/redhat/build/configure_repository.sh
@@ -1,4 +1,4 @@
-#!/bin/bash -x
+#!/bin/bash
 
 TDE_VERSION="${1:-${TDE_VERSION:-14.1.2}}"
 ARCH=$(rpm -E %_target_cpu)
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index f9db9354a..3a5d0e5ba 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -41,7 +41,7 @@ if [ -d "${PATCHDIR}" ]; then
   fi
 fi
 
-if [ "${DIST}" = ".fc41" ]; then
+if [ "${DIST}" = ".fc41" ] || [ "${DIST}" = ".mga9" ] || [ "${DIST}" = ".omv5000" ] || [ "${DIST}" = ".osstw" ]; then
   sed -i "${TARGETDIR}/"*".spec" \
       -e "s|%patch|%patch -P |g"
 fi
diff --git a/redhat/build/get_latest_built_package_version.sh b/redhat/build/get_latest_built_package_version.sh
index 1f3cebbfe..167a4dd2c 100755
--- a/redhat/build/get_latest_built_package_version.sh
+++ b/redhat/build/get_latest_built_package_version.sh
@@ -12,9 +12,9 @@ RPM=$(get_latest_built_package_filename.sh "${PKGNAME}" ${TDE_VERSION})
 pkg_version="$(rpm -qp --qf "%{version}" "${RPM}")"
 pkg_release="$(rpm -qp --qf "%{release}" "${RPM}")"
 
-# Application packages: version does not match TDE version
-if [[ "${pkg_release}" =~ ^0_ ]] || [[ "${pkg_release}" =~ _0_ ]]; then
-  # Preversion
+# Preversion
+if [ "${pkg_release:0:2}" = "0_" ] || [[ "${pkg_release}" =~ _0_ ]]; then
+  # Application packages: version does not match TDE version
   if [[ "${pkg_release}" =~ ${TDE_VERSION}_ ]] ; then
      # Likely application package
     eval VERSION="${pkg_release/0_/\~}"
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 3f42de99d..6b8ecb938 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -39,4 +39,4 @@ while read var val; do
       done
     ;;
   esac
-done < "${SPECFILE}"
+done < "${SPECFILE}" | sort -u
diff --git a/redhat/build/update_repository.sh b/redhat/build/update_repository.sh
index 5a8a13eb4..6530efc63 100755
--- a/redhat/build/update_repository.sh
+++ b/redhat/build/update_repository.sh
@@ -28,7 +28,7 @@ elif [ -x /usr/bin/dnf ]; then
   REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo dnf --repo="rpmbuild*" clean expire-cache)'
 elif [ -x /usr/bin/zypper ]; then
   REPOUPDATE='(cd ${RPMDIR}; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
-  #REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
+  REPOUPDATE='(rsync -av ${RPMDIR}/ /tmp/rpm${DIST}/ && cd /tmp/rpm${DIST}; umask 0000; ${createrepo} --workers=${WORKERS} ${ARCH} & ${createrepo} --workers=${WORKERS} noarch & wait; rsync -av /tmp/rpm${DIST}/ ${RPMDIR}/; sudo zypper refresh rpmbuild.${ARCH} rpmbuild.noarch)'
 elif [ -x /usr/bin/yum ]; then
   if [ "${DIST}" = ".el5" ]; then
     REPOUPDATE='(cd ${RPMDIR}; ${createrepo} ${ARCH} & ${createrepo} noarch & wait; sudo yum clean metadata --disablerepo="*" --enablerepo="rpmbuild*")'