RPM packaging: updates for Fedora 28 / OpenSUSE 15.0

7 files changed, 19 insertions, 4 deletions

diff --git a/redhat/applications/amarok/amarok-14.0.0.spec b/redhat/applications/amarok/amarok-14.0.0.spec
index e80a2a2fc..41ef745b8 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
+%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 46ff97197..845546a50 100644
--- a/redhat/applications/k3b/k3b-14.0.0.spec
+++ b/redhat/applications/k3b/k3b-14.0.0.spec
@@ -109,7 +109,7 @@ Requires(postun): coreutils
 Requires:		%{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
 Requires:		%{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
 
-%if 0%{?suse_version} >= 1310
+%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 498bbd004..1bc3e471b 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -175,8 +175,12 @@ BuildRequires:	libutempter-devel
 
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif
@@ -188,10 +192,12 @@ 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
 %define with_postgresql 1
 BuildRequires:	postgresql-devel
 BuildRequires:	libpqxx-devel
 %endif
+%endif
 Obsoletes:		trinity-libpqxx
 
 # WPD support
diff --git a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
index 64ba896eb..9af509ede 100644
--- a/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
+++ b/redhat/applications/kstreamripper/kstreamripper-14.0.0.spec
@@ -15,6 +15,10 @@
 # Please submit bugfixes or comments via http://www.trinitydesktop.org/
 #
 
+%if 0%{?fedora} >= 28
+%global debug_package %{nil}
+%endif
+
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
@@ -97,6 +101,7 @@ you with managing/ripping your preferred streams.
 
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
+%__rm -f kde.py
 
 
 %build
diff --git a/redhat/applications/kuickshow/kuickshow-14.0.0.spec b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
index a83efca40..1862df13f 100644
--- a/redhat/applications/kuickshow/kuickshow-14.0.0.spec
+++ b/redhat/applications/kuickshow/kuickshow-14.0.0.spec
@@ -84,7 +84,7 @@ BuildRequires:	imlib1-devel
 %endif
 
 # GIF support
-%if 0%{?suse_version}
+%if 0%{?suse_version} || 0%{?fedora} >= 28
 BuildRequires:	giflib-devel 
 %else
 BuildRequires:	libungif-devel 
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index cdf54b84e..cf20eb00a 100644
--- a/redhat/applications/qalculate-tde/qalculate-tde.spec
+++ b/redhat/applications/qalculate-tde/qalculate-tde.spec
@@ -68,7 +68,7 @@ BuildRequires:	libtool
 
 BuildRequires:	libqalculate-devel >= 0.9.6
 
-%if 0%{?suse_version} == 1330
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
 BuildRequires:	cln-devel
 %endif
 
diff --git a/redhat/applications/tellico/tellico-14.0.0.spec b/redhat/applications/tellico/tellico-14.0.0.spec
index 8f36192af..a8cf495ed 100644
--- a/redhat/applications/tellico/tellico-14.0.0.spec
+++ b/redhat/applications/tellico/tellico-14.0.0.spec
@@ -76,8 +76,12 @@ BuildRequires:	fdupes
 
 # POPPLER support
 %if 0%{?rhel} >=6 || 0%{?fedora} >= 15 || 0%{?suse_version}
+%if 0%{?suse_version} == 1500
+BuildRequires: libpoppler-devel >= 0.12
+%else
 BuildRequires: poppler-devel >= 0.12
 %endif
+%endif
 %if 0%{?mgaversion} || 0%{?mdkversion}
 BuildRequires:	%{_lib}poppler-devel
 %endif