summaryrefslogtreecommitdiffstats
path: root/redhat/extras
diff options
context:
space:
mode:
authorFrançois Andriot <albator78@libertysurf.fr>2022-05-15 09:14:59 +0200
committerFrançois Andriot <albator78@libertysurf.fr>2022-05-15 09:27:38 +0200
commit11b59120b4b653f7915851ada6673e3d38b032f8 (patch)
tree4dd35cae65670867e7a810af4b7d5c40dfdcd123 /redhat/extras
parentc09543aa3d09abae6779b5e16ed5dc416d8e7c70 (diff)
downloadtde-packaging-11b59120b4b653f7915851ada6673e3d38b032f8.tar.gz
tde-packaging-11b59120b4b653f7915851ada6673e3d38b032f8.zip
RPM: add support for openSuse Leap 15.4
Signed-off-by: François Andriot <albator78@libertysurf.fr>
Diffstat (limited to 'redhat/extras')
-rw-r--r--redhat/extras/brp-check-trinity/brp-check-trinity.spec6
-rw-r--r--redhat/extras/trinity-desktop/trinity-desktop.spec11
2 files changed, 14 insertions, 3 deletions
diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
index 325f1aef4..cca9786f1 100644
--- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec
+++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec
@@ -43,10 +43,14 @@ BuildArch: noarch
BuildRequires: update-desktop-files
BuildRequires: brp-check-suse
+%if 0%{?suse_version} <= 1500
BuildRequires: brp-extract-appdata
+%endif
Requires: update-desktop-files
Requires: brp-check-suse
+%if 0%{?suse_version} <= 1500
Requires: brp-extract-appdata
+%endif
Requires: sed
@@ -82,7 +86,7 @@ for i in \
-e "s|applications/kde|applications/tde|g" \
-e "s|KDE|TDE|g" \
-e "s|kde-|tde-|g" \
-%if 0%{?suse_version} == 1550
+%if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150400
-e "s|/usr/share/applications|/opt/trinity/share/applications|g" \
-e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \
%endif
diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec
index e791ea9d4..06391b49f 100644
--- a/redhat/extras/trinity-desktop/trinity-desktop.spec
+++ b/redhat/extras/trinity-desktop/trinity-desktop.spec
@@ -165,9 +165,11 @@ Requires: trinity-konversation
Requires: trinity-kooldock
Requires: trinity-kopete-otr
Requires: trinity-kpicosim
-%if 0%{?rhel} != 5
+%if 0%{?sle_version} <= 150300
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 6
Requires: trinity-kpilot
%endif
+%endif
#Requires: trinity-kplayer
Requires: trinity-krecipes
Requires: trinity-krename
@@ -189,9 +191,12 @@ Requires: trinity-kxmleditor
Requires: trinity-mathemagics
Requires: trinity-mplayerthumbs
Requires: trinity-piklab
+%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora} || 0%{?rhel} >= 7
+# On RHEL6, polkit is too old
Requires: trinity-polkit-agent-tde
+%endif
Requires: trinity-potracegui
-#Requires: trinity-qalculate-tde
+Requires: trinity-qalculate-tde
# On RHEL, lilypond is not available, so no rosegarden :'-(
%if 0%{?suse_version} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?pclinuxos} || 0%{?fedora}
Requires: trinity-rosegarden
@@ -200,7 +205,9 @@ Requires: trinity-smb4k
Requires: trinity-smartcardauth
Requires: trinity-soundkonverter
Requires: trinity-tastymenu
+%if 0%{?sle_version} <= 150300
Requires: trinity-tde-guidance
+%endif
Requires: trinity-tde-style-baghira
Requires: trinity-tde-style-domino
Requires: trinity-tde-style-ia-ora