RPM: fix configuration were overwritten during package update

10 files changed, 26 insertions, 26 deletions

diff --git a/redhat/main/tdeaccessibility/tdeaccessibility.spec b/redhat/main/tdeaccessibility/tdeaccessibility.spec
index 96ee80e2d..bcee278a3 100644
--- a/redhat/main/tdeaccessibility/tdeaccessibility.spec
+++ b/redhat/main/tdeaccessibility/tdeaccessibility.spec
@@ -250,7 +250,7 @@ This package is part of Trinity, as a component of the TDE accessibility module.
 
 %files -n trinity-kmouth
 %defattr(-,root,root,-)
-%{tde_confdir}/kmouthrc
+%config(noreplace) %{tde_confdir}/kmouthrc
 %{tde_bindir}/kmouth
 %{tde_tdeappdir}/kmouth.desktop
 %{tde_datadir}/apps/kmouth/
diff --git a/redhat/main/tdeadmin/tdeadmin.spec b/redhat/main/tdeadmin/tdeadmin.spec
index 11420b963..00876c515 100644
--- a/redhat/main/tdeadmin/tdeadmin.spec
+++ b/redhat/main/tdeadmin/tdeadmin.spec
@@ -244,7 +244,7 @@ install/remove them.
 %{tde_bindir}/kpackage
 %{tde_tdeappdir}/kpackage.desktop
 %{tde_datadir}/apps/kpackage/
-%{tde_confdir}/kpackagerc
+%config(noreplace) %{tde_confdir}/kpackagerc
 %{tde_datadir}/icons/hicolor/*/apps/kpackage.png
 %{tde_tdedocdir}/HTML/en/kpackage/
 
@@ -264,7 +264,7 @@ drag and drop GUI.
 %{tde_bindir}/ksysv
 %{tde_tdeappdir}/ksysv.desktop
 %{tde_datadir}/apps/ksysv/
-%{tde_confdir}/ksysvrc
+%config(noreplace) %{tde_confdir}/ksysvrc
 %{tde_datadir}/icons/hicolor/*/apps/ksysv.png
 %{tde_datadir}/mimelnk/application/x-ksysv.desktop
 %{tde_datadir}/mimelnk/text/x-ksysv-log.desktop
@@ -295,7 +295,7 @@ A user/group administration tool for TDE.
 %{tde_bindir}/kuser
 %{tde_tdeappdir}/kuser.desktop
 %{tde_datadir}/apps/kuser/
