summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2014-03-08 10:36:59 +0100
committerFrançois Andriot <[email protected]>2014-03-08 10:36:59 +0100
commitd9c948c7660fd487f81da3e864cd1e7e7811649b (patch)
tree2f7fc6d7b5ec2eed49702396df125b08e580cea4
parent420b1189896aae59757997087773c8488b7c0c3b (diff)
downloadtde-packaging-d9c948c7660fd487f81da3e864cd1e7e7811649b.tar.gz
tde-packaging-d9c948c7660fd487f81da3e864cd1e7e7811649b.zip
RPM packaging: update build script
-rw-r--r--redhat/build/Makefile.r1414
-rwxr-xr-xredhat/build/get_specfile.sh14
2 files changed, 17 insertions, 11 deletions
diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14
index cb82e3898..ab3047a92 100644
--- a/redhat/build/Makefile.r14
+++ b/redhat/build/Makefile.r14
@@ -182,12 +182,18 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
$(call buildpkg,3rdparty/sip)
endif
+sword:
+# Build on Fedora >= 20 only
+ifneq ($(wildcard /boot/vmlinuz*.fc20*),)
+ $(call buildpkg,3rdparty/sword)
+endif
+
torsocks:
$(call buildpkg,3rdparty/torsocks)
wv2:
-# Do NOT build on Mageia
-ifeq ($(wildcard /etc/mageia-release),)
+# Do NOT build on Mageia or openSUSE
+ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release),)
$(call buildpkg,3rdparty/wv2)
endif
@@ -242,7 +248,7 @@ amarok: tdebase
basket: tdebase
$(call buildpkg,applications/basket)
-bibletime: tdebase
+bibletime: tdebase sword
$(call buildpkg,applications/bibletime)
compizconfig-backend-kconfig: tdebase
@@ -518,7 +524,7 @@ tdeio-ftps: tdebase
tdeio-locate: tdebase
$(call buildpkg,applications/tdeio-locate)
-tdeio-sword: tdebase
+tdeio-sword: tdebase sword
$(call buildpkg,applications/tdeio-sword)
tdeio-umountwrapper: tdebase
diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh
index d60748604..8f4b542e0 100755
--- a/redhat/build/get_specfile.sh
+++ b/redhat/build/get_specfile.sh
@@ -5,23 +5,23 @@ TDE_VERSION="${2:-14.0.0}"
[ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1
-[ -d "${TDE_SPECDIR}" ] || TDE_SPECDIR=~/tde/tde-packaging/redhat
+[ -d "${PACKAGING_DIR}" ] || PACKAGING_DIR=~/tde/tde-packaging/redhat
# Special case for QT3
if [ "${PKGNAME}" = "qt3" ]; then
case "$(rpmdist.sh --dist)" in
- .oss*) TDE_SPECDIR=~/tde/tde-packaging/opensuse ;;
- .mga*|.mdk*|.pclos*) TDE_SPECDIR=~/tde/tde-packaging/mageia ;;
+ .oss*) PACKAGING_DIR=~/tde/tde-packaging/opensuse ;;
+ .mga*|.mdk*|.pclos*) PACKAGING_DIR=~/tde/tde-packaging/mageia ;;
esac
fi
-SPECFILE=$(find "${TDE_SPECDIR}" -name "${PKGNAME}-${TDE_VERSION}.spec")
+SPECFILE=$(find "${PACKAGING_DIR}" -name "${PKGNAME}-${TDE_VERSION}.spec")
if [ ! -r "${SPECFILE}" ]; then
- SPECFILE=$(find "${TDE_SPECDIR}" -name "${PKGNAME}.spec")
+ SPECFILE=$(find "${PACKAGING_DIR}" -name "${PKGNAME}.spec")
if [ ! -r "${SPECFILE}" ]; then
- SPECFILE=$(find "${TDE_SPECDIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}.spec")
+ SPECFILE=$(find "${PACKAGING_DIR}" -name "trinity-${PKGNAME}-${TDE_VERSION}.spec")
if [ ! -r "${SPECFILE}" ]; then
- SPECFILE=$(find "${TDE_SPECDIR}" -name "trinity-${PKGNAME}.spec")
+ SPECFILE=$(find "${PACKAGING_DIR}" -name "trinity-${PKGNAME}.spec")
fi
fi
fi