From 0e1236eb405e96c675ea53a25ebe06985997af97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 6 Sep 2020 19:29:51 +0200 Subject: RPM: initial support for opensuse Leap 15.2 --- redhat/main/tdelibs/tdelibs.spec | 7 +++++++ redhat/main/tdenetwork/tdenetwork.spec | 6 ++---- redhat/main/tdepim/tdepim.spec | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) (limited to 'redhat/main') diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec index c0b3e2f0a..78ec1c93c 100644 --- a/redhat/main/tdelibs/tdelibs.spec +++ b/redhat/main/tdelibs/tdelibs.spec @@ -243,12 +243,15 @@ BuildRequires: xorg-x11-devel # ICEAUTH %if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} >= 1220 Requires: iceauth +BuildRequires: iceauth %endif %if 0%{?rhel} >= 5 || 0%{?fedora} Requires: xorg-x11-server-utils +BuildRequires: xorg-x11-server-utils %endif %if 0%{?rhel} == 4 || 0%{?suse_version} Requires: xorg-x11 +BuildRequires: xorg-x11 %endif # XZ support @@ -438,6 +441,9 @@ BuildRequires: libr-devel >= 0.6.0 # ATTR support BuildRequires: libattr-devel +# INTLTOOL support +BuildRequires: intltool + %description Libraries for the Trinity Desktop Environment: @@ -584,6 +590,7 @@ Requires: libtqt4-devel = %{tde_epoch}:4.2.0 Requires: trinity-arts-devel >= %{tde_epoch}:1.5.10 Requires: libart_lgpl-devel Requires: libattr-devel +Requires: intltool %{?xcomposite_devel:Requires: %{xcomposite_devel}} %{?xt_devel:Requires: %{xt_devel}} diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec index 45323afe3..a8a8295ed 100644 --- a/redhat/main/tdenetwork/tdenetwork.spec +++ b/redhat/main/tdenetwork/tdenetwork.spec @@ -234,7 +234,7 @@ BuildRequires: glib2-devel BuildRequires: speex-devel # jabber/ssl #{?fedora:Requires(hint): qca-tls} -Requires: jasper +#Requires: jasper # ACL support BuildRequires: libacl-devel @@ -764,6 +764,7 @@ designed to be used for sharing files with friends. %package -n trinity-kppp Summary: Modem dialer and ppp frontend for Trinity Group: Applications/Internet +BuildRequires: ppp Requires: ppp %if 0%{?with_consolehelper} @@ -801,9 +802,6 @@ track of the time spent online for you. %{tde_datadir}/apps/kppp/ %{tde_datadir}/icons/hicolor/*/apps/kppp.png %{tde_tdedocdir}/HTML/en/kppp/ -%if 0%{?suse_version} >= 1500 -%dir %{_sysconfdir}/ppp -%endif %dir %{_sysconfdir}/ppp/peers %{_sysconfdir}/ppp/peers/kppp-options diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec index b0ed255bc..efd9c9771 100644 --- a/redhat/main/tdepim/tdepim.spec +++ b/redhat/main/tdepim/tdepim.spec @@ -104,7 +104,7 @@ BuildRequires: gamin-devel # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} -%if 0%{?suse_version} < 1550 +%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150200 %define with_gnokii 1 BuildRequires: gnokii-devel %endif @@ -116,6 +116,9 @@ BuildRequires: gnokii-devel BuildRequires: flex-static %endif +# BISON support +BuildRequires: bison + # CURL support BuildRequires: curl-devel -- cgit v1.2.1