RPM: update spec files for opensuse TW on OBS

3 files changed, 28 insertions, 12 deletions

diff --git a/redhat/main/tdebase/tdebase-14.0.0.spec b/redhat/main/tdebase/tdebase-14.0.0.spec
index a8ec98222..36a25eea4 100644
--- a/redhat/main/tdebase/tdebase-14.0.0.spec
+++ b/redhat/main/tdebase/tdebase-14.0.0.spec
@@ -1403,6 +1403,9 @@ 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
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index 099ccc187..28717c158 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -46,6 +46,11 @@
 # Avoids relinking, which breaks consolehelper
 %define dont_relink 1
 
+%if "%{?tde_version}" == "14.0.4"
+%define with_aim 1
+%else
+%define with_aim 0
+%endif
 
 Name:			trinity-%{tde_pkg}
 Summary:		Trinity Desktop Environment - Network Applications
@@ -629,13 +634,8 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz
 %{tde_datadir}/icons/crystalsvg/*/actions/newmessage.mng
 %{tde_datadir}/icons/hicolor/*/actions/newmessage.mng
-%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
 %{tde_datadir}/icons/crystalsvg/*/apps/icq_protocol.png
 %{tde_datadir}/icons/crystalsvg/*/apps/irc_protocol.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
-%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
 %{tde_datadir}/icons/crystalsvg/*/actions/icq_away.png
 %{tde_datadir}/icons/crystalsvg/*/actions/icq_connecting.mng
 %{tde_datadir}/icons/crystalsvg/*/actions/icq_dnd.png
@@ -653,10 +653,6 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/icons/crystalsvg/*/actions/irc_op.png
 %{tde_datadir}/icons/crystalsvg/*/actions/irc_server.png
 %{tde_datadir}/icons/crystalsvg/*/actions/irc_voice.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
-%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
-%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
 %{tde_datadir}/icons/hicolor/*/actions/icq_away.png
 %{tde_datadir}/icons/hicolor/*/actions/icq_connecting.mng
 %{tde_datadir}/icons/hicolor/*/actions/icq_dnd.png
@@ -666,11 +662,9 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/icons/hicolor/*/actions/icq_occupied.png
 %{tde_datadir}/icons/hicolor/*/actions/icq_offline.png
 %{tde_datadir}/icons/hicolor/*/actions/icq_online.png
-%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
 %{tde_datadir}/icons/hicolor/*/apps/icq_protocol.png
 %{tde_datadir}/mimelnk/application/x-icq.desktop
 %{tde_datadir}/mimelnk/application/x-kopete-emoticons.desktop
-%{tde_datadir}/services/aim.protocol
 %{tde_datadir}/services/chatwindow.desktop
 %{tde_datadir}/services/emailwindow.desktop
 %{tde_datadir}/services/jabberdisco.protocol
@@ -690,7 +684,20 @@ Support for more IM protocols can be added through a plugin system.
 %{tde_datadir}/config.kcfg/motionawayconfig.kcfg
 # smpp plugin for kopete
 %{tde_datadir}/config.kcfg/smpppdcs.kcfg
-
+# aim support is deprecated in TDE 14.1.0
+%if 0%{?with_aim}
+%{tde_datadir}/icons/crystalsvg/*/apps/aim_protocol.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_away.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_offline.png
+%{tde_datadir}/icons/crystalsvg/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_away.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_connecting.mng
+%{tde_datadir}/icons/hicolor/*/actions/aim_offline.png
+%{tde_datadir}/icons/hicolor/*/actions/aim_online.png
+%{tde_datadir}/icons/hicolor/*/apps/aim_protocol.png
+%{tde_datadir}/services/aim.protocol
+%endif
 
 ##########
 
@@ -777,6 +784,9 @@ track of the time spent online for you.
 %{tde_datadir}/apps/kppp/
 %{tde_datadir}/icons/hicolor/*/apps/kppp.png
 %{tde_tdedocdir}/HTML/en/kppp/
+%if 0%{?suse_version} >= 1500
+%dir %{_sysconfdir}/ppp
+%endif
 %dir %{_sysconfdir}/ppp/peers
 %{_sysconfdir}/ppp/peers/kppp-options
 
@@ -887,6 +897,7 @@ Summary:		Talk daemon for Trinity
 Group:			Applications/Internet
 Requires:		trinity-kcontrol >= %{tde_version}
 Requires:		trinity-tdebase-data >= %{tde_version}
+Requires:		xinetd
 
 %description -n trinity-ktalkd
 KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -904,6 +915,7 @@ and shouldn't be run on a multi-user machine.
 %{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
 %{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
 %{tde_datadir}/sounds/ktalkd.wav
+%dir %{_sysconfdir}/xinetd.d
 %config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
 %{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
 %{tde_tdedocdir}/HTML/en/ktalkd
diff --git a/redhat/main/tdeutils/tdeutils-14.0.0.spec b/redhat/main/tdeutils/tdeutils-14.0.0.spec
index 28464b8b3..51ba2ca49 100644
--- a/redhat/main/tdeutils/tdeutils-14.0.0.spec
+++ b/redhat/main/tdeutils/tdeutils-14.0.0.spec
@@ -61,6 +61,7 @@ Source0:	%{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
 Source1:	klaptop_acpi_helper.pam
 Source2:	klaptop_acpi_helper.console
 Source3:	kcmlaptoprc
+Source4:	%{name}-rpmlintrc
 
 Obsoletes:	trinity-kdeutils < %{version}-%{release}
 Provides:	trinity-kdeutils = %{version}-%{release}