summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2022-11-06 11:46:08 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2022-11-06 16:15:02 +0100
commitb504f7ef7837e88d471f3601da710a92d58108a0 (patch)
tree2874f5894582ac03efd73e22d0a374cc97d33cac /redhat/build
parent91c340e19d9a2c81194e7adb5900c8f69bbd7735 (diff)
downloadtde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.tar.gz
tde-packaging-b504f7ef7837e88d471f3601da710a92d58108a0.zip
RPM: updates (cherry-pick from TDE R14.0.13)
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/get_rpm_package_name.sh1
-rwxr-xr-xredhat/build/get_source_files.sh6
2 files changed, 6 insertions, 1 deletions
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 11993d820..ac821c4af 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -64,6 +64,7 @@ case "${PKGNAME}" in
"tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";;
"tqt3") PKGRUNTIME="${lib}tqt3-mt";;
"tqtinterface") PKGRUNTIME="${lib}tqt4";;
+ "trinity-desktop") PKGRUNTIME="${PKGNAME}-all";;
"yaz") PKGRUNTIME="${lib}yaz";;
# Language package: install only French language package
"k3b-i18n"|"koffice-i18n"|"tde-i18n")
diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh
index 1b0463e4c..529aa49ed 100755
--- a/redhat/build/get_source_files.sh
+++ b/redhat/build/get_source_files.sh
@@ -14,7 +14,11 @@ while read var val; do
case "${var}" in
Version:*) VERSION="${val}";;
Source*:|Source:|Patch[0-9]*:)
- FILE="${SPECDIR}/${val##*/}"
+ if [ "${val:0:7}" = "http://" ] || [ "${val:0:8}" = "https://" ]; then
+ FILE="${SPECDIR}/${val##*/}"
+ else
+ FILE="${SPECDIR}/${val}"
+ fi
if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then
FILES="${FILE//%\{?dist\}/.}"*
else