RPM packaging: update build scripts

redhat/Makefile.r14

@@ -269,7 +269,7 @@ endif
 
 torsocks:
 # Do NOT build on RHEL 6, RHEL 7, Fedora > 20, Mageia
-ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat/boot/mageia.dat),)
+ifeq ($(wildcard /boot/vmlinuz*.el6* /boot/vmlinuz*.el7* /boot/vmlinuz*.fc2* /boot/mageia.dat /etc/SuSE-release),)
 	$(call buildpkg,3rdparty/torsocks)
 endif
 

redhat/build/install_rpm_package.sh

@@ -8,10 +8,10 @@ done
 
 PKGNAME="${1}"
 
-if [ -x /usr/bin/dnf ]; then
-  PKGINST="sudo dnf install -y --refresh --nogpgcheck"
-elif [ -x /usr/sbin/urpmi ]; then
+if [ -x /usr/sbin/urpmi ]; then
   PKGINST='sudo urpmi --auto --no-verify-rpm'
+elif [ -x /usr/bin/dnf ]; then
+  PKGINST="sudo dnf install -y --refresh --nogpgcheck"
 elif [ -x /usr/bin/zypper ]; then
   PKGINST="sudo zypper install -y"
 elif [ -x /usr/bin/yum ]; then

redhat/build/update_repository.sh

@@ -15,10 +15,10 @@ RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})
 [ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch"
 [ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}"
 
-if [ -x /usr/bin/dnf ]; then
-  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")'
-elif [ -x /usr/sbin/urpmi ]; then
+if [ -x /usr/sbin/urpmi ]; then
   REPOUPDATE='(cd ${RPMDIR}; genhdlist2 --clean --allow-empty noarch & genhdlist2 --clean --allow-empty ${ARCH} & wait; sudo urpmi.update rpmbuild.${ARCH} rpmbuild.noarch)'
+elif [ -x /usr/bin/dnf ]; then
+  REPOUPDATE='(cd ${RPMDIR}; createrepo --workers=${WORKERS} ${ARCH} & createrepo --workers=${WORKERS} noarch & wait; sudo dnf clean expire-cache --disablerepo="*" --enablerepo="rpmbuild*")'
 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)'
 elif [ -x /usr/bin/yum ]; then