RPM: fix tde-style-lipstik installation

2 files changed, 8 insertions, 9 deletions

diff --git a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
index e699e1c48..a41633ed4 100644
--- a/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
+++ b/redhat/applications/tde-style-lipstik/tde-style-lipstik.spec
@@ -125,7 +125,7 @@ fi
   -DWITH_GCC_VISIBILITY=OFF \
   \
   -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
-  -DDATA_INSTALL_DIR="%{tde_datadir}" \
+  -DDATA_INSTALL_DIR="%{tde_datadir}/apps" \
   -DLIB_INSTALL_DIR="%{tde_libdir}" \
   \
   -DWITH_ALL_OPTIONS=ON \
@@ -158,10 +158,10 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_tdelibdir}/tdestyle_lipstik_config.so
 %{tde_tdelibdir}/plugins/styles/lipstik.la
 %{tde_tdelibdir}/plugins/styles/lipstik.so
-%{tde_datadir}/tdedisplay/color-schemes/lipstiknoble.kcsrc
-%{tde_datadir}/tdedisplay/color-schemes/lipstikstandard.kcsrc
-%{tde_datadir}/tdedisplay/color-schemes/lipstikwhite.kcsrc
-%{tde_datadir}/tdestyle/themes/lipstik.themerc
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstiknoble.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikstandard.kcsrc
+%{tde_datadir}/apps/tdedisplay/color-schemes/lipstikwhite.kcsrc
+%{tde_datadir}/apps/tdestyle/themes/lipstik.themerc
 
 
 %changelog
diff --git a/redhat/extras/trinity-filesystem/trinity-filesystem.spec b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
index 12603317b..f2ff37d2a 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem.spec
@@ -91,6 +91,7 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/applnk/*/*
 %dir %{tde_datadir}/apps
 %dir %{tde_datadir}/apps/*
+%dir %{tde_datadir}/apps/*/*
 %dir %{tde_datadir}/cmake
 %dir %{tde_datadir}/config.kcfg
 %dir %{tde_datadir}/autostart
@@ -117,8 +118,6 @@ This package installs the Trinity directory structure.
 %dir %{tde_datadir}/services
 %dir %{tde_datadir}/services/*
 %dir %{tde_datadir}/servicetypes
-%dir %{tde_datadir}/tdedisplay
-%dir %{tde_datadir}/tdedisplay/*
 %dir %{tde_datadir}/tdestyle
 %dir %{tde_datadir}/tdestyle/*
 %dir %{tde_datadir}/X11
@@ -173,6 +172,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/profiles
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remotes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/remoteview
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/tdedisplay
+%__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/tdedisplay/color-schemes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/videothumbnail
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
@@ -213,8 +214,6 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/services/tdeconfiguredialog
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/servicetypes
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdedisplay
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/tdedisplay/color-schemes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/tdestyle/themes
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/X11/xkb/symbols