RPM Packaging: updates

2 files changed, 13 insertions, 13 deletions

diff --git a/redhat/tdebase/trinity-tdebase-14.0.0.spec b/redhat/tdebase/trinity-tdebase-14.0.0.spec
index f052700df..54c5f56b7 100644
--- a/redhat/tdebase/trinity-tdebase-14.0.0.spec
+++ b/redhat/tdebase/trinity-tdebase-14.0.0.spec
@@ -2622,7 +2622,7 @@ Requires:	%{name}-data = %{version}-%{release}
 
 %description -n trinity-konsole
 Konsole is an X terminal emulation which provides a command-line interface
-(CLI) while using the graphical K Desktop Environment. Konsole helps to
+(CLI) while using the graphical Trinity Desktop Environment. Konsole helps to
 better organize user's desktop by containing multiple sessions in a single
 window (a less cluttered desktop).
 
@@ -2759,15 +2759,15 @@ Requires:	%{name}-data = %{version}-%{release}
 Requires:	trinity-twin = %{version}-%{release}
 
 %description -n trinity-ksmserver
-This package contains the KDE session manager. It is responsible for
+This package contains the TDE session manager. It is responsible for
 restoring your TDE session on login. It is also needed to properly
-start a KDE session. It registers KDE with X display managers, and
-provides the 'starttde' command, for starting an X session with KDE
+start a TDE session. It registers KDE with X display managers, and
+provides the 'starttde' command, for starting an X session with TDE
 from the console.
 
 If you are running TDE for the first time for a certain user,
 kpersonalizer is used to help with setup. If it is not present,
-KDE will start, but many good defaults will not be set.
+TDE will start, but many good defaults will not be set.
 
 %files -n trinity-ksmserver
 %defattr(-,root,root,-)
@@ -3324,7 +3324,7 @@ cd build
 %endif
 
 # Mageia/Mandriva/PCLinuxOS stores its session file in different folder than RHEL/Fedora
-# Generated files for TDM/KDM4 go to '/usr/share/apps/tdm/sessions'
+# Generated files for TDM/KDM4 go to '/usr/share/apps/kdm/sessions'
 %if 0%{?mgaversion} || 0%{?mdkversion}
 %__install -d -m 755 %{?buildroot}%{_sysconfdir}/X11/wmsession.d
 cat <<EOF >"%{?buildroot}%{_sysconfdir}/X11/wmsession.d/45TDE"
diff --git a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec b/redhat/tdebase/trinity-tdebase-3.5.13.2.spec
index e3b90f11f..48e7b887a 100644
--- a/redhat/tdebase/trinity-tdebase-3.5.13.2.spec
+++ b/redhat/tdebase/trinity-tdebase-3.5.13.2.spec
@@ -2832,7 +2832,7 @@ KDE will start, but many good defaults will not be set.
 %files -n trinity-ksmserver
 %defattr(-,root,root,-)
 %{tde_bindir}/ksmserver
-%{tde_bindir}/start[kt]de
+%{tde_bindir}/startkde
 %{tde_bindir}/migratekde3
 %{tde_tdelibdir}/ksmserver.la
 %{tde_tdelibdir}/ksmserver.so
@@ -3281,19 +3281,19 @@ Windows and Samba shares.
 # Applies an optional distro-specific graphical theme
 %if "%{?tde_bg}" != ""
 # TDM Background
-%__sed -i "tdm/kfrontend/gentdmconf.c" \
+%__sed -i "kdm/kfrontend/genkdmconf.c" \
 	-e 's|"Wallpaper=isadora.png\n"|"Wallpaper=%{tde_bg}\n"|'
 
 # TDE user default background
 %__sed -i "kpersonalizer/keyecandypage.cpp" \
 	-e 's|#define DEFAULT_WALLPAPER "isadora.png"|#define DEFAULT_WALLPAPER "%{tde_bg}"|'
-%__sed -i "start[kt]de" \
+%__sed -i "startkde" \
 	-e 's|/usr/share/wallpapers/isadora.png.desktop|%{tde_bg}|' \
 	-e 's|Wallpaper=isadora.png|Wallpaper=%{tde_bg}|'
 %endif
 
 # TDE branding: removes KUbuntu references [Bug #617]
-%__sed -i "kcontrol/[kt]dm/[kt]dm-appear.cpp" \
+%__sed -i "kcontrol/kdm/kdm-appear.cpp" \
 	-e "s|Welcome to Kubuntu |Welcome to %{tde_aboutlabel} |"
 %__sed -i "konqueror/about/konq_aboutpage.cc" \
 	-e "s|About Kubuntu|About %{tde_aboutlabel}|" \
@@ -3301,15 +3301,15 @@ Windows and Samba shares.
 	-e "s|Kubuntu Documentation|%{tde_aboutlabel} Documentation|"
 %__sed -i "konqueror/about/launch.html" \
 	-e "s|help:/kubuntu/about-kubuntu/index.html|%{tde_aboutpage}|"
-%__sed -i "[kt]dm/config.def" \
+%__sed -i "kdm/config.def" \
 	-e "s|Welcome to Trinity |Welcome to %{tde_aboutlabel} |"
 
 # TDE default directory in 'startkde' script (KDEDIR)
-%__sed -i "start[kt]de" \
+%__sed -i "startkde" \
 	-e "s|/opt/trinity|%{tde_prefix}|g"
 
 # TDE default start button icon
-%__sed -i "start[kt]de" \
+%__sed -i "startkde" \
 	-e "s|%%{tde_starticon}|%{tde_starticon}|g"