summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
authorFran├žois Andriot <albator78@libertysurf.fr>2018-07-15 22:58:46 +0200
committerFran├žois Andriot <albator78@libertysurf.fr>2018-07-15 23:01:04 +0200
commita84a6c177e6cba0f72c146d29283cefe92750aba (patch)
treeaa8781a335894d7e9ec8bdc7293b512acf173c2f /redhat
parentfbd894a9bfc665642be19fa2b3e856af7a9ef7c2 (diff)
downloadtde-packaging-a84a6c177e6cba0f72c146d29283cefe92750aba.tar.gz
tde-packaging-a84a6c177e6cba0f72c146d29283cefe92750aba.zip
RPM: update build scripts for Opensuse TumbleWeed
Diffstat (limited to 'redhat')
-rw-r--r--redhat/Makefile.r1410
-rw-r--r--redhat/applications/amarok/amarok-14.0.0.spec2
-rw-r--r--redhat/applications/k3b/k3b-14.0.0.spec2
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec4
-rw-r--r--redhat/applications/tellico/tellico-14.0.0.spec2
-rw-r--r--redhat/docker/osstw/packages4
-rw-r--r--redhat/main/tdegraphics/tdegraphics-14.0.0.spec2
7 files changed, 15 insertions, 11 deletions
diff --git a/redhat/Makefile.r14 b/redhat/Makefile.r14
index 81225cdae..ac8148e4f 100644
--- a/redhat/Makefile.r14
+++ b/redhat/Makefile.r14
@@ -211,7 +211,7 @@ endif
lcms:
# Build on EL7, OSSTW
-ifeq (,$(filter $(DIST),.el7 osstw))
+ifneq (,$(filter $(DIST),.el7 .osstw))
$(call buildpkg,3rdparty/lcms)
endif
@@ -280,7 +280,7 @@ endif
recode:
# Build on OpenSUSE >= 15.0 only
-ifneq (,$(filter $(DIST),.oss150))
+ifneq (,$(filter $(DIST),.oss150 .osstw))
$(call buildpkg,3rdparty/recode)
endif
@@ -624,7 +624,7 @@ ksquirrel: tdebase libkipi libksquirrel
kstreamripper: tdebase
# Do NOT build on Fedora 27, OpenSUSE >= 15.0 (problem with scons and python3)
-ifeq (,$(filter $(DIST),.fc27 .oss150))
+ifeq (,$(filter $(DIST),.fc27 .oss150 .osstw))
$(call buildpkg,applications/kstreamripper)
endif
@@ -830,7 +830,7 @@ endif
klibido: pan
# Not on RHEL5, nor recent OpenSUSE
-ifeq (,$(filter $(DIST),.el5 .oss150))
+ifeq (,$(filter $(DIST),.el5 .oss150 .osstw))
$(call buildpkg,extras/klibido)
endif
@@ -853,7 +853,7 @@ mathemagics:
$(call buildpkg,extras/mathemagics)
pan: gmime intltool
-ifeq (,$(filter $(DIST),.el5 .oss150))
+ifeq (,$(filter $(DIST),.el5 .oss150 .osstw)))
$(call buildpkg,3rdparty/pan)
endif
diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index 41ef745b8..a18b8f583 100644
--- a/redhat/applications/amarok/amarok-14.0.0.spec
+++ b/redhat/applications/amarok/amarok-14.0.0.spec
@@ -191,7 +191,7 @@ BuildRequires: libofa-devel
%if 0%{?mgaversion} && 0%{?mgaversion} <= 2
BuildRequires: libtunepimp-devel
%endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
+%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} < 1500
BuildRequires: libtunepimp-devel
%endif
%if 0%{?fedora} && 0%{?fedora} <= 23
diff --git a/redhat/applications/k3b/k3b-14.0.0.spec b/redhat/applications/k3b/k3b-14.0.0.spec
index a0975d119..5bc2c6e88 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -110,7 +110,7 @@ Requires(postun): coreutils
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
-%if 0%{?suse_version} >= 1310 && 0%{?suse_version} != 1500
+%if 0%{?suse_version} >= 1310 && 0%{?suse_version} < 1500
Requires: wodim
REquires: genisoimage
%else
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 78026fb0a..1404ebb31 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -177,7 +177,7 @@ BuildRequires: libutempter-devel
# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12
%else
BuildRequires: poppler-devel >= 0.12
@@ -194,7 +194,7 @@ BuildRequires: trinity-poppler-devel >= 0.12
# POSTGRESQL support
# Requires 'libpqxx', for kexi-driver-pgqsl
%if 0%{?mdkversion} || 0%{?fedora} || 0%{?suse_version}
-%if 0%{?suse_version} != 1500
+%if 0%{?suse_version} != 1500 && 0%{?suse_version} != 1550
%define with_postgresql 1
BuildRequires: postgresql-devel
BuildRequires: libpqxx-devel
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index a8cf495ed..8cb0aae90 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -76,7 +76,7 @@ BuildRequires: fdupes
# POPPLER support
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12
%else
BuildRequires: poppler-devel >= 0.12
diff --git a/redhat/docker/osstw/packages b/redhat/docker/osstw/packages
index 68478e1a4..29ccaf530 100644
--- a/redhat/docker/osstw/packages
+++ b/redhat/docker/osstw/packages
@@ -28,6 +28,7 @@ docbook-xsl-stylesheets
doxygen GraphicsMagick
dssi-devel
fdupes
+ffmpeg-devel
fftw3-devel
file-devel
flac-devel
@@ -138,6 +139,7 @@ libXxf86dga-devel
lilo
lirc-devel
make
+makeinfo
meanwhile-devel
Mesa-devel
Mesa-libGL-devel
@@ -159,6 +161,7 @@ pkcs11-helper-devel
postgresql
postgresql-devel
python-devel
+qt-devel
rpcgen
rpm-build
rsvg-view
@@ -171,6 +174,7 @@ sqlite3-devel
subversion-devel
sudo
swig
+sword-devel
torsocks
transfig
unixODBC-devel
diff --git a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
index 2811f762a..18feb8d21 100644
--- a/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
+++ b/redhat/main/tdegraphics/tdegraphics-14.0.0.spec
@@ -199,7 +199,7 @@ BuildRequires: OpenEXR-devel
%define with_pdf 1
%if 0%{?with_pdf}
%if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
-%if 0%{?suse_version} == 1500
+%if 0%{?suse_version} >= 1500
BuildRequires: libpoppler-devel >= 0.12
%else
BuildRequires: poppler-devel >= 0.12