RPM: more updates

5 files changed, 59 insertions, 7 deletions

diff --git a/redhat/main/tdeaddons/tdeaddons.spec b/redhat/main/tdeaddons/tdeaddons.spec
index accb5bca5..19d665a60 100644
--- a/redhat/main/tdeaddons/tdeaddons.spec
+++ b/redhat/main/tdeaddons/tdeaddons.spec
@@ -465,7 +465,6 @@ graphical disk usage viewer and image conversions and transformations.
 %{_sysconfdir}/trinity/translaterc
 %{tde_bindir}/fsview
 %{tde_bindir}/jpegorient
-%{tde_bindir}/tdeio_media_realfolder
 %{tde_tdelibdir}/konq_sidebarnews.la
 %{tde_tdelibdir}/konq_sidebarnews.so
 %{tde_tdelibdir}/konqsidebar_delicious.la
diff --git a/redhat/main/tdebase/tdebase.spec b/redhat/main/tdebase/tdebase.spec
index 0683fd7be..a3953c6e3 100644
--- a/redhat/main/tdebase/tdebase.spec
+++ b/redhat/main/tdebase/tdebase.spec
@@ -1486,9 +1486,7 @@ TDE applications, particularly those in the TDE base module.
 %{tde_libdir}/libtdeinit_kxkb.la
 %{tde_libdir}/libtdeinit_kxkb.so
 %{tde_libdir}/libkhotkeys_shared.so.*
-%if "%{?tde_version}" == "14.1.0"
 %{tde_tdeappdir}/kdcop.desktop
-%endif
 %{tde_tdeappdir}/keyboard.desktop
 %{tde_tdeappdir}/keyboard_layout.desktop
 %{tde_tdeappdir}/khotkeys.desktop
@@ -2304,7 +2302,7 @@ already. Most users won't need this.
 /usr/lib/X11/displaymanagers/tdm
 %endif
 %if 0%{?fedora} >= 18 || 0%{?rhel} >= 7 || 0%{?mgaversion} >= 6
-#/usr/lib/systemd/system/tdm.service
+/usr/lib/systemd/system/tdm.service
 %endif
 %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} || 0%{?mgaversion} >= 6
 %{_datadir}/xsessions/tde.desktop
diff --git a/redhat/main/tdegames/tdegames.spec b/redhat/main/tdegames/tdegames.spec
index fd249f8ca..ac18a1835 100644
--- a/redhat/main/tdegames/tdegames.spec
+++ b/redhat/main/tdegames/tdegames.spec
@@ -32,6 +32,7 @@
 %define tde_docdir %{tde_datadir}/doc
 %define tde_includedir %{tde_prefix}/include
 %define tde_libdir %{tde_prefix}/%{_lib}
+%define tde_mandir %{tde_datadir}/man
 %define tde_tdeappdir %{tde_datadir}/applications/tde
 %define tde_tdedocdir %{tde_docdir}/tde
 %define tde_tdeincludedir %{tde_includedir}/tde
@@ -156,6 +157,7 @@ Requires: trinity-ktron = %{version}-%{release}
 Requires: trinity-ktuberling = %{version}-%{release}
 Requires: trinity-twin4 = %{version}-%{release}
 Requires: trinity-lskat = %{version}-%{release}
+Requires: trinity-tdefifteen = %{version}-%{release}
 
 
 %description
@@ -189,6 +191,7 @@ TDE desktop.
 %defattr(-,root,root,-)
 %{tde_datadir}/cmake/libtdegames.cmake
 %{tde_libdir}/pkgconfig/libtdegames.pc
+%{tde_mandir}/man*/atlantik.*
 
 ##########
 
@@ -325,6 +328,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/kasteroids/
 %{tde_datadir}/config.kcfg/kasteroids.kcfg
 %{tde_tdedocdir}/HTML/en/kasteroids/
+%{tde_mandir}/man*/kasteroids.*
 
 ##########
 
@@ -347,6 +351,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/katomic.desktop
 %{tde_bindir}/katomic
 %{tde_tdedocdir}/HTML/en/katomic/
+%{tde_mandir}/man*/katomic.*
 
 ##########
 
@@ -371,6 +376,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kbackgammon.png
 %{tde_datadir}/icons/hicolor/*/apps/kbackgammon_engine.png
 %{tde_tdedocdir}/HTML/en/kbackgammon/
+%{tde_mandir}/man*/kbackgammon.*
 
 ##########
 
@@ -394,6 +400,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kbattleship.desktop
 %{tde_bindir}/kbattleship
 %{tde_tdedocdir}/HTML/en/kbattleship/
+%{tde_mandir}/man*/kbattleship.*
 
 ##########
 
