diff options
author | François Andriot <albator78@libertysurf.fr> | 2017-12-10 18:39:17 +0100 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2017-12-10 18:39:17 +0100 |
commit | cdfe982606b1229589e08d99f3fb6b1fc6f06db7 (patch) | |
tree | b3b329969ba50c9309a88f144a94bd2a3bc0d69b /redhat/Makefile.r14 | |
parent | 2c6b5dc9b85e94f37f166eee9da18b6d32446011 (diff) | |
download | tde-packaging-cdfe982606b1229589e08d99f3fb6b1fc6f06db7.tar.gz tde-packaging-cdfe982606b1229589e08d99f3fb6b1fc6f06db7.zip |
RPM: update build scripts for Fedora 27, opensuse TW
Diffstat (limited to 'redhat/Makefile.r14')
-rw-r--r-- | redhat/Makefile.r14 | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 56e0789b4..d9c3454f2 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -210,7 +210,8 @@ endif endif lcms: -ifneq ($(wildcard /boot/vmlinuz*.el7*),) +# Build on EL7, OSSTW +ifeq (,$(filter $(DIST),.el7 osstw)) $(call buildpkg,3rdparty/lcms) endif @@ -246,7 +247,7 @@ endif mp4v2: # Build on OpenSUSE only -ifneq ($(wildcard /etc/SuSE-release),) +ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .osstw)) $(call buildpkg,3rdparty/mp4v2) endif @@ -297,7 +298,7 @@ endif wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq ($(wildcard /etc/mageia-release /etc/SuSE-release /etc/pclinuxos-release),) +ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .osstw .pclos)) $(call buildpkg,3rdparty/wv2) endif @@ -610,7 +611,10 @@ ksquirrel: tdebase libkipi libksquirrel $(call buildpkg,applications/ksquirrel) kstreamripper: tdebase +# Do NOT build on Fedora >= 27 (problem with scons and python3) +ifeq (,$(filter $(DIST),.fc27)) $(call buildpkg,applications/kstreamripper) +endif ksystemlog: tdebase $(call buildpkg,applications/ksystemlog) @@ -783,7 +787,10 @@ ifeq ($(wildcard /boot/vmlinuz*.mga6*),) endif hk_classes: +# Not on Fedora 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .osstw)) $(call buildpkg,extras/hk_classes) +endif icons-crystalsvg-updated: $(call buildpkg,extras/icons-crystalsvg-updated) @@ -804,7 +811,10 @@ kdissert: $(call buildpkg,extras/kdissert) klamav: +# Not on Fedora 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .osstw)) $(call buildpkg,extras/klamav) +endif klibido: pan # Not on RHEL5 @@ -813,7 +823,10 @@ ifeq (,$(filter $(DIST),.el5)) endif knoda: hk_classes +# Not on Fedora 27, Opensuse TW +ifeq (,$(filter $(DIST),.fc27 .osstw)) $(call buildpkg,extras/knoda) +endif kompose: $(call buildpkg,extras/kompose) |