-%{tde_confdir}/kuserrc
+%config(noreplace) %{tde_confdir}/kuserrc
 %{tde_datadir}/config.kcfg/kuser.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/kuser.png
 %{tde_tdedocdir}/HTML/en/kuser/
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 688fc7380..be68c4eeb 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -2244,7 +2244,7 @@ already. Most users won't need this.
 %dir %{tdm_datadir}/sessions
 %{tdm_datadir}/sessions/*.desktop
 %{tdm_datadir}/themes/
-%{tde_confdir}/%{tdm}
+%config(noreplace) %{tde_confdir}/%{tdm}
 %if 0%{?with_selinux_policy}
 %exclude %{tde_confdir}/%{tdm}/tdm.pp
 %endif
@@ -2288,7 +2288,7 @@ already. Most users won't need this.
 
 # SELINUX policy
 %if 0%{?with_selinux_policy}
-%{tde_confdir}/%{tdm}/tdm.pp
+%config %{tde_confdir}/%{tdm}/tdm.pp
 %endif
 
 # Logrotate configuration
diff --git a/redhat/main/tdeedu/tdeedu.spec b/redhat/main/tdeedu/tdeedu.spec
index 5c958275e..b1198f509 100644
--- a/redhat/main/tdeedu/tdeedu.spec
+++ b/redhat/main/tdeedu/tdeedu.spec
@@ -450,7 +450,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-khangman
 %defattr(-,root,root,-)
-%{tde_confdir}/khangmanrc
+%config(noreplace) %{tde_confdir}/khangmanrc
 %{tde_bindir}/khangman
 %{tde_tdeappdir}/khangman.desktop
 %{tde_datadir}/apps/khangman/
@@ -489,8 +489,8 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kig
 %defattr(-,root,root,-)
-%{tde_confdir}/magic/cabri.magic
-%{tde_confdir}/magic/drgeo.magic
+%config(noreplace) %{tde_confdir}/magic/cabri.magic
+%config(noreplace) %{tde_confdir}/magic/drgeo.magic
 %{tde_bindir}/kig
 %{tde_bindir}/pykig.py*
 %{tde_tdelibdir}/tdefile_drgeo.la
@@ -517,8 +517,8 @@ This package is part of Trinity, as a component of the TDE education module.
 %{tde_datadir}/services/tdefile_kig.desktop
 %{tde_datadir}/services/kig_part.desktop
 %{tde_tdedocdir}/HTML/en/kig/
-%{tde_confdir}/magic/cabri.magic.mgc
-%{tde_confdir}/magic/drgeo.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/cabri.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/drgeo.magic.mgc
 %{tde_mandir}/man1/kig*
 
 ##########
@@ -604,7 +604,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-klettres
 %defattr(-,root,root,-)
-%{tde_confdir}/klettresrc
+%config(noreplace) %{tde_confdir}/klettresrc
 %{tde_bindir}/klettres
 %{tde_tdeappdir}/klettres.desktop
 %{tde_datadir}/config.kcfg/klettres.kcfg
@@ -723,7 +723,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kstars
 %defattr(-,root,root,-)
-%{tde_confdir}/kstarsrc
+%config(noreplace) %{tde_confdir}/kstarsrc
 %{tde_bindir}/kstars
 %{tde_tdeappdir}/kstars.desktop
 %{tde_datadir}/config.kcfg/kstars.kcfg
@@ -878,7 +878,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kvoctrain
 %defattr(-,root,root,-)
-%{tde_confdir}/kvoctrainrc
+%config(noreplace) %{tde_confdir}/kvoctrainrc
 %{tde_bindir}/kvoctrain
 %{tde_bindir}/spotlight2kvtml
 %{tde_libdir}/libkvoctraincore.so.*
@@ -913,7 +913,7 @@ This package is part of Trinity, as a component of the TDE education module.
 
 %files -n trinity-kwordquiz
 %defattr(-,root,root,-)
-%{tde_confdir}/kwordquizrc
+%config(noreplace) %{tde_confdir}/kwordquizrc
 %{tde_bindir}/kwordquiz
 %{tde_tdeappdir}/kwordquiz.desktop
 %{tde_datadir}/apps/kwordquiz/
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index f1d8a06ee..c7685d9cb 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -679,7 +679,7 @@ This package is part of Trinity, and a component of the TDE games module.
 
 %files -n trinity-kolf
 %defattr(-,root,root,-)
-%{tde_confdir}/magic/kolf.magic
+%config(noreplace) %{tde_confdir}/magic/kolf.magic
 %{tde_datadir}/apps/kolf/
 %{tde_bindir}/kolf
 %{tde_tdeappdir}/kolf.desktop
@@ -693,7 +693,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.so.1
 %{tde_libdir}/libkolf.so.1.2.0
 %{tde_tdedocdir}/HTML/en/kolf/
-%{tde_confdir}/magic/kolf.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc
 
 ##########
 
diff --git a/redhat/main/tdegraphics/tdegraphics.spec b/redhat/main/tdegraphics/tdegraphics.spec
index 2905481b3..abef4ab03 100644
--- a/redhat/main/tdegraphics/tdegraphics.spec
+++ b/redhat/main/tdegraphics/tdegraphics.spec
@@ -651,7 +651,7 @@ Homepage: http://kooka.kde.org/
 %{tde_bindir}/kooka
 %{tde_tdeappdir}/kooka.desktop
 %{tde_datadir}/apps/kooka/
-%{tde_confdir}/kookarc
+%config(noreplace) %{tde_confdir}/kookarc
 %{tde_datadir}/icons/hicolor/*/apps/kooka.png
 %{tde_tdedocdir}/HTML/en/kooka/
 