@@ -418,6 +425,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kblackbox.desktop
 %{tde_bindir}/kblackbox
 %{tde_tdedocdir}/HTML/en/kblackbox/
+%{tde_mandir}/man*/kblackbox.*
 
 ##########
 
@@ -452,6 +460,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/kbounce.png
 %{tde_bindir}/kbounce
 %{tde_tdedocdir}/HTML/en/kbounce/
+%{tde_mandir}/man*/kbounce.*
 
 ##########
 
@@ -478,6 +487,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kenolaba.desktop
 %{tde_bindir}/kenolaba
 %{tde_tdedocdir}/HTML/en/kenolaba/
+%{tde_mandir}/man*/kenolaba.*
 
 ##########
 
@@ -501,6 +511,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kfouleggs
 %{tde_datadir}/icons/hicolor/*/apps/kfouleggs.png
 %{tde_tdedocdir}/HTML/en/kfouleggs/
+%{tde_mandir}/man*/kfouleggs.*
 
 ##########
 
@@ -533,6 +544,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/KGoldrunner.desktop
 %{tde_bindir}/kgoldrunner
 %{tde_tdedocdir}/HTML/en/kgoldrunner/
+%{tde_mandir}/man*/kgoldrunner.*
 
 ##########
 
@@ -558,6 +570,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kjumpingcube.desktop
 %{tde_datadir}/config.kcfg/kjumpingcube.kcfg
 %{tde_tdedocdir}/HTML/en/kjumpingcube/
+%{tde_mandir}/man*/kjumpingcube.*
 
 ##########
 
@@ -579,6 +592,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/crystalsvg/*/actions/endturn.png
 %{tde_datadir}/apps/klickety/
 %{tde_tdedocdir}/HTML/en/klickety/
+%{tde_mandir}/man*/klickety.*
 
 ##########
 
@@ -609,6 +623,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/config.kcfg/klines.kcfg
 %{tde_datadir}/icons/hicolor/*/apps/klines.png
 %{tde_tdedocdir}/HTML/en/klines/
+%{tde_mandir}/man*/klines.*
 
 ##########
 
@@ -631,6 +646,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kmahjongg
 %{tde_datadir}/config.kcfg/kmahjongg.kcfg
 %{tde_tdedocdir}/HTML/en/kmahjongg/
+%{tde_mandir}/man*/kmahjongg.*
 
 ##########
 
@@ -657,6 +673,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/kmines/
 %{tde_bindir}/kmines
 %{tde_tdedocdir}/HTML/en/kmines/
+%{tde_mandir}/man*/kmines.*
 
 ##########
 
@@ -679,6 +696,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/knetwalk.png
 %{tde_tdeappdir}/knetwalk.desktop
 %{tde_tdedocdir}/HTML/en/knetwalk/
+%{tde_mandir}/man*/knetwalk.*
 
 ##########
 
@@ -709,6 +727,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_libdir}/libkolf.so.1.2.0
 %{tde_tdedocdir}/HTML/en/kolf/
 %config(noreplace) %{tde_confdir}/magic/kolf.magic.mgc
+%{tde_mandir}/man*/kolf.*
 
 ##########
 
@@ -749,6 +768,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/konquest.desktop
 %{tde_bindir}/konquest
 %{tde_tdedocdir}/HTML/en/konquest/
+%{tde_mandir}/man*/konquest.*
 
 ##########
 
@@ -769,6 +789,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kpat.desktop
 %{tde_bindir}/kpat
 %{tde_tdedocdir}/HTML/en/kpat/
+%{tde_mandir}/man*/kpat.*
 
 ##########
 
@@ -789,6 +810,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kpoker.desktop
 %{tde_bindir}/kpoker
 %{tde_tdedocdir}/HTML/en/kpoker/
+%{tde_mandir}/man*/kpoker.*
 
 ##########
 
@@ -818,6 +840,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/crystalsvg/scalable/actions/legalmoves.svgz
 %{tde_datadir}/icons/hicolor/*/apps/kreversi.png
 %{tde_tdedocdir}/HTML/en/kreversi/
+%{tde_mandir}/man*/kreversi.*
 
 ##########
 
@@ -840,6 +863,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ksame/
 %{tde_tdeappdir}/ksame.desktop
 %{tde_tdedocdir}/HTML/en/ksame/
+%{tde_mandir}/man*/ksame.*
 
 ##########
 
@@ -863,6 +887,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/kshisen.desktop
 %{tde_bindir}/kshisen
 %{tde_tdedocdir}/HTML/en/kshisen/
+%{tde_mandir}/man*/kshisen.*
 
 ##########
 
@@ -890,6 +915,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/ksirtet
 %{tde_datadir}/config.kcfg/ksirtet.kcfg
 %{tde_tdedocdir}/HTML/en/ksirtet/
