diff options
Diffstat (limited to 'redhat/Makefile.r14')
| -rw-r--r-- | redhat/Makefile.r14 | 44 |
1 files changed, 22 insertions, 22 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 86678efa7..c248b34e5 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -1,7 +1,7 @@ SHELL := /bin/bash PACKAGING_DIR := $(shell cd ..; pwd) PATH := $(PATH):$(shell pwd)/build -TDE_VERSION := 14.0.4 +TDE_VERSION := 14.0.5 DIST := $(shell rpm -E %dist) buildpkg = \ @@ -108,6 +108,7 @@ tdegraphics: tdebase poppler cmake lcms $(call buildpkg,main/tdegraphics) tdelibs: tqt3 tqtinterface arts dbus-tqt dbus-1-tqt cmake avahi-tqt fileshareset trinity-filesystem libart_lgpl file + [ -x /usr/libexec/utempter/utempter ] && sudo chmod a+r /usr/libexec/utempter/utempter || : $(call buildpkg,main/tdelibs) tdemultimedia: tdebase akode @@ -166,8 +167,8 @@ ifneq ($(wildcard /boot/vmlinuz*.el7*),) endif esound: -# Build on Mageia and CentOS >= 7, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.mga .el7 .fc2 .oss150 .osstw)) +# Build on Mageia, Fedora >= 23, Opensuse >= 15.0 +ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw)) $(call buildpkg,3rdparty/esound) endif @@ -190,8 +191,8 @@ ifneq (,$(filter $(DIST),.el5)) endif gnuchess: -# Build on CentOS 5, CentOS 7 -ifneq (,$(filter $(DIST),.el5 .el7)) +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/gnuchess) endif @@ -210,8 +211,8 @@ endif endif lcms: -# Build on EL7, OSSTW -ifneq (,$(filter $(DIST),.el7 .osstw)) +# Build on EL7, OSS150, OSSTW +ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) $(call buildpkg,3rdparty/lcms) endif @@ -252,8 +253,8 @@ ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw) endif pcsc-perl: -# Build on CentOS -ifneq (,$(filter $(DIST),.el5 .el6 .el7)) +# Build on CentOS 5 +ifneq (,$(filter $(DIST),.el5)) $(call buildpkg,3rdparty/pcsc-perl) endif @@ -310,7 +311,7 @@ endif wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos)) +ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) $(call buildpkg,3rdparty/wv2) endif @@ -337,10 +338,7 @@ libksquirrel: tdelibs $(call buildpkg,libraries/libksquirrel) libtdeldap: tqtinterface -# Do NOT build on PCLOS -ifeq ($(wildcard /etc/pclinuxos-release),) $(call buildpkg,libraries/libtdeldap) -endif libtqt-perl: tqtinterface $(call buildpkg,libraries/libtqt-perl) @@ -452,20 +450,20 @@ kcmautostart: tdebase $(call buildpkg,applications/kcmautostart) kcmldap: tdebase libtdeldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldap) endif kcmldapcontroller: tdebase kcmldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapcontroller) endif kcmldapmanager: tdebase kcmldap -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kcmldapmanager) endif @@ -491,8 +489,8 @@ keep: tdebase rdiff-backup $(call buildpkg,applications/keep) kerberostray: tdebase -# Do NOT build on CentOS 5, PCLinuxOS -ifeq (,$(filter $(DIST),.el5 .pclos)) +# Do NOT build on CentOS 5 +ifeq (,$(filter $(DIST),.el5)) $(call buildpkg,applications/kerberostray) endif @@ -578,7 +576,9 @@ kooldock: tdebase $(call buildpkg,applications/kooldock) kopete-otr: tdebase tdenetwork +ifeq (,$(filter $(DIST),.pclos2018)) $(call buildpkg,applications/kopete-otr) +endif kpicosim: tdebase $(call buildpkg,applications/kpicosim) @@ -850,7 +850,7 @@ mathemagics: $(call buildpkg,extras/mathemagics) pan: gmime intltool -ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))) +ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)) $(call buildpkg,3rdparty/pan) endif |