summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2016-11-11 16:35:11 +0100
committerFrançois Andriot <albator78@libertysurf.fr>2016-11-11 16:35:11 +0100
commit483dc217a7e4c2d9ff913d78e5cd41968b161154 (patch)
tree42d026947e5978871e0d6150295fdcc9be42d89a
parentf0b5ce1156b7b91fcdb9b31047e232cb16b2fab7 (diff)
downloadtde-packaging-483dc217a7e4c2d9ff913d78e5cd41968b161154.tar.gz
tde-packaging-483dc217a7e4c2d9ff913d78e5cd41968b161154.zip
RPM packaging: update build scripts
-rw-r--r--redhat/Makefile.r148
-rwxr-xr-xredhat/build/get_latest_built_package_filename.sh11
2 files changed, 10 insertions, 9 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 2410c346e..9399a304b 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -152,6 +152,12 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/cmake)
endif
+cscope:
+# Build on PCLOS only
+ifneq ($(wildcard /etc/pclinuxos-release),)
+ $(call buildpkg,3rdparty/cscope)
+endif
+
dirmngr:
# Build on CentOS >= 7
ifneq ($(wildcard /boot/vmlinuz*.el7*),)
@@ -554,7 +560,7 @@ krename: tdebase
krusader: tdebase
$(call buildpkg,applications/krusader)
-kscope: tdebase
+kscope: tdebase cscope
$(call buildpkg,applications/kscope)
ksensors: tdebase
diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh
index ccbb0acf0..a459ced19 100755
--- a/redhat/build/get_latest_built_package_filename.sh
+++ b/redhat/build/get_latest_built_package_filename.sh
@@ -9,17 +9,12 @@ RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)"
RPMDIR_NOARCH="${RPMDIR}/noarch"
RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}"
-case "${PKGNAME##*/}" in
- "tqt3") PKGNAME="libtqt3-mt";;
- "tqtinterface") PKGNAME="libtqt4";;
- "koffice") PKGNAME="koffice-suite";;
- "tde-i18n") PKGNAME="tde-i18n-French";;
-esac
+RPM_PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})"
-RPM=$(find ${RPMDIRS} -name "trinity-${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1)
+RPM=$(find ${RPMDIRS} -name "trinity-${RPM_PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1)
if [ ! -r "${RPM}" ]; then
- RPM=$(find ${RPMDIRS} -name "${PKGNAME##*/}-[0-9]*.rpm" | sort -n | tail -n 1)
+ RPM=$(find ${RPMDIRS} -name "${RPM_PKGNAME}-[0-9]*.rpm" | sort -n | tail -n 1)
if [ ! -r "${RPM}" ]; then
echo "Error, cannot find any package for '${PKGNAME}' !"
exit 1