RPM packaging: massive update SPEC files

4 files changed, 24 insertions, 23 deletions

diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh
index f5242c9c5..64d10e705 100755
--- a/redhat/build/build_rpm_package.sh
+++ b/redhat/build/build_rpm_package.sh
@@ -63,7 +63,7 @@ fi
 # 3. PCLinuxOS hack ...
 if [ -r "/etc/pclinuxos-release" ]; then
   sed -i "${TEMPDIR}/${SPECFILE##*/}" \
-      -e "/admin\/Makefile.common/ s|$| \|\| autoreconf -i \&\& make -f admin/Makefile.common|" \
+      -e "/admin\/Makefile.common/ s|^|touch config.h.in;|" \
       || exit 1
 fi
 
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 3f60d852f..ae0790e7a 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -24,7 +24,7 @@ case "${PKGNAME}" in
   # Most TDE libraries have no prefix
   #"libkdcraw") PREFIX="";;
   # 3rd party dependencies
-  "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";;
+  "dirmngr"|"esound"|"fileshareset"|"hk_classes"|"lcms"|"python-qt3") PREFIX="";;
   # Extra build stuff
   "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
   # Other
@@ -42,28 +42,29 @@ fi
 
 case "${PKGNAME}" in
   # Some packages have different runtime name than source package.
-  "avahi-tqt")    PKGRUNTIME="${lib}avahi-tqt1";;
-  "dbus-tqt")     PKGRUNTIME="${lib}dbus-tqt-1-0";;
-  "dbus-1-tqt")   PKGRUNTIME="${lib}dbus-1-tqt0";;
-  "esound")       PKGRUNTIME="esound-libs";;
-  "imlib1")       PKGRUNTIME="${lib}Imlib1";;
-  "koffice")      PKGRUNTIME="koffice-suite";;
-  "libart-lgpl")  PKGRUNTIME="${lib}art_lgpl_2-2";;
-  "libcaldav")    PKGRUNTIME="${lib}caldav0";;
-  "libcarddav")   PKGRUNTIME="${lib}carddav0";;
-  "libkdcraw")    PKGRUNTIME="${lib}kdcraw4";;
-  "libkexiv2")    PKGRUNTIME="${lib}kexiv2-5";;
-  "libkipi")      PKGRUNTIME="${lib}kipi0";;
-  "tqscintilla")  PKGRUNTIME="${lib}tqscintilla7";;
-  "tqca")         PKGRUNTIME="${lib}tqca1";;
-  "tqca-tls")     PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
-  "tqt3")         PKGRUNTIME="${lib}tqt3-mt";;
-  "tqtinterface") PKGRUNTIME="${lib}tqt4";;
+  "avahi-tqt")        PKGRUNTIME="${lib}avahi-tqt1";;
+  "dbus-tqt")         PKGRUNTIME="${lib}dbus-tqt-1-0";;
+  "dbus-1-tqt")       PKGRUNTIME="${lib}dbus-1-tqt0";;
+  "esound")           PKGRUNTIME="esound-libs";;
+  "imlib1")           PKGRUNTIME="${lib}Imlib1";;
+  "knetworkmanager8") PKGRUNTIME="knetworkmanager";;
+  "koffice")          PKGRUNTIME="koffice-suite";;
+  "libart-lgpl")      PKGRUNTIME="${lib}art_lgpl_2-2";;
+  "libcaldav")        PKGRUNTIME="${lib}caldav0";;
+  "libcarddav")       PKGRUNTIME="${lib}carddav0";;
+  "libkdcraw")        PKGRUNTIME="${lib}kdcraw4";;
+  "libkexiv2")        PKGRUNTIME="${lib}kexiv2-5";;
+  "libkipi")          PKGRUNTIME="${lib}kipi0";;
+  "tqscintilla")      PKGRUNTIME="${lib}tqscintilla7";;
+  "tqca")             PKGRUNTIME="${lib}tqca1";;
+  "tqca-tls")         PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
+  "tqt3")             PKGRUNTIME="${lib}tqt3-mt";;
+  "tqtinterface")     PKGRUNTIME="${lib}tqt4";;
   # Language package: install only French language package
   "k3b-i18n"|"koffice-i18n"|"tde-i18n")
-                  PKGRUNTIME="${PKGNAME}-French";;
+                      PKGRUNTIME="${PKGNAME}-French";;
   # Default case: runtime package has same name as source package
-  *)              PKGRUNTIME="${PKGNAME}";;
+  *)                  PKGRUNTIME="${PKGNAME}";;
 esac
 
 # Finally, display the runtime package name.
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 6b1319f90..7adb128a5 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -9,7 +9,7 @@ done
 PKGNAME="${1}"
 
 if [ -x /usr/bin/dnf ]; then
-  PKGINST="sudo dnf install -y --refresh"
+  PKGINST="sudo dnf install -y --refresh --nogpgcheck"
 elif [ -x /usr/sbin/urpmi ]; then
   PKGINST='sudo urpmi --auto --no-verify-rpm'
 elif [ -x /usr/bin/zypper ]; then
diff --git a/redhat/build/is_latest_package_installed.sh b/redhat/build/is_latest_package_installed.sh
index 685fa7a05..ab04bd8f7 100755
--- a/redhat/build/is_latest_package_installed.sh
+++ b/redhat/build/is_latest_package_installed.sh
@@ -21,7 +21,7 @@ else
   fi
   
   # Other package (e.g. QT3)
-  if [ "${INSTALLED}" = "${SPEC}" ]; then
+  if [ "${INSTALLED}" = "${SPEC}" ] || [ "${INSTALLED}$(rpm -E %dist)" = "${SPEC}" ]; then
     echo "Latest package '${PKGNAME}' version '${INSTALLED}' is already built and installed."
     exit 0
   fi