summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2018-06-02 14:18:31 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2018-06-19 20:11:02 +0200
commit15e02021e25b2c9a00d7eabaf6b2ffe5238c78b3 (patch)
tree22a4bad9396a56f6f41ec459eceff7cb08f22851
parent0495750052664fd0c9a9b78b3aa359e84abf614c (diff)
downloadtde-packaging-15e02021e25b2c9a00d7eabaf6b2ffe5238c78b3.tar.gz
tde-packaging-15e02021e25b2c9a00d7eabaf6b2ffe5238c78b3.zip
RPM: fix many build dependencies in spec files
-rw-r--r--redhat/applications/digikam/digikam-14.0.0.spec7
-rw-r--r--redhat/applications/koffice/koffice-14.0.0.spec9
-rw-r--r--redhat/dependencies/tqt3/tqt3-14.0.0.spec4
-rwxr-xr-xredhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec2
-rw-r--r--redhat/extras/fileshareset/fileshareset.spec3
-rw-r--r--redhat/main/tdebase/tdebase-14.0.0.spec11
-rw-r--r--redhat/main/tdeedu/tdeedu-14.0.0.spec2
-rw-r--r--redhat/main/tdelibs/tdelibs-14.0.0.spec6
-rw-r--r--redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec12
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec5
10 files changed, 45 insertions, 16 deletions
diff --git a/redhat/applications/digikam/digikam-14.0.0.spec b/redhat/applications/digikam/digikam-14.0.0.spec
index af643608d..9be888095 100644
--- a/redhat/applications/digikam/digikam-14.0.0.spec
+++ b/redhat/applications/digikam/digikam-14.0.0.spec
@@ -115,6 +115,13 @@ BuildRequires: libexiv2-devel
BuildRequires: exiv2-devel
%endif
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
+
Requires: trinity-libkexiv2
Requires: trinity-libkdcraw
Requires: trinity-libkipi
diff --git a/redhat/applications/koffice/koffice-14.0.0.spec b/redhat/applications/koffice/koffice-14.0.0.spec
index b0c4b69cc..3a564f894 100644
--- a/redhat/applications/koffice/koffice-14.0.0.spec
+++ b/redhat/applications/koffice/koffice-14.0.0.spec
@@ -115,7 +115,7 @@ BuildRequires: readline-devel
%if 0%{?suse_version}
BuildRequires: libbz2-devel
-BuildRequires: liblcms-devel
+BuildRequires: liblcms2-devel
%else
BuildRequires: bzip2-devel
BuildRequires: lcms-devel
@@ -247,6 +247,13 @@ BuildRequires: libXi6-devel
BuildRequires: libXi-devel
%endif
+# SQLITE support
+%if 0%{?mgaversion} || 0%{?mdkversion}
+BuildRequires: sqlite3-devel
+%else
+BuildRequires: sqlite-devel
+%endif
+
%description
KOffice is an integrated office suite.
diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
index 763abf773..a2b09f24a 100644
--- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec
+++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec
@@ -288,12 +288,10 @@ BuildRequires: %{_lib}fbclient-devel
%endif
# NIS support
-%if 0%{?suse_version} != 1330
%define with_nis 1
-%endif
# RPC support
-%if 0%{?fedora} >= 28 || 0%{?suse_version} == 1500
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1500
%if 0%{?fedora}
BuildRequires: libnsl2-devel
%else
diff --git a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
index 21c9545e1..09c1cab1d 100755
--- a/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
+++ b/redhat/dependencies/tqtinterface/tqtinterface-14.0.0.spec
@@ -83,7 +83,7 @@ BuildRequires: pth-devel
%if 0%{?fedora} && 0%{?fedora} <= 26
BuildRequires: pth-devel
%endif
-%if 0%{?suse_version} && 0%{?suse_version} != 1330 && 0%{?suse_version} != 1500
+%if 0%{?suse_version} && 0%{?suse_version} < 1500
BuildRequires: libpth-devel
%endif
diff --git a/redhat/extras/fileshareset/fileshareset.spec b/redhat/extras/fileshareset/fileshareset.spec
index 79567d264..2a9d117ff 100644
--- a/redhat/extras/fileshareset/fileshareset.spec
+++ b/redhat/extras/fileshareset/fileshareset.spec
@@ -52,8 +52,7 @@ PreReq: permissions
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gcc-c++
-
-#Requires:
+BuildRequires: libtool
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index 544270eaf..a8ec98222 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -69,7 +69,9 @@ Source5: pamd.kscreensaver-trinity%{?dist}
%endif
# openSUSE: configuration file for TDM
+%if 0%{?suse_version} >= 1210
Source6: suse-displaymanagers-tdm
+%endif
# Fedora 18: use SYSTEMD for TDM startup
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -78,7 +80,7 @@ Source7: tdm.service%{?dist}
# openSUSE 11.4: overwrite distribution-provided '/etc/init.d/xdm' !!!
%if 0%{?suse_version} == 1140
-Source7: xdm.oss114
+Source7: xdm%{?dist}
%endif
# Fedora >= 17: special selinux policy required for TDM
@@ -700,9 +702,14 @@ BuildRequires: libr-devel >= 0.6.0
%endif
# RPC support
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} >= 28 || 0%{?suse_version} >= 1550
BuildRequires: libtirpc-devel
BuildRequires: rpcgen
+%if 0%{?fedora}
+BuildRequires: libnsl2-devel
+%else
+BuildRequires: libnsl-devel
+%endif
%endif
# tdebase is a metapackage that installs all sub-packages
diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index 5582ad79a..94434b8ed 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -95,7 +95,7 @@ BuildRequires: ocaml
# KIG python scripting support
%if 0%{?rhel} >= 6 || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
-%if 0%{?suse_version} == 1330 || 0%{?suse_version} == 1500
+%if 0%{?suse_version} == 1330 || 0%{?suse_version} >= 1500
%define with_kig 0
%else
%define with_kig 1
diff --git a/redhat/main/tdelibs/tdelibs-14.0.0.spec b/redhat/main/tdelibs/tdelibs-14.0.0.spec
index 76bc247a6..2a7aa0446 100644
--- a/redhat/main/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/main/tdelibs/tdelibs-14.0.0.spec
@@ -371,11 +371,15 @@ Requires: udisks
# UDISKS2 support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} || 0%{?rhel} >= 7
%define with_udisks2 1
-%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1550
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
BuildRequires: libudisks2-devel
%else
+%if 0%{?suse_version} >= 1550
+BuildRequires: libudisks2-0-devel
+%else
BuildRequires: udisks2-devel
%endif
+%endif
Requires: udisks2
%endif
diff --git a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
index f7fbc1929..1e3cec7a1 100644
--- a/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
+++ b/redhat/main/tdemultimedia/tdemultimedia-14.0.0-cmake.spec
@@ -203,6 +203,18 @@ BuildRequires: %{_lib}lame-devel
BuildRequires: libmp3lame-devel
%endif
+# IDN support
+BuildRequires: libidn-devel
+
+# OPENSSL support
+BuildRequires: openssl-devel
+
+# ACL support
+BuildRequires: libacl-devel
+
+# ATTR support
+BuildRequires: libattr-devel
+
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: lame-devel
%endif
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index 79c17d0d0..099ccc187 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -229,11 +229,6 @@ BuildRequires: libacl-devel
BuildRequires: meanwhile-devel
%endif
-# ORTP support
-#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
-#BuildRequires: ortp-devel
-#endif
-
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
%define with_speex 1