+%{tde_mandir}/man*/ksirtet.*
 
 ##########
 
@@ -911,6 +937,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/ksmiletris.desktop
 %{tde_bindir}/ksmiletris
 %{tde_tdedocdir}/HTML/en/ksmiletris/
+%{tde_mandir}/man*/ksmiletris.*
 
 ##########
 
@@ -932,6 +959,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_tdeappdir}/ksnake.desktop
 %{tde_bindir}/ksnake
 %{tde_tdedocdir}/HTML/en/ksnake/
+%{tde_mandir}/man*/ksnake.*
 
 ##########
 
@@ -967,6 +995,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/ksokoban.png
 %{tde_bindir}/ksokoban
 %{tde_tdedocdir}/HTML/en/ksokoban/
+%{tde_mandir}/man*/ksokoban.*
 
 ##########
 
@@ -992,6 +1021,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_bindir}/kspaceduel
 %{tde_datadir}/config.kcfg/kspaceduel.kcfg
 %{tde_tdedocdir}/HTML/en/kspaceduel/
+%{tde_mandir}/man*/kspaceduel.*
 
 ##########
 
@@ -1013,6 +1043,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ktron/
 %{tde_datadir}/config.kcfg/ktron.kcfg
 %{tde_tdedocdir}/HTML/en/ktron/
+%{tde_mandir}/man*/ktron.*
 
 ##########
 
@@ -1047,6 +1078,7 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/apps/ktuberling/
 %{tde_datadir}/mimelnk/application/x-tuberling.desktop
 %{tde_tdedocdir}/HTML/en/ktuberling/
+%{tde_mandir}/man*/ktuberling.*
 
 ##########
 
@@ -1077,6 +1109,8 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/twin4.png
 %{tde_tdeappdir}/twin4.desktop
 %{tde_tdedocdir}/HTML/en/twin4/
+%{tde_mandir}/man*/twin4.*
+%{tde_mandir}/man*/twin4proc.*
 
 ##########
 
@@ -1104,6 +1138,27 @@ This package is part of Trinity, and a component of the TDE games module.
 %{tde_datadir}/icons/hicolor/*/apps/lskat.png
 %{tde_tdeappdir}/lskat.desktop
 %{tde_tdedocdir}/HTML/en/lskat/
+%{tde_mandir}/man*/lskat.*
+%{tde_mandir}/man*/lskatproc.*
+
+##########
+
+%package -n trinity-tdefifteen
+Summary:	Puzzle-solving game for Trinity
+Group:		Amusements/Games
+
+%description -n trinity-tdefifteen
+TDEFifteen is a sliding puzzle that consists of a frame of numbered square
+tiles in random order with one tile missing.
+
+This package is part of Trinity, and a component of the TDE games module.
+
+%files -n trinity-tdefifteen
+%defattr(-,root,root,-)
+%{tde_bindir}/tdefifteen
+%{tde_tdeappdir}/tdefifteen.desktop
+%{tde_datadir}/icons/hicolor/*/apps/tdefifteen.png
+%{tde_mandir}/man*/tdefifteen.*
 
 ##########
 
diff --git a/redhat/main/tdenetwork/tdenetwork.spec b/redhat/main/tdenetwork/tdenetwork.spec
index b2a5f6a48..673274afe 100644
--- a/redhat/main/tdenetwork/tdenetwork.spec
+++ b/redhat/main/tdenetwork/tdenetwork.spec
@@ -261,9 +261,9 @@ BuildRequires:	speex-devel
 
 # Build kopete motionaway plugin
 %if 0%{?rhel} == 5
-%define global build_kopete_motionaway 0
+%define build_kopete_motionaway 0
 %else
-%define global build_kopete_motionaway 1
+%define build_kopete_motionaway 1
 %endif
 
 Obsoletes:	trinity-kdenetwork < %{version}-%{release}
diff --git a/redhat/main/tdeutils/tdeutils.spec b/redhat/main/tdeutils/tdeutils.spec
index 04f86ad6d..d193d02ff 100644
--- a/redhat/main/tdeutils/tdeutils.spec
+++ b/redhat/main/tdeutils/tdeutils.spec
@@ -355,7 +355,7 @@ This is a frontend for the LIRC suite to use infrared devices with TDE.
 %{tde_datadir}/icons/hicolor/*/apps/irkick.png
 %{tde_datadir}/icons/locolor/*/apps/irkick.png
 %{tde_tdedocdir}/HTML/en/irkick/
-%{tde_tdedocdir}/HTML/en/kcmlirc/
+%{tde_tdedocdir}/HTML/en/kcontrol/kcmlirc/
 
 ##########