diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:02:28 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-03-16 13:02:28 +0100 |
| commit | 790fc68b1b6bd5a3a0a1dc4b681352b128826b58 (patch) | |
| tree | 31dacc3ddd40dacc8eabc5151df1913f85783fde | |
| parent | ac9528cdc30a02a5de9bee61d984ce5e887738db (diff) | |
| download | tde-packaging-790fc68b1b6bd5a3a0a1dc4b681352b128826b58.tar.gz tde-packaging-790fc68b1b6bd5a3a0a1dc4b681352b128826b58.zip | |
RPM packaging: update build scripts
| -rw-r--r-- | redhat/build/Makefile.r14 | 8 | ||||
| -rwxr-xr-x | redhat/build/install_rpm_package.sh | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/redhat/build/Makefile.r14 b/redhat/build/Makefile.r14 index ab3047a92..281f96906 100644 --- a/redhat/build/Makefile.r14 +++ b/redhat/build/Makefile.r14 @@ -183,8 +183,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),) endif sword: -# Build on Fedora >= 20 only -ifneq ($(wildcard /boot/vmlinuz*.fc20*),) +# Build on Fedora >= 20 only, or PCLinuxOS +ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release),) $(call buildpkg,3rdparty/sword) endif @@ -192,8 +192,8 @@ torsocks: $(call buildpkg,3rdparty/torsocks) wv2: -# Do NOT build on Mageia or openSUSE -ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release),) +# Do NOT build on Mageia or openSUSE or PCLINUXOS +ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),) $(call buildpkg,3rdparty/wv2) endif diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh index 19e2d4c4e..dfaf46e17 100755 --- a/redhat/build/install_rpm_package.sh +++ b/redhat/build/install_rpm_package.sh @@ -25,7 +25,7 @@ case "${PKGNAME}" in "koffice") PKGNAME="${PKGNAME}-suite";; esac -# Trinity Prefix, or not. +# Use the Trinity Prefix, or not. case "${PKGNAME}" in "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";; "gnuchess"|"imlib1"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; |