diff --git a/redhat/main/tdelibs/tdelibs.spec b/redhat/main/tdelibs/tdelibs.spec
index 61532c31a..5d6073f76 100644
--- a/redhat/main/tdelibs/tdelibs.spec
+++ b/redhat/main/tdelibs/tdelibs.spec
@@ -533,7 +533,7 @@ kimgio (image manipulation).
 %{tde_tdedocdir}/HTML/en/tdespell/
 
 # Global Trinity configuration
-%config %{tde_confdir}
+%config(noreplace) %{tde_confdir}
 
 # Some setuid binaries need special care
 %if 0%{?suse_version}
diff --git a/redhat/main/tdepim/tdepim.spec b/redhat/main/tdepim/tdepim.spec
index 35b3e3b76..6dbe11b47 100644
--- a/redhat/main/tdepim/tdepim.spec
+++ b/redhat/main/tdepim/tdepim.spec
@@ -891,8 +891,8 @@ mbox files, and/or trinity-tdebase-tdeio-plugins if you want to use POP3.
 
 %files -n trinity-kmail
 %defattr(-,root,root,-)
-%{tde_confdir}/kmail.antispamrc
-%{tde_confdir}/kmail.antivirusrc
+%config(noreplace) %{tde_confdir}/kmail.antispamrc
+%config(noreplace) %{tde_confdir}/kmail.antivirusrc
 %{tde_bindir}/kmail
 %{tde_bindir}/kmail_*.sh
 %{tde_tdelibdir}/kcm_kmail.la
@@ -1527,7 +1527,7 @@ This is the runtime package for programs that use the libkleopatra-trinity libra
 
 %files -n trinity-libkleopatra
 %defattr(-,root,root,-)
-%{tde_confdir}/libkleopatrarc
+%config(noreplace) %{tde_confdir}/libkleopatrarc
 %{tde_libdir}/libgpgme++.so.*
 %{tde_libdir}/libkleopatra.so.*
 %{tde_libdir}/libkpgp.so.*
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 6f3662c21..e3ae43abc 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -584,7 +584,7 @@ power management, for laptops, from within TDE.
 %{_sbindir}/klaptop_acpi_helper
 %endif
 
-%config %{tde_confdir}/kcmlaptoprc
+%config(noreplace) %{tde_confdir}/kcmlaptoprc
 
 %endif
 
@@ -690,7 +690,7 @@ connections, power, etc.
 
 %files -n trinity-ksim
 %defattr(-,root,root,-)
-%config %{tde_confdir}/ksim_panelextensionrc
+%config(noreplace) %{tde_confdir}/ksim_panelextensionrc
 %{tde_tdelibdir}/ksim_*.la
 %{tde_tdelibdir}/ksim_*.so
 %{tde_libdir}/libksimcore.so.*
diff --git a/redhat/main/tdevelop/tdevelop.spec b/redhat/main/tdevelop/tdevelop.spec
index cf2ad252e..ab7e1e331 100644
--- a/redhat/main/tdevelop/tdevelop.spec
+++ b/redhat/main/tdevelop/tdevelop.spec
@@ -182,8 +182,8 @@ individual needs.
 %{tde_bindir}/kdevprj2kdevelop
 %{tde_bindir}/kdevprofileeditor
 %{tde_libdir}/tdeconf_update_bin/kdev-gen-settings-tdeconf_update
-%{tde_confdir}/kdevassistantrc
-%{tde_confdir}/tdeveloprc
+%config(noreplace) %{tde_confdir}/kdevassistantrc
+%config(noreplace) %{tde_confdir}/tdeveloprc
 %{tde_tdeappdir}/kdevassistant.desktop
 %{tde_tdeappdir}/kdevdesigner.desktop
 %{tde_tdeappdir}/tdevelop.desktop