diff options
| author | François Andriot <[email protected]> | 2019-07-30 19:54:39 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2019-07-30 19:54:39 +0200 |
| commit | f6042194a160d58772626035fa59604da08e06e0 (patch) | |
| tree | 598895a543568639cb582d0013891519357cdf11 /redhat/Makefile.r14 | |
| parent | 87f8fcd5f192267ad890dd4e923be245bb834658 (diff) | |
| download | tde-packaging-f6042194a160d58772626035fa59604da08e06e0.tar.gz tde-packaging-f6042194a160d58772626035fa59604da08e06e0.zip | |
RPM: update packages to build on Fedora 30, Mageia 7
Diffstat (limited to 'redhat/Makefile.r14')
| -rw-r--r-- | redhat/Makefile.r14 | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14 index 57eb8eb56..17ffbc308 100644 --- a/redhat/Makefile.r14 +++ b/redhat/Makefile.r14 @@ -168,10 +168,15 @@ endif esound: # Build on Mageia, Fedora >= 23, Opensuse >= 15.0 -ifneq (,$(filter $(DIST),.mga5 .mga6 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .osstw)) +ifneq (,$(filter $(DIST),.mga5 .mga6 .mga7 .fc23 .fc24 .fc25 .fc26 .fc27 .oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/esound) endif +exiv2: +ifneq (,$(filter $(DIST),.mga7 .fc30)) + $(call buildpkg,3rdparty/exiv2) +endif + file: # Build on CentOS 5 ifneq (,$(filter $(DIST),.el5)) @@ -211,8 +216,8 @@ endif endif lcms: -# Build on EL7, OSS150, OSSTW -ifneq (,$(filter $(DIST),.el7 .oss150 .osstw)) +# Build on EL7, MGA7, OSS >= 150, OSSTW +ifneq (,$(filter $(DIST),.el7 .oss150 .oss151 .osstw .mga7)) $(call buildpkg,3rdparty/lcms) endif @@ -248,7 +253,7 @@ endif mp4v2: # Build on OpenSUSE only -ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .osstw)) +ifneq (,$(filter $(DIST),.oss131 .oss132 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/mp4v2) endif @@ -281,7 +286,7 @@ endif recode: # Build on OpenSUSE >= 15.0 only -ifneq (,$(filter $(DIST),.oss150 .osstw)) +ifneq (,$(filter $(DIST),.oss150 .oss151 .osstw)) $(call buildpkg,3rdparty/recode) endif @@ -311,7 +316,7 @@ endif wv2: # Do NOT build on Mageia or openSUSE or PCLINUXOS -ifeq (,$(filter $(DIST), .mga5 .mga6 .oss421 .oss422 .oss423 .oss150 .osstw .pclos .pclos2018)) +ifeq (,$(filter $(DIST), .mga5 .mga6 .mga7 .oss421 .oss422 .oss423 .oss150 .oss151 .osstw .pclos .pclos2018)) $(call buildpkg,3rdparty/wv2) endif @@ -328,7 +333,7 @@ kipi-plugins: tqtinterface tdelibs tdepim libkdcraw libkexiv2 libkipi libkdcraw: tqtinterface lcms $(call buildpkg,libraries/libkdcraw) -libkexiv2: tqtinterface +libkexiv2: tqtinterface tdelibs exiv2 $(call buildpkg,libraries/libkexiv2) libkipi: tqtinterface |