RPM packaging: remove tdefilereplace in tdewebdev

2 files changed, 21 insertions, 67 deletions

diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 3772b3081..b6b9b2abc 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -176,29 +176,31 @@ Requires: trinity-ksim = %{version}-%{release}
 Requires: trinity-ktimer = %{version}-%{release}
 Requires: trinity-tdewalletmanager = %{version}-%{release}
 Requires: trinity-superkaramba = %{version}-%{release}
+Requires: trinity-tdefilereplace = %{version}-%{release}
 
 
 %description
 Utilities for the Trinity Desktop Environment, including:
-  * ark (tar/gzip archive manager)
-  * kcalc (scientific calculator)
-  * kcharselect (character selector)
-  * tdelirc (infrared control)
-  * tdessh (ssh front end)
-  * kdf (view disk usage)
-  * kedit (simple text editor)
-  * kfloppy (floppy formatting tool)
-  * kgpg (gpg gui)
-  * khexedit (hex editor)
-  * kjots (note taker)
+* ark (tar/gzip archive manager)
+* kcalc (scientific calculator)
+* kcharselect (character selector)
+* tdelirc (infrared control)
+* tdessh (ssh front end)
+* kdf (view disk usage)
+* kedit (simple text editor)
+* kfloppy (floppy formatting tool)
+* kgpg (gpg gui)
+* khexedit (hex editor)
+* kjots (note taker)
 %if 0%{?build_klaptopdaemon}
-  * klaptopdaemon (battery monitoring and management for laptops);
+* klaptopdaemon (battery monitoring and management for laptops);
 %endif
-  * kmilo
-  * kregexpeditor (regular expression editor)
-  * ksim (system information monitor);
-  * ktimer (task scheduler)
-  * kwikdisk (removable media utility)
+* kmilo
+* kregexpeditor (regular expression editor)
+* ksim (system information monitor);
+* ktimer (task scheduler)
+* kwikdisk (removable media utility)
+* tdefilereplace: batch search and replace tool
 
 %files
 
@@ -1203,6 +1205,7 @@ export PATH="%{tde_bindir}:${PATH}"
 %suse_update_desktop_file thinkpad
 %suse_update_desktop_file kvaio
 %suse_update_desktop_file KFloppy            System  Filesystem
+%suse_update_desktop_file -r tdefilereplace   System      FileManager
 %endif
 
 # Icons from TDE Control Center should only be displayed in TDE
diff --git a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
index 4d7601acb..d82576840 100644
--- a/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
+++ b/redhat/main/tdewebdev/tdewebdev-14.0.0.spec
@@ -102,7 +102,6 @@ Provides:	trinity-kdewebdev = %{version}-%{release}
 
 Requires: trinity-quanta = %{version}-%{release}
 Requires: trinity-quanta-data = %{version}-%{release}
-Requires: trinity-tdefilereplace = %{version}-%{release}
 Requires: trinity-kimagemapeditor = %{version}-%{release}
 Requires: trinity-klinkstatus = %{version}-%{release}
 Requires: trinity-kommander = %{version}-%{release}
@@ -110,7 +109,6 @@ Requires: trinity-kommander = %{version}-%{release}
 
 %description
 Web development applications, including:
-* tdefilereplace: batch search and replace tool
 * kimagemapeditor: HTML image map editor
 * klinkstatus: link checker
 * kommander: visual dialog building tool
@@ -125,7 +123,7 @@ Web development applications, including:
 %package -n trinity-quanta
 Summary:	web development environment for TDE [Trinity]
 Group:		Applications/Development
-Requires:	trinity-tdefilereplace = %{version}-%{release}
+Requires:	trinity-tdefilereplace
 Requires:	trinity-klinkstatus = %{version}-%{release}
 Requires:	trinity-kommander = %{version}-%{release}
 Requires:	trinity-quanta-data = %{version}-%{release}
@@ -202,52 +200,6 @@ This package is part of TDE, as a component of the TDE web development module.
 
 ##########
 
-%package -n trinity-tdefilereplace
-Summary:	batch search-and-replace component for TDE [Trinity]
-Group:		Applications/Development
-
-Obsoletes:	trinity-kfilereplace < %{version}-%{release}
-Provides:	trinity-kfilereplace = %{version}-%{release}
-
-%description -n trinity-tdefilereplace
-tdefileReplace is an embedded component for TDE that acts as a batch
-search-and-replace tool. It allows you to replace one expression with
-another in many files at once.
-
-Note that at the moment tdefileReplace does not come as a standalone
-application. An example of an application that uses the tdefileReplace
-component is Quanta Plus (found in the package quanta).
-
-This package is part of TDE, as a component of the TDE web development module.
-
-%files -n trinity-tdefilereplace
-%defattr(-,root,root,-)
-%{tde_bindir}/tdefilereplace
-%{tde_tdelibdir}/libtdefilereplacepart.la
-%{tde_tdelibdir}/libtdefilereplacepart.so
-%{tde_tdeappdir}/tdefilereplace.desktop
-%{tde_datadir}/apps/tdefilereplace/
-%{tde_datadir}/apps/tdefilereplacepart
-%{tde_datadir}/icons/hicolor/*/apps/tdefilereplace.png
-%{tde_datadir}/services/tdefilereplacepart.desktop
-%{tde_tdedocdir}/HTML/en/tdefilereplace/
-
-%post -n trinity-tdefilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-%postun -n trinity-tdefilereplace
-for f in hicolor ; do
-  touch --no-create %{tde_datadir}/icons/$f 2> /dev/null ||:
-  gtk-update-icon-cache -q %{tde_datadir}/icons/$f 2> /dev/null ||:
-done
-update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || :
-
-##########
-
 %package -n trinity-kimagemapeditor
 Summary:	HTML image map editor for TDE
 Group:		Applications/Development
@@ -594,7 +546,6 @@ cp -a php php.docrc %{buildroot}%{tde_datadir}/apps/quanta/doc/
 %suse_update_desktop_file -r kxsldbg          Office WebDevelopment
 %endif
 %suse_update_desktop_file -r kimagemapeditor  Office WebDevelopment
-%suse_update_desktop_file -r tdefilereplace   System      FileManager
 %suse_update_desktop_file    kmdr-editor      Development GUIDesigner
 %suse_update_desktop_file    kmdr-executor    Development GUIDesigner
 %suse_update_desktop_file -r quanta           Office WebDevelopment