summaryrefslogtreecommitdiffstats
path: root/redhat
diff options
context:
space:
mode:
Diffstat (limited to 'redhat')
-rw-r--r--redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec7
-rw-r--r--redhat/tdebase/tdebase-14.0.0.spec1
-rw-r--r--redhat/tdelibs/tdelibs-14.0.0.spec2
-rw-r--r--redhat/tdemultimedia/tdemultimedia-14.0.0.spec12
4 files changed, 16 insertions, 6 deletions
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
index 7738ecaa9..4ff78d42d 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -84,7 +84,7 @@ This package installs the Trinity directory structure.
%dir %{tde_datadir}/applnk/*
%dir %{tde_datadir}/applnk/*/*
%dir %{tde_datadir}/apps
-%dir %{tde_datadir}/apps/plugin
+%dir %{tde_datadir}/apps/*
%dir %{tde_datadir}/cmake
%dir %{tde_datadir}/config.kcfg
%dir %{tde_datadir}/autostart
@@ -141,6 +141,8 @@ This package installs the Trinity directory structure.
%__install -d -m 755 %{?buildroot}%{tde_datadir}/applnk/Utilities
%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps
%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/plugin
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
%__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
%__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
@@ -153,6 +155,7 @@ This package installs the Trinity directory structure.
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/audio
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/fonts
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/image
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/interface
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/inode
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/media
%__install -d -m 755 %{?buildroot}%{tde_datadir}/mimelnk/message
@@ -169,7 +172,7 @@ This package installs the Trinity directory structure.
# Create icons directories
%__install -d -m 755 %{?buildroot}%{tde_datadir}/icons
-for t in crystalsvg hicolor ; do
+for t in crystalsvg hicolor locolor ; do
%__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}"
%__install -d -m 755 "%{?buildroot}%{tde_datadir}/icons/${t}/scalable"
for i in {16,22,32,48,64,128} ; do
diff --git a/redhat/tdebase/tdebase-14.0.0.spec b/redhat/tdebase/tdebase-14.0.0.spec
index 95d57df78..fd32e621c 100644
--- a/redhat/tdebase/tdebase-14.0.0.spec
+++ b/redhat/tdebase/tdebase-14.0.0.spec
@@ -417,7 +417,6 @@ BuildRequires: Mesa-libGLU-devel
%endif
# NAS support
-# (what is nas btw ?)
%if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: nas-devel
%endif
diff --git a/redhat/tdelibs/tdelibs-14.0.0.spec b/redhat/tdelibs/tdelibs-14.0.0.spec
index 8c1ddf26c..e64c59664 100644
--- a/redhat/tdelibs/tdelibs-14.0.0.spec
+++ b/redhat/tdelibs/tdelibs-14.0.0.spec
@@ -93,6 +93,8 @@ BuildRequires: fdupes
# SUSE desktop files utility
%if 0%{?suse_version}
BuildRequires: update-desktop-files
+# for xdg-menu script
+BuildRequires: brp-check-trinity
%endif
# KRB5 support
diff --git a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
index 571b26812..36cff36b6 100644
--- a/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
+++ b/redhat/tdemultimedia/tdemultimedia-14.0.0.spec
@@ -252,6 +252,7 @@ TDE, including:
%package -n trinity-artsbuilder
Summary: Synthesizer designer for aRts
Group: Applications/Multimedia
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-artsbuilder
This is the analog Realtime synthesizer's graphical design tool.
@@ -607,17 +608,18 @@ au/avi/m3u/mp3/ogg/wav file metainformation plugins for Trinity.
##########
%package kappfinder-data
-Summary: Multimedia data for kappfinder-trinity
+Summary: Multimedia data for kappfinder
Group: Applications/Multimedia
-Requires: trinity-kappfinder
+Requires: trinity-kappfinder >= %{tde_version}
+Requires: trinity-tdebase-runtime-data-common >= %{tde_version}
%description kappfinder-data
This package provides data on multimedia applications for kappfinder.
%files kappfinder-data
%defattr(-,root,root,-)
-%{tde_datadir}/apps/kappfinder/*
+%{tde_datadir}/apps/kappfinder/
%{tde_datadir}/desktop-directories/tde-multimedia-music.directory
%{_sysconfdir}/xdg/menus/applications-merged/tde-multimedia-music.menu
@@ -626,6 +628,7 @@ This package provides data on multimedia applications for kappfinder.
%package tdeio-plugins
Summary: Enables the browsing of audio CDs under Konqueror
Group: Applications/Multimedia
+Requires: trinity-tdebase-tdeio-plugins >= %{tde_version}
Obsoletes: trinity-tdemultimedia-kio-plugins < %{version}-%{release}
Provides: trinity-tdemultimedia-kio-plugins = %{version}-%{release}
@@ -713,6 +716,7 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
%package -n trinity-kmix
Summary: Sound mixer applet for Trinity
Group: Applications/Multimedia
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kmix
This package includes TDE's dockable sound mixer applet.
@@ -969,6 +973,7 @@ multimedia engine though aRts.
%package -n trinity-libkcddb
Summary: CDDB library for Trinity
Group: Environment/Libraries
+Requires: trinity-kcontrol >= %{tde_version}
%description -n trinity-libkcddb
The Trinity native CDDB (CD Data Base) library, providing easy access to Audio
@@ -1030,6 +1035,7 @@ and WAV playback
%package -n trinity-noatun
Summary: Media player for Trinity
Group: Applications/Multimedia
+Requires: trinity-tdebase-bin >= %{tde_version}
# 20120802: Hack to avoid dependency issue on MGA2 and MDV2011
%if 0%{?mgaversion} || 0%{?mdkversion}