From d257b83fd4500c4543d8768332123a895c12b29d Mon Sep 17 00:00:00 2001
From: François Andriot <albator78@libertysurf.fr>
Date: Tue, 3 Dec 2019 22:08:14 +0100
Subject: RPM: fix configuration were overwritten during package update

---
 redhat/applications/amarok/amarok.spec                 |  2 +-
 redhat/applications/basket/basket.spec                 |  4 ++--
 redhat/applications/filelight/filelight.spec           |  2 +-
 redhat/applications/kdbg/kdbg.spec                     |  2 +-
 redhat/applications/kiosktool/kiosktool.spec           |  2 +-
 redhat/applications/kmplayer/kmplayer.spec             |  2 +-
 redhat/applications/kmyfirewall/kmyfirewall.spec       |  2 +-
 redhat/applications/koffice/koffice.spec               |  6 +++---
 redhat/applications/ksquirrel/ksquirrel.spec           | 12 ++++++------
 .../tde-systemsettings/tde-systemsettings.spec         |  2 +-
 redhat/applications/tdepowersave/tdepowersave.spec     |  2 +-
 redhat/applications/tellico/tellico.spec               |  2 +-
 redhat/dependencies/arts/arts.spec                     |  2 +-
 redhat/extras/kpacman/kpacman.spec                     |  2 +-
 redhat/main/tdeaccessibility/tdeaccessibility.spec     |  2 +-
 redhat/main/tdeadmin/tdeadmin.spec                     |  6 +++---
 redhat/main/tdebase/tdebase.spec                       |  4 ++--
 redhat/main/tdeedu/tdeedu.spec                         | 18 +++++++++---------
 redhat/main/tdegames/tdegames.spec                     |  4 ++--
 redhat/main/tdegraphics/tdegraphics.spec               |  2 +-
 redhat/main/tdelibs/tdelibs.spec                       |  2 +-
 redhat/main/tdepim/tdepim.spec                         |  6 +++---
 redhat/main/tdeutils/tdeutils.spec                     |  4 ++--
 redhat/main/tdevelop/tdevelop.spec                     |  4 ++--
 24 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/redhat/applications/amarok/amarok.spec b/redhat/applications/amarok/amarok.spec
index 852bba9ad..95d8f58fd 100644
--- a/redhat/applications/amarok/amarok.spec
+++ b/redhat/applications/amarok/amarok.spec
@@ -285,7 +285,7 @@ Amarok is a multimedia player with:
 %{tde_tdeappdir}/*.desktop
 %{tde_datadir}/servicetypes/*.desktop
 %{tde_datadir}/apps/profiles/amarok.profile.xml
-%{tde_confdir}/amarokrc
+%config(noreplace) %{tde_confdir}/amarokrc
 %{tde_datadir}/config.kcfg/*.kcfg
 %{tde_datadir}/services/amarokitpc.protocol
 %{tde_datadir}/services/amaroklastfm.protocol
diff --git a/redhat/applications/basket/basket.spec b/redhat/applications/basket/basket.spec
index fbffbd753..5fe18b109 100644
--- a/redhat/applications/basket/basket.spec
+++ b/redhat/applications/basket/basket.spec
@@ -168,7 +168,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_tdelibdir}/libbasketpart.so
 %{tde_tdelibdir}/libkontact_basket.la
 %{tde_tdelibdir}/libkontact_basket.so
-%{tde_confdir}/magic/basket.magic
+%config(noreplace) %{tde_confdir}/magic/basket.magic
 %{tde_datadir}/icons/crystalsvg/*/*/*
 %{tde_datadir}/mimelnk/application/x-basket-archive.desktop
 %{tde_datadir}/mimelnk/application/x-basket-template.desktop
@@ -182,7 +182,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %{tde_datadir}/services/kontact/basket.desktop
 %{tde_datadir}/services/kontact/basket_v4.desktop
 %{tde_tdedocdir}/HTML/en/basket/
-%{tde_confdir}/magic/basket.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/basket.magic.mgc
 
 
 %changelog
diff --git a/redhat/applications/filelight/filelight.spec b/redhat/applications/filelight/filelight.spec
index e32a92e3d..6c0e2c256 100644
--- a/redhat/applications/filelight/filelight.spec
+++ b/redhat/applications/filelight/filelight.spec
@@ -171,7 +171,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/filelight/
 %{tde_datadir}/icons/crystalsvg/*/actions/view_filelight.png
 %{tde_datadir}/icons/hicolor/*/apps/filelight.png
-%{tde_confdir}/filelightrc
+%config(noreplace) %{tde_confdir}/filelightrc
 %{tde_datadir}/services/*.desktop
 %{tde_tdelibdir}/libfilelight.so
 %{tde_tdelibdir}/libfilelight.la
diff --git a/redhat/applications/kdbg/kdbg.spec b/redhat/applications/kdbg/kdbg.spec
index feec59e6e..36737a942 100644
--- a/redhat/applications/kdbg/kdbg.spec
+++ b/redhat/applications/kdbg/kdbg.spec
@@ -161,7 +161,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_bindir}/kdbg
 %{tde_tdeappdir}/kdbg.desktop
 %{tde_datadir}/apps/kdbg/
-%{tde_confdir}/kdbgrc
+%config(noreplace) %{tde_confdir}/kdbgrc
 %lang(de) %{tde_tdedocdir}/HTML/de/kdbg/
 %lang(en) %{tde_tdedocdir}/HTML/en/kdbg/
 %lang(ru) %{tde_tdedocdir}/HTML/ru/kdbg/
diff --git a/redhat/applications/kiosktool/kiosktool.spec b/redhat/applications/kiosktool/kiosktool.spec
index f56b7b203..72f57a4c6 100644
--- a/redhat/applications/kiosktool/kiosktool.spec
+++ b/redhat/applications/kiosktool/kiosktool.spec
@@ -179,7 +179,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/%{tde_pkg}.desktop"
 %lang(pt) %{tde_tdedocdir}/HTML/pt/kiosktool/
 %lang(sv) %{tde_tdedocdir}/HTML/sv/kiosktool/
 %{tde_datadir}/icons/crystalsvg/*/apps/kiosktool.png
