RPM Packaging: massive updates for R14.0.1

1 files changed, 9 insertions, 7 deletions

diff --git a/redhat/main/tdeedu/tdeedu-14.0.0.spec b/redhat/main/tdeedu/tdeedu-14.0.0.spec
index c33058ca0..a275ef5ce 100644
--- a/redhat/main/tdeedu/tdeedu-14.0.0.spec
+++ b/redhat/main/tdeedu/tdeedu-14.0.0.spec
@@ -27,6 +27,7 @@
 %define tde_pkg tdeedu
 %define tde_prefix /opt/trinity
 %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
@@ -500,7 +501,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-khangman
 %defattr(-,root,root,-)
-%{tde_datadir}/config/khangmanrc
+%{tde_confdir}/khangmanrc
 %{tde_bindir}/khangman
 %{tde_tdeappdir}/khangman.desktop
 %{tde_datadir}/apps/khangman/
@@ -552,8 +553,8 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kig
 %defattr(-,root,root,-)
-%{tde_datadir}/config/magic/cabri.magic
-%{tde_datadir}/config/magic/drgeo.magic
+%{tde_confdir}/magic/cabri.magic
+%{tde_confdir}/magic/drgeo.magic
 %{tde_bindir}/kig
 %{tde_bindir}/pykig.py*
 %{tde_tdelibdir}/tdefile_drgeo.la
@@ -704,7 +705,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-klettres
 %defattr(-,root,root,-)
-%{tde_datadir}/config/klettresrc
+%{tde_confdir}/klettresrc
 %{tde_bindir}/klettres
 %{tde_tdeappdir}/klettres.desktop
 %{tde_datadir}/config.kcfg/klettres.kcfg
@@ -862,7 +863,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kstars
 %defattr(-,root,root,-)
-%{tde_datadir}/config/kstarsrc
+%{tde_confdir}/kstarsrc
 %{tde_bindir}/kstars
 %{tde_tdeappdir}/kstars.desktop
 %{tde_datadir}/config.kcfg/kstars.kcfg
@@ -1069,7 +1070,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kvoctrain
 %defattr(-,root,root,-)
-%{tde_datadir}/config/kvoctrainrc
+%{tde_confdir}/kvoctrainrc
 %{tde_bindir}/kvoctrain
 %{tde_bindir}/spotlight2kvtml
 %{tde_libdir}/libkvoctraincore.so.*
@@ -1118,7 +1119,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kwordquiz
 %defattr(-,root,root,-)
-%{tde_datadir}/config/kwordquizrc
+%{tde_confdir}/kwordquizrc
 %{tde_bindir}/kwordquiz
 %{tde_tdeappdir}/kwordquiz.desktop
 %{tde_datadir}/apps/kwordquiz/
@@ -1369,6 +1370,7 @@ This package contains the development files for tdeedu.
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
+export kde_confdir="%{tde_confdir}"
 
 # Specific path for RHEL4
 if [ -d "/usr/X11R6" ]; then