From 4daa7e6206722f2d6dfaab5a996b31ff823e1a3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 7 Feb 2021 14:37:22 +0100 Subject: RPM: update metapackages --- redhat/extras/brp-check-trinity/brp-check-trinity.spec | 8 ++++++-- redhat/extras/trinity-desktop/trinity-desktop.spec | 13 +++++++------ redhat/extras/trinity-filesystem/trinity-filesystem.spec | 2 +- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/redhat/extras/brp-check-trinity/brp-check-trinity.spec b/redhat/extras/brp-check-trinity/brp-check-trinity.spec index afb764de3..de83a2194 100644 --- a/redhat/extras/brp-check-trinity/brp-check-trinity.spec +++ b/redhat/extras/brp-check-trinity/brp-check-trinity.spec @@ -25,7 +25,7 @@ Name: brp-check-trinity Version: 1.0 Release: 1%{?dist} Summary: Build root policy check scripts for Trinity -Group: System Environment/Daemons +Group: System Environment/Daemons URL: http://www.trinitydesktop.org/ %if 0%{?suse_version} @@ -82,7 +82,11 @@ for i in \ -e "s|applications/kde|applications/tde|g" \ -e "s|KDE|TDE|g" \ -e "s|kde-|tde-|g" \ - -e "s|tde-settings.menu|kde-settings.menu|" +%if 0%{?suse_version} == 1550 + -e "s|/usr/share/applications|/opt/trinity/share/applications|g" \ + -e "/^for i in/ s|\\\| /\$RPM_BUILD_ROOT/opt/trinity/share/applnk \\\|" \ +%endif + -e "s|tde-settings.menu|kde-settings.menu|g" done diff --git a/redhat/extras/trinity-desktop/trinity-desktop.spec b/redhat/extras/trinity-desktop/trinity-desktop.spec index 52ecdda63..ab7f643a8 100644 --- a/redhat/extras/trinity-desktop/trinity-desktop.spec +++ b/redhat/extras/trinity-desktop/trinity-desktop.spec @@ -70,12 +70,12 @@ Requires: trinity-repo >= %{version} %endif %description -The TDE project aims to keep the KDE3.5 computing style alive, as well as -polish off any rough edges that were present as of KDE 3.5.10. Along -the way, new useful features will be added to keep the environment +The TDE project aims to keep the KDE3.5 computing style alive, as well as +polish off any rough edges that were present as of KDE 3.5.10. Along +the way, new useful features will be added to keep the environment up-to-date. -Toward that end, significant new enhancements have already been made in -areas such as display control, network connectivity, user +Toward that end, significant new enhancements have already been made in +areas such as display control, network connectivity, user authentication, and much more! %files @@ -154,11 +154,12 @@ Requires: trinity-knowit Requires: trinity-knmap Requires: trinity-knutclient Requires: trinity-koffice-suite -Requires: trinity-kooldock Requires: trinity-konversation +Requires: trinity-kooldock Requires: trinity-kopete-otr Requires: trinity-kpicosim Requires: trinity-kpilot +Requires: trinity-kplayer Requires: trinity-krecipes Requires: trinity-krename Requires: trinity-krusader diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec index 0029cfd6c..75f8c052b 100644 --- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec +++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec @@ -228,7 +228,7 @@ for t in crystalsvg hicolor locolor ; do for i in {16,22,32,48,64,128,256} ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/${i}x${i}" done - + # Create subdirectories for r in actions apps categories devices mimetypes places ; do %__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable/${r}" -- cgit v1.2.1