-%{tde_confdir}/kiosktoolrc
+%config(noreplace) %{tde_confdir}/kiosktoolrc
 %{tde_mandir}/man1/*.1*
 
 
diff --git a/redhat/applications/kmplayer/kmplayer.spec b/redhat/applications/kmplayer/kmplayer.spec
index 869ef88ec..df66a616c 100644
--- a/redhat/applications/kmplayer/kmplayer.spec
+++ b/redhat/applications/kmplayer/kmplayer.spec
@@ -190,7 +190,7 @@ Core files needed for KMPlayer.
 %{tde_libdir}/libkmplayercommon.so
 %{tde_bindir}/kgstplayer
 %{tde_bindir}/kxineplayer
-%{tde_confdir}/kmplayerrc
+%config(noreplace) %{tde_confdir}/kmplayerrc
 %{tde_datadir}/apps/kmplayer/bookmarks.xml
 %{tde_datadir}/apps/kmplayer/noise.gif
 %{tde_datadir}/icons/hicolor/*/apps/kmplayer.png
diff --git a/redhat/applications/kmyfirewall/kmyfirewall.spec b/redhat/applications/kmyfirewall/kmyfirewall.spec
index 093d920ec..fad2fb10b 100644
--- a/redhat/applications/kmyfirewall/kmyfirewall.spec
+++ b/redhat/applications/kmyfirewall/kmyfirewall.spec
@@ -136,7 +136,7 @@ university etc.)
 %{tde_datadir}/apps/kmfsystray/
 %{tde_datadir}/apps/kmyfirewall/
 %{tde_datadir}/config.kcfg/kmfconfig.kcfg
-%{tde_confdir}/kmyfirewallrc
+%config(noreplace) %{tde_confdir}/kmyfirewallrc
 %{tde_tdedocdir}/HTML/en/kmyfirewall/
 %{tde_datadir}/icons/hicolor/*/apps/kmyfirewall.png
 %{tde_datadir}/icons/locolor/*/apps/kmyfirewall.png
diff --git a/redhat/applications/koffice/koffice.spec b/redhat/applications/koffice/koffice.spec
index 49024b66a..411dd344e 100644
--- a/redhat/applications/koffice/koffice.spec
+++ b/redhat/applications/koffice/koffice.spec
@@ -635,8 +635,8 @@ For additional database drivers take a look at %{name}-kexi-driver-*
 %{tde_tdelibdir}/kexi.*
 # moved here to workaround bug #394101, alternative is to move libkexi(db|dbparser|utils) to -libs)
 %{tde_tdelibdir}/libkspreadkexiimport.*
-%{tde_confdir}/kexirc
-%{tde_confdir}/magic/kexi.magic
+%config(noreplace) %{tde_confdir}/kexirc
+%config(noreplace) %{tde_confdir}/magic/kexi.magic
 %{tde_datadir}/mimelnk/application/*
 %{tde_datadir}/servicetypes/kexi*.desktop
 %{tde_datadir}/services/kexi/
@@ -649,7 +649,7 @@ For additional database drivers take a look at %{name}-kexi-driver-*
 %{tde_tdelibdir}/krosskexiapp.*
 %{tde_tdelibdir}/krosskexidb.*
 %endif
-%{tde_confdir}/magic/kexi.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/kexi.magic.mgc
 
 ##########
 
diff --git a/redhat/applications/ksquirrel/ksquirrel.spec b/redhat/applications/ksquirrel/ksquirrel.spec
index 73661a2fa..92c9a8bbc 100644
--- a/redhat/applications/ksquirrel/ksquirrel.spec
+++ b/redhat/applications/ksquirrel/ksquirrel.spec
@@ -179,17 +179,17 @@ export PATH="%{tde_bindir}:${PATH}"
 %{tde_datadir}/apps/konqueror/servicemenus/konqksquirrel-dir.desktop
 %{tde_datadir}/apps/ksquirrel/
 %{tde_datadir}/apps/ksquirrelpart/
-%{tde_confdir}/magic/x-ras.magic
-%{tde_confdir}/magic/x-sun.magic
-%{tde_confdir}/magic/x-utah.magic
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic
 %{tde_tdedocdir}/HTML/*/ksquirrel
 %{tde_datadir}/icons/hicolor/*/apps/ksquirrel.png
 %{tde_datadir}/mimelnk/image/*.desktop
 %{tde_datadir}/services/ksquirrelpart.desktop
 %{tde_mandir}/man1/ksquirrel.1
-%{tde_confdir}/magic/x-ras.magic.mgc
-%{tde_confdir}/magic/x-sun.magic.mgc
-%{tde_confdir}/magic/x-utah.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-ras.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-sun.magic.mgc
+%config(noreplace) %{tde_confdir}/magic/x-utah.magic.mgc
 
 
 %changelog
diff --git a/redhat/applications/tde-systemsettings/tde-systemsettings.spec b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
index 6b6a1fbb5..98f92e826 100644
--- a/redhat/applications/tde-systemsettings/tde-systemsettings.spec
+++ b/redhat/applications/tde-systemsettings/tde-systemsettings.spec
@@ -173,7 +173,7 @@ echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_tdeappdir}/systemsettings.desktop"
 %{tde_datadir}/applications/tde/medianotifications.desktop
 %{tde_datadir}/applications/tde/systemsettings.desktop
 %{tde_datadir}/apps/systemsettings/
-%{tde_confdir}/systemsettingsrc
+%config(noreplace) %{tde_confdir}/systemsettingsrc
 %{tde_datadir}/desktop-directories/*.directory
 %{tde_datadir}/icons/crystalsvg/*/apps/systemsettings.png
 %{tde_tdedocdir}/HTML/en/systemsettings/
diff --git a/redhat/applications/tdepowersave/tdepowersave.spec b/redhat/applications/tdepowersave/tdepowersave.spec
index 1d93bb0cd..6a5ff8564 100644
--- a/redhat/applications/tdepowersave/tdepowersave.spec
+++ b/redhat/applications/tdepowersave/tdepowersave.spec
@@ -240,7 +240,7 @@ fi
 %{tde_datadir}/apps/tdepowersave/
 %{tde_datadir}/icons/hicolor/*/*/*.png
 %{tde_datadir}/autostart/tdepowersave-autostart.desktop
-%{tde_confdir}/tdepowersaverc
+%config(noreplace) %{tde_confdir}/tdepowersaverc
 %{tde_mandir}/man1/tdepowersave.*
 
 %lang(cs) %{tde_tdedocdir}/HTML/cs/tdepowersave/
diff --git a/redhat/applications/tellico/tellico.spec b/redhat/applications/tellico/tellico.spec
index 341c7f82e..39ce2e5f9 100644
--- a/redhat/applications/tellico/tellico.spec
+++ b/redhat/applications/tellico/tellico.spec
@@ -176,7 +176,7 @@ It also makes it easy for other softwares to use the Tellico data.
 %defattr(-,root,root,-)
 %{tde_bindir}/tellico
 %{tde_datadir}/applications
-%{tde_confdir}/tellicorc
+%config(noreplace) %{tde_confdir}/tellicorc
 
 ##########
 
diff --git a/redhat/dependencies/arts/arts.spec b/redhat/dependencies/arts/arts.spec
index 15cfc1623..5c0028fae 100644
--- a/redhat/dependencies/arts/arts.spec
+++ b/redhat/dependencies/arts/arts.spec
@@ -220,7 +220,7 @@ intended for systems running the Pulseaudio server.
 
 %files config-pulseaudio
 %defattr(-,root,root,-)
-%{tde_confdir}/kcmartsrc
+%config %{tde_confdir}/kcmartsrc
 
 %endif
 
diff --git a/redhat/extras/kpacman/kpacman.spec b/redhat/extras/kpacman/kpacman.spec
index f52e1c076..685e3a02f 100644
--- a/redhat/extras/kpacman/kpacman.spec
+++ b/redhat/extras/kpacman/kpacman.spec
@@ -146,7 +146,7 @@ done
 %{tde_bindir}/kpacman
 %{tde_datadir}/applnk/Games/kpacman.desktop
 %{tde_datadir}/apps/kpacman/   
-%{tde_confdir}/kpacmanrc
+%config(noreplace) %{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/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
-- 
cgit v1.2.3

