From a5fdb0ea69d56f6d5a68e8a38fc72e367b797464 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Mon, 18 Jun 2018 22:04:05 +0200
Subject: RPM: update spec files for opensuse TW on OBS

---
 redhat/applications/koffice/koffice-14.0.0.spec      | 3 ++-
 redhat/applications/kpilot/kpilot-14.0.0.spec        | 3 ++-
 redhat/applications/qalculate-tde/qalculate-tde.spec | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'redhat/applications')

diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index 3a564f894..78026fb0a 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -70,7 +70,7 @@ Prefix:		%{tde_prefix}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Source0:	%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-Source1:	%{name}-rpmlintrc
+Source1:	trinity-koffice-rpmlintrc
 
 # BuildRequires: world-devel ;)
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -115,6 +115,7 @@ BuildRequires:	readline-devel
 
 %if 0%{?suse_version}
 BuildRequires:	libbz2-devel
+BuildRequires:	liblcms-devel
 BuildRequires:	liblcms2-devel
 %else
 BuildRequires:	bzip2-devel
diff --git a/redhat/applications/kpilot/kpilot-14.0.0.spec b/redhat/applications/kpilot/kpilot-14.0.0.spec
index b03589e2c..c63417e81 100644
--- a/redhat/applications/kpilot/kpilot-14.0.0.spec
+++ b/redhat/applications/kpilot/kpilot-14.0.0.spec
@@ -147,6 +147,7 @@ export PATH="%{tde_bindir}:${PATH}"
 
 # Unwanted files
 %__rm -f %{?buildroot}%{tde_libdir}/libkpilot.so
+%__rm -fr %{?buildroot}%{tde_tdeincludedir}/kpilot/
 
 # Updates applications categories for openSUSE
 %if 0%{?suse_version}
@@ -155,6 +156,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %endif
 
 
+
 %clean
 %__rm -rf %{buildroot}
 
@@ -164,7 +166,6 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_bindir}/kpalmdoc
 %{tde_bindir}/kpilot
 %{tde_bindir}/kpilotDaemon
-%{tde_tdeincludedir}/kpilot
 %{tde_libdir}/libkpilot.la
 %{tde_libdir}/libkpilot.so.0
 %{tde_libdir}/libkpilot.so.0.0.0
diff --git a/redhat/applications/qalculate-tde/qalculate-tde.spec b/redhat/applications/qalculate-tde/qalculate-tde.spec
index cf20eb00a..b0079234e 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 || 0%{?suse_version} == 1500
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
 BuildRequires:	cln-devel
 %endif
 
-- 
cgit v1.2.1