RPM Packaging: massive updates for R14.0.1

3 files changed, 11 insertions, 6 deletions

diff --git a/redhat/extras/knoda/trinity-knoda.spec b/redhat/extras/knoda/trinity-knoda.spec
index 8f643cd31..541c23b4d 100644
--- a/redhat/extras/knoda/trinity-knoda.spec
+++ b/redhat/extras/knoda/trinity-knoda.spec
@@ -8,6 +8,7 @@
 # TDE 3.5.13 specific building variables
 %define tde_bindir %{tde_prefix}/bin
 %define tde_datadir %{tde_prefix}/share
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
@@ -67,6 +68,7 @@ Requires: 	%{name} = %{version}-%{release}
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 
 %configure \
@@ -138,7 +140,7 @@ done
 %{tde_datadir}/applnk/Office/knoda.desktop
 %{tde_datadir}/apps/hk_kdeclasses/
 %{tde_datadir}/apps/knoda/
-%{tde_datadir}/config/magic/hk_classes.magic
+%{tde_confdir}/magic/hk_classes.magic
 %{tde_tdedocdir}/HTML/en/knoda/
 %{tde_datadir}/icons/hicolor/*/apps/knoda.png
 %{tde_datadir}/icons/locolor/*/apps/knoda.png
diff --git a/redhat/extras/kpacman/kpacman-14.0.0.spec b/redhat/extras/kpacman/kpacman-14.0.0.spec
index c2865c8fa..a30c6b6e1 100644
--- a/redhat/extras/kpacman/kpacman-14.0.0.spec
+++ b/redhat/extras/kpacman/kpacman-14.0.0.spec
@@ -28,6 +28,7 @@
 
 # TDE specific building variables
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
@@ -92,6 +93,7 @@ United States by Bally, Pacman is an icon of 1980's popular culture
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 %configure \
   --prefix=%{tde_prefix} \
@@ -147,7 +149,7 @@ done
 %{tde_bindir}/kpacman
 %{tde_datadir}/applnk/Games/kpacman.desktop
 %{tde_datadir}/apps/kpacman/   
-%{tde_datadir}/config/kpacmanrc
+%{tde_confdir}/kpacmanrc
 %lang(de) %{tde_tdedocdir}/HTML/de/kpacman/
 %{tde_tdedocdir}/HTML/en/kpacman/
 %{tde_datadir}/icons/hicolor/16x16/apps/kpacman.png
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 c985dc14c..43d8d31c6 100644
--- a/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
+++ b/redhat/extras/trinity-filesystem/trinity-filesystem-14.0.0.spec
@@ -21,6 +21,7 @@
 %endif
 %define tde_prefix /opt/trinity
 %define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
 %define tde_datadir %{tde_prefix}/share
 %define _docdir %{tde_docdir}
 %define tde_docdir %{tde_datadir}/doc
@@ -69,8 +70,8 @@ This package installs the Trinity directory structure.
 %dir %{tde_bindir}
 
 %dir %{tde_datadir}
-%dir %{tde_datadir}/config
-%dir %{tde_datadir}/config/magic
+%dir %{tde_confdir}
+%dir %{tde_confdir}/magic
 
 %dir %{tde_docdir}
 %dir %{tde_tdedocdir}
@@ -171,8 +172,8 @@ This package installs the Trinity directory structure.
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/apps/zeroconf
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/autostart
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/cmake
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config
-%__install -d -m 755 %{?buildroot}%{tde_datadir}/config/magic
+%__install -d -m 755 %{?buildroot}%{tde_confdir}
+%__install -d -m 755 %{?buildroot}%{tde_confdir}/magic
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/config.kcfg
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/emoticons
 %__install -d -m 755 %{?buildroot}%{tde_datadir}/locale