summaryrefslogtreecommitdiffstats
path: root/redhat/main/tdenetwork
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/main/tdenetwork')
-rw-r--r--redhat/main/tdenetwork/tdenetwork-14.0.0.spec257
-rw-r--r--redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec325
-rw-r--r--redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc2
3 files changed, 285 insertions, 299 deletions
diff --git a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
index b73791a00..28717c158 100644
--- a/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
+++ b/redhat/main/tdenetwork/tdenetwork-14.0.0.spec
@@ -1,5 +1,9 @@
+%if 0%{?fedora} >= 23
+%define _hardened_ldflags %nil
+%endif
+
#
-# spec file for package tdenetwork (version R14.0.0)
+# spec file for package tdenetwork (version R14)
#
# Copyright (c) 2014 Trinity Desktop Environment
#
@@ -12,7 +16,7 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
#
-# Please submit bugfixes or comments via http:/www.trinitydesktop.org/
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
#
# BUILD WARNING:
@@ -21,10 +25,13 @@
# TDE variables
%define tde_epoch 2
+%if "%{?tde_version}" == ""
%define tde_version 14.0.0
+%endif
%define tde_pkg tdenetwork
%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
+%define tde_confdir %{_sysconfdir}/trinity
%define tde_datadir %{tde_prefix}/share
%define tde_docdir %{tde_datadir}/doc
%define tde_includedir %{tde_prefix}/include
@@ -36,20 +43,20 @@
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
# 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
Group: Applications/Internet
Version: %{tde_version}
-Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
+Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}
URL: http://www.trinitydesktop.org/
%if 0%{?suse_version}
@@ -196,6 +203,9 @@ BuildRequires: libv4l-devel
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}v4l-devel
%endif
+%if 0%{?rhel} == 5
+BuildRequires: kernel-headers
+%endif
# XML support
BuildRequires: libxml2-devel
@@ -215,17 +225,15 @@ BuildRequires: speex-devel
#{?fedora:Requires(hint): qca-tls}
Requires: jasper
+# ACL support
+BuildRequires: libacl-devel
+
# MEANWHILE support
%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version}
%define with_meanwhile 1
BuildRequires: meanwhile-devel
%endif
-# ORTP support
-#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
-#BuildRequires: ortp-devel
-#endif
-
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
%define with_speex 1
@@ -315,12 +323,6 @@ DCOP is the TDE interprocess communication protocol.
%{tde_bindir}/rssservice
%{tde_datadir}/services/rssservice.desktop
-%post -n trinity-dcoprss
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-dcoprss
-update-desktop-database 2> /dev/null || :
-
##########
%package devel
@@ -356,12 +358,6 @@ development-related files for the TDE network module.
%{tde_libdir}/librss.la
%{tde_libdir}/librss.so
-%post devel
-/sbin/ldconfig
-
-%postun devel
-/sbin/ldconfig
-
##########
%package filesharing
@@ -392,18 +388,6 @@ NFS and Samba.
%{tde_tdedocdir}/HTML/en/kcontrol/fileshare/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmsambaconf/
-%post filesharing
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun filesharing
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kdict
@@ -429,18 +413,6 @@ basic as well as advanced queries.
%{tde_datadir}/icons/hicolor/*/apps/kdict.*
%{tde_tdedocdir}/HTML/en/kdict
-%post -n trinity-kdict
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kdict
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package tdefile-plugins
@@ -463,12 +435,6 @@ dialog in konqueror and other file-handling applications.
%{tde_tdelibdir}/tdefile_torrent.so
%{tde_datadir}/services/tdefile_torrent.desktop
-%post tdefile-plugins
-update-desktop-database 2> /dev/null || :
-
-%postun tdefile-plugins
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kget
@@ -506,18 +472,6 @@ applications and Netscape.
%{tde_datadir}/sounds/KGet_Started.ogg
%{tde_tdedocdir}/HTML/en/kget
-%post -n trinity-kget
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kget
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-knewsticker
@@ -549,18 +503,6 @@ good news sources which provide such files.
%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
%{tde_tdedocdir}/HTML/en/knewsticker
-%post -n trinity-knewsticker
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-knewsticker
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kopete
@@ -692,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
@@ -716,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
@@ -729,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
@@ -753,21 +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
-
-
-%post -n trinity-kopete
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
-%postun -n trinity-kopete
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
+# 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
##########
@@ -812,18 +742,6 @@ designed to be used for sharing files with friends.
%{tde_datadir}/services/kpfpropertiesdialogplugin.desktop
%{tde_tdedocdir}/HTML/en/kpf
-%post -n trinity-kpf
-for f in crystalsvg ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kpf
-for f in crystalsvg ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kppp
@@ -866,6 +784,11 @@ 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
%if 0%{?with_consolehelper}
%config(noreplace) /etc/security/console.apps/kppp3
@@ -876,21 +799,11 @@ track of the time spent online for you.
%endif
%post -n trinity-kppp
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
%if 0%{?suse_version}
# Sets permissions on setuid files (openSUSE specific)
%set_permissions %{tde_bindir}/kppp
%endif
-%postun -n trinity-kppp
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-krdc
@@ -917,18 +830,6 @@ Servers using RDP.
%{tde_tdedocdir}/HTML/en/tdeioslave/rdp/
%{tde_tdedocdir}/HTML/en/tdeioslave/vnc/
-%post -n trinity-krdc
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-krdc
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-krfb
@@ -964,18 +865,6 @@ task.
%{tde_datadir}/servicetypes/kinetdmodule.desktop
%{tde_tdedocdir}/HTML/en/krfb/
-%post -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-krfb
-for f in crystalsvg hicolor locolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-ksirc
@@ -997,25 +886,10 @@ recommended package libio-socket-ssl-perl.
%{tde_tdelibdir}/ksirc.*
%{tde_tdeappdir}/ksirc.desktop
%{tde_datadir}/apps/ksirc/
-%config(noreplace) %{tde_datadir}/config/ksircrc
+%config(noreplace) %{tde_confdir}/ksircrc
%{tde_datadir}/icons/hicolor/*/apps/ksirc.*
%{tde_tdedocdir}/HTML/??/ksirc/
-%post -n trinity-ksirc
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
-
-%postun -n trinity-ksirc
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-/sbin/ldconfig
-
##########
%package -n trinity-ktalkd
@@ -1023,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
@@ -1036,26 +911,15 @@ and shouldn't be run on a multi-user machine.
%{tde_bindir}/mail.local
%{tde_tdelibdir}/kcm_ktalkd.*
%{tde_tdeappdir}/kcmktalkd.desktop
-%config(noreplace) %{tde_datadir}/config/ktalkdrc
+%config(noreplace) %{tde_confdir}/ktalkdrc
%{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
-%post -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-ktalkd
-for f in crystalsvg hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
##########
%if "%{?_with_wifi:1}" == "1"
@@ -1084,18 +948,6 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
%{tde_tdedocdir}/HTML/en/kwifimanager/
%{tde_tdedocdir}/HTML/en/kcontrol/kcmwifi/
-
-%post -n trinity-kwifimanager
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kwifimanager
-for f in hicolor ; do
- gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
-done
-update-desktop-database 2> /dev/null || :
%endif
##########
@@ -1114,12 +966,6 @@ automatically when needed.
%{tde_libdir}/librss.so.*
%{tde_datadir}/cmake/librss.cmake
-%post -n trinity-librss
-/sbin/ldconfig
-
-%postun -n trinity-librss
-/sbin/ldconfig
-
##########
%package -n trinity-lisa
@@ -1152,12 +998,6 @@ but relying only on the TCP/IP protocol.
%{tde_bindir}/lisa
%{tde_bindir}/reslisa
-%post -n trinity-lisa
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-lisa
-update-desktop-database 2> /dev/null || :
-
##########
%package -n trinity-kdnssd
@@ -1186,12 +1026,6 @@ A tdeioslave and tded module that provide Zeroconf support. Try
%{tde_tdelibdir}/kded_dnssdwatcher.so
%{tde_tdelibdir}/kded_dnssdwatcher.la
-%post -n trinity-kdnssd
-update-desktop-database 2> /dev/null || :
-
-%postun -n trinity-kdnssd
-update-desktop-database 2> /dev/null || :
-
##########
%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
@@ -1238,6 +1072,7 @@ fi
-DWITH_GCC_VISIBILITY=OFF \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
+ -DCONFIG_INSTALL_DIR="%{tde_confdir}" \
-DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \
-DLIB_INSTALL_DIR=%{tde_libdir} \
-DSHARE_INSTALL_PREFIX=%{tde_datadir} \
@@ -1350,5 +1185,3 @@ done
%changelog
-* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 14.0.0-1
-- Initial release for TDE 14.0.0
diff --git a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
index 35dcfa815..aeebf5048 100644
--- a/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
+++ b/redhat/main/tdenetwork/tdenetwork-3.5.13.2.spec
@@ -1,63 +1,99 @@
-# Avoids relinking, which breaks consolehelper
-%define dont_relink 1
-
-# If TDE is built iwn a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
-%if "%{?tde_prefix}" != "/usr"
-%define _variant .opt
-%endif
-
+#
+# spec file for package tdenetwork (version 3.5.13-SRU)
+#
+# Copyright (c) 2014 Trinity Desktop Environment
+#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+#
+# Please submit bugfixes or comments via http://www.trinitydesktop.org/
+#
+
+# BUILD WARNING:
+# Remove qt-devel and qt3-devel and any kde*-devel on your system !
+# Having KDE libraries may cause FTBFS here !
+
+# TDE variables
+%define tde_epoch 1
%define tde_version 3.5.13.2
-
-# TDE specific building variables
+%define tde_pkg tdenetwork
+%define tde_prefix /opt/trinity
%define tde_bindir %{tde_prefix}/bin
%define tde_datadir %{tde_prefix}/share
%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_sbindir %{tde_prefix}/sbin
-
%define tde_tdeappdir %{tde_datadir}/applications/kde
%define tde_tdedocdir %{tde_docdir}/tde
%define tde_tdeincludedir %{tde_includedir}/tde
%define tde_tdelibdir %{tde_libdir}/trinity
-%define _docdir %{tde_docdir}
+# Avoids relinking, which breaks consolehelper
+%define dont_relink 1
-# Fedora review: http://bugzilla.redhat.com/195486
+Name: trinity-%{tde_pkg}
+Summary: Trinity Desktop Environment - Network Applications
+Group: Applications/Internet
+Version: %{tde_version}
+Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}
+URL: http://www.trinitydesktop.org/
-## Conditional build:
-# RHEL6: xmms is outdated !
-#define _with_xmms --with-xmms
-%ifnarch s390 s390x
-%define _with_wifi --with-wifi
+%if 0%{?suse_version}
+License: GPL-2.0+
+%else
+License: GPLv2+
%endif
-Name: trinity-tdenetwork
-Version: %{tde_version}
-Release: %{?!preversion:3}%{?preversion:2_%{preversion}}%{?dist}%{?_variant}
-Summary: Trinity Desktop Environment - Network Applications
-
-Vendor: Trinity Project
-Packager: Francois Andriot <francois.andriot@free.fr>
-URL: http://www.trinitydesktop.org/
-
-License: GPLv2
-Group: Applications/Internet
+#Vendor: Trinity Desktop
+#Packager: Francois Andriot <francois.andriot@free.fr>
-Prefix: %{tde_prefix}
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Prefix: %{tde_prefix}
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz
Source1: kppp.pamd
Source2: ktalk
+%{?tde_patch:Patch1: %{tde_pkg}-%{tde_version}.patch}
+
+BuildRequires: trinity-tdelibs-devel >= %{tde_version}
+BuildRequires: trinity-tdebase-devel >= %{tde_version}
+
BuildRequires: cmake >= 2.8
BuildRequires: gettext
-BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires: trinity-tdelibs-devel >= %{tde_version}
BuildRequires: coreutils
+BuildRequires: gcc-c++
+BuildRequires: desktop-file-utils
+BuildRequires: fdupes
+
+# SUSE desktop files utility
+%if 0%{?suse_version}
+BuildRequires: update-desktop-files
+%endif
+
+%if 0%{?opensuse_bs} && 0%{?suse_version}
+# for xdg-menu script
+BuildRequires: brp-check-trinity
+%endif
+
+# for set_permissions macro
+%if 0%{?suse_version}
+PreReq: permissions
+%endif
+
+# OPENSSL support
BuildRequires: openssl-devel
+
+# TLS support
BuildRequires: gnutls-devel
# SQLITE support
@@ -73,6 +109,16 @@ BuildRequires: sqlite-devel
BuildRequires: libgadu-devel
%endif
+# PCRE support
+BuildRequires: pcre-devel
+
+# GAMIN support
+# Not on openSUSE.
+%if 0%{?rhel} || 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion}
+%define with_gamin 1
+BuildRequires: gamin-devel
+%endif
+
# XTST support
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 || 0%{?suse_version} >= 1210
BuildRequires: libXtst-devel
@@ -81,13 +127,34 @@ BuildRequires: libXtst-devel
BuildRequires: libxtst-devel
%endif
+# XMU support
+%if 0%{?suse_version} == 1140
+BuildRequires: xorg-x11-libXmu-devel
+%endif
+%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} >= 1210
+BuildRequires: libXmu-devel
+%endif
+%if 0%{?mdkversion} || 0%{?mgaversion} >= 4
+BuildRequires: libxmu-devel
+%endif
+%if 0%{?mgaversion} == 2 || 0%{?mgaversion} == 3
+BuildRequires: %{_lib}xmu%{?mgaversion:6}-devel
+%endif
+
# Other stuff
%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5
-BuildRequires: libXmu-devel
BuildRequires: libXScrnSaver-devel
BuildRequires: libXxf86vm-devel
%endif
+# Fedora review: http://bugzilla.redhat.com/195486
+
+## Conditional build:
+# RHEL6: xmms is outdated !
+#define _with_xmms --with-xmms
+%ifnarch s390 s390x
+%define _with_wifi --with-wifi
+%endif
# Wifi support
%if "%{?_with_wifi:1}" == "1"
@@ -97,7 +164,7 @@ BuildRequires: wireless-tools-devel
%if 0%{?mgaversion} == 2 || 0%{?mdkversion}
BuildRequires: %{_lib}iw29-devel
%endif
-%if 0%{?rhel} == 5
+%if 0%{?rhel} == 5 || 0%{?suse_version}
BuildRequires: wireless-tools
%endif
%if 0%{?suse_version} || 0%{?mgaversion} >= 3
@@ -112,7 +179,7 @@ BuildRequires: openslp-devel
%endif
%ifarch %{ix86}
-# BR: %{tde_includedir}/valgrind/valgrind.h
+# BR: /usr/include/valgrind/valgrind.h
BuildRequires: valgrind
%endif
@@ -151,9 +218,9 @@ BuildRequires: meanwhile-devel
%endif
# ORTP support
-#%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15
+#if 0%{?rhel} >= 6 || 0#{?fedora} >= 15
#BuildRequires: ortp-devel
-#%endif
+#endif
# SPEEX support
%if 0%{?rhel} >= 5 || 0%{?fedora} >= 15 || 0%{?suse_version} || 0%{?mdkversion} || 0%{?mgaversion}
@@ -181,7 +248,7 @@ Provides: tdenetwork = %{version}-%{release}
Requires: trinity-dcoprss = %{version}-%{release}
Requires: %{name}-filesharing = %{version}-%{release}
Requires: trinity-kdict = %{version}-%{release}
-Requires: %{name}-kfile-plugins = %{version}-%{release}
+Requires: %{name}-tdefile-plugins = %{version}-%{release}
Requires: trinity-kget = %{version}-%{release}
Requires: trinity-knewsticker = %{version}-%{release}
Requires: trinity-kopete = %{version}-%{release}
@@ -204,7 +271,7 @@ Networking applications, including:
* dcoprss: RSS utilities for Trinity
* filesharing: Network filesharing configuration module for Trinity
* kdict: Dictionary client for Trinity
-* kfile-plugins: Torrent metainfo plugin for Trinity
+* tdefile-plugins: Torrent metainfo plugin for Trinity
* kget: downloader manager
* knewsticker: RDF newsticker applet
* kopete: chat client
@@ -268,17 +335,14 @@ Obsoletes: tdenetwork-devel < %{version}-%{release}
Provides: tdenetwork-devel = %{version}-%{release}
%description devel
-This is the development package which contains the headers for the KDE RSS
+This is the development package which contains the headers for the TDE RSS
library as well as the Kopete chat client, as well as miscellaneous
development-related files for the TDE network module.
%files devel
%defattr(-,root,root,-)
-%{tde_tdeincludedir}/kopete/*.h
-%{tde_tdeincludedir}/kopete/ui/*.h
-%{tde_tdeincludedir}/rss/*.h
-%{tde_libdir}/libkdeinit_kdict.la
-%{tde_libdir}/libkdeinit_ksirc.la
+%{tde_tdeincludedir}/kopete/
+%{tde_tdeincludedir}/rss/
%{tde_libdir}/libkopete.la
%{tde_libdir}/libkopete.so
%{tde_libdir}/libkopete_msn_shared.la
@@ -320,6 +384,7 @@ NFS and Samba.
%{tde_tdelibdir}/kcm_kcmsambaconf.so
%{tde_tdeappdir}/fileshare.desktop
%{tde_tdeappdir}/kcmsambaconf.desktop
+%{tde_datadir}/icons/hicolor/*/apps/kcmfileshare.png
%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png
%{tde_datadir}/services/fileshare_propsdlgplugin.desktop
@@ -340,6 +405,7 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-kdict
Summary: Dictionary client for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kdict
KDict is an advanced TDE graphical client for the DICT Protocol, with full
@@ -373,35 +439,39 @@ update-desktop-database 2> /dev/null || :
##########
-%package kfile-plugins
+%package tdefile-plugins
Summary: Torrent metainfo plugin for Trinity
Group: Applications/Internet
Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release}
Provides: tdenetwork-kfile-plugins = %{version}-%{release}
+Obsoletes: trinity-tdenetwork-kfile-plugins < %{version}-%{release}
+Provides: trinity-tdenetwork-kfile-plugins = %{version}-%{release}
-%description kfile-plugins
+%description tdefile-plugins
This package provides a metainformation plugin for bittorrent files.
-TDE uses kfile-plugins to provide metainfo tab in the files properties
+TDE uses tdefile-plugins to provide metainfo tab in the files properties
dialog in konqueror and other file-handling applications.
-%files kfile-plugins
+%files tdefile-plugins
%defattr(-,root,root,-)
%{tde_tdelibdir}/kfile_torrent.la
%{tde_tdelibdir}/kfile_torrent.so
%{tde_datadir}/services/kfile_torrent.desktop
-%post kfile-plugins
+%post tdefile-plugins
update-desktop-database 2> /dev/null || :
-%postun kfile-plugins
+%postun tdefile-plugins
update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kget
-Summary: download manager for Trinity
+Summary: Download manager for Trinity
Group: Applications/Internet
+Requires: trinity-tdebase-data >= %{tde_version}
+Requires: trinity-konqueror >= %{tde_version}
%description -n trinity-kget
KGet is a a download manager similar to GetRight or Go!zilla. It keeps
@@ -424,6 +494,7 @@ applications and Netscape.
%{tde_datadir}/icons/crystalsvg/*/actions/khtml_kget.png
%{tde_datadir}/icons/crystalsvg/*/apps/kget.png
%{tde_datadir}/icons/crystalsvg/*/mimetypes/kget_list.png
+%{tde_datadir}/icons/hicolor/*/apps/kget.png
%{tde_datadir}/mimelnk/application/x-kgetlist.desktop
%{tde_datadir}/sounds/KGet_Added.ogg
%{tde_datadir}/sounds/KGet_Finished.ogg
@@ -432,13 +503,13 @@ applications and Netscape.
%{tde_tdedocdir}/HTML/en/kget
%post -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-kget
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -446,8 +517,9 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-knewsticker
-Summary: news ticker applet for Trinity
+Summary: News ticker applet for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-knewsticker
This is a news ticker applet for the Trinity panel. It can scroll news from
@@ -468,7 +540,7 @@ good news sources which provide such files.
%{tde_datadir}/apps/kconf_update/knewsticker.upd
%{tde_datadir}/apps/kconf_update/knt-0.1-0.2.pl
%{tde_datadir}/apps/kicker/applets/knewsticker.desktop
-%{tde_datadir}/apps/knewsticker/eventsrc
+%{tde_datadir}/apps/knewsticker/
%{tde_datadir}/icons/hicolor/*/apps/knewsticker.png
%{tde_datadir}/services/kntsrcfilepropsdlg.desktop
%{tde_tdedocdir}/HTML/en/knewsticker
@@ -488,13 +560,15 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kopete
-Summary: instant messenger for Trinity
+Summary: Instant messenger for Trinity
Group: Applications/Internet
-URL: http://kopete.kde.org
+Requires: trinity-tdebase-bin >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
+Requires: trinity-filesystem >= %{tde_version}
%description -n trinity-kopete
Kopete is an instant messenger program which can communicate with a variety
-of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber.
+of IM systems, such as Yahoo, ICQ, IRC and Jabber.
Support for more IM protocols can be added through a plugin system.
@@ -527,9 +601,9 @@ Support for more IM protocols can be added through a plugin system.
%{tde_libdir}/libkopete_videodevice.so.*
%{tde_tdeappdir}/kopete.desktop
%{tde_datadir}/apps/kconf_update/kopete-*
-%{tde_datadir}/apps/kopete
-%{tde_datadir}/apps/kopete_*/*.rc
-%{tde_datadir}/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+%{tde_datadir}/apps/kopete/
+%{tde_datadir}/apps/kopete_*/
+%{tde_datadir}/apps/kopeterichtexteditpart/
%{tde_datadir}/config.kcfg/historyconfig.kcfg
%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg
%{tde_datadir}/config.kcfg/kopete.kcfg
@@ -656,8 +730,10 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kopete-nowlistening
-Summary: Nowlistening (xmms) plugin for Kopete.
+Summary: Nowlistening (xmms) plugin for Kopete
Group: Applications/Internet
+Requires: trinity-kopete = %{tde_version}-%{tde_release}
+Requires: trinity-filesystem >= %{tde_version}
%description -n trinity-kopete-nowlistening
Kopete includes the "Now Listening" plug-in that can report what music you
@@ -678,6 +754,7 @@ noatun, kscd, juk, kaffeine and amarok.
%package -n trinity-kpf
Summary: Public fileserver for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kpf
kpf provides simple file sharing using HTTP. kpf is strictly a public
@@ -708,7 +785,7 @@ update-desktop-database 2> /dev/null || :
##########
%package -n trinity-kppp
-Summary: modem dialer and ppp frontend for Trinity
+Summary: Modem dialer and ppp frontend for Trinity
Group: Applications/Internet
Requires: ppp
@@ -733,7 +810,14 @@ track of the time spent online for you.
%files -n trinity-kppp
%defattr(-,root,root,-)
-%{?!with_consolehelper:%{tde_bindir}/kppp}
+%if 0%{?with_consolehelper} == 0
+# Some setuid binaries need special care
+%if 0%{?suse_version}
+%verify(not mode) %{tde_bindir}/kppp
+%else
+%attr(4711,root,root) %{tde_bindir}/kppp
+%endif
+%endif
%{tde_bindir}/kppplogview
%{tde_tdeappdir}/Kppp.desktop
%{tde_tdeappdir}/kppplogview.desktop
@@ -754,6 +838,10 @@ for f in hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
+%if 0%{?suse_version}
+# Sets permissions on setuid files (openSUSE specific)
+%set_permissions %{tde_bindir}/kppp
+%endif
%postun -n trinity-kppp
for f in hicolor ; do
@@ -780,18 +868,19 @@ Servers using RDP.
%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop
%{tde_datadir}/apps/krdc/
%{tde_datadir}/icons/crystalsvg/*/apps/krdc.png
+%{tde_datadir}/icons/hicolor/*/apps/krdc.png
%{tde_datadir}/services/rdp.protocol
%{tde_datadir}/services/vnc.protocol
%{tde_tdedocdir}/HTML/en/krdc/
%post -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-krdc
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -820,9 +909,10 @@ task.
%{tde_tdelibdir}/kded_kinetd.so
%{tde_tdeappdir}/kcmkrfb.desktop
%{tde_tdeappdir}/krfb.desktop
-%{tde_datadir}/apps/kinetd/eventsrc
+%{tde_datadir}/apps/kinetd/
%{tde_datadir}/apps/krfb
%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png
+%{tde_datadir}/icons/hicolor/*/apps/krfb.png
%{tde_datadir}/icons/locolor/*/apps/krfb.png
%{tde_datadir}/services/kded/kinetd.desktop
%{tde_datadir}/services/kinetd_krfb.desktop
@@ -831,13 +921,13 @@ task.
%{tde_tdedocdir}/HTML/en/krfb/
%post -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-krfb
-for f in crystalsvg locolor ; do
+for f in crystalsvg hicolor locolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -849,7 +939,7 @@ Summary: IRC client for Trinity
Group: Applications/Internet
%description -n trinity-ksirc
-KSirc is an IRC chat client for KDE. It supports scripting with Perl and has a
+KSirc is an IRC chat client for TDE. It supports scripting with Perl and has a
lot of compatibility with mIRC for general use.
If you want to connect to an IRC server via SSL, you will need to install the
@@ -887,6 +977,8 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-ktalkd
Summary: Talk daemon for Trinity
Group: Applications/Internet
+Requires: trinity-kcontrol >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
%description -n trinity-ktalkd
KTalkd is an enhanced talk daemon - a program to handle incoming talk
@@ -901,20 +993,21 @@ and shouldn't be run on a multi-user machine.
%{tde_tdelibdir}/kcm_ktalkd.*
%{tde_tdeappdir}/kcmktalkd.desktop
%config(noreplace) %{tde_datadir}/config/ktalkdrc
-%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.*
+%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.png
+%{tde_datadir}/icons/hicolor/*/apps/ktalkd.png
%{tde_datadir}/sounds/ktalkd.wav
%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk
%{tde_tdedocdir}/HTML/en/kcontrol/kcmtalkd
%{tde_tdedocdir}/HTML/en/ktalkd
%post -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
%postun -n trinity-ktalkd
-for f in crystalsvg ; do
+for f in crystalsvg hicolor ; do
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
update-desktop-database 2> /dev/null || :
@@ -925,6 +1018,7 @@ update-desktop-database 2> /dev/null || :
%package -n trinity-kwifimanager
Summary: Wireless lan manager for Trinity
Group: Applications/Internet
+Requires: trinity-kicker >= %{tde_version}
%description -n trinity-kwifimanager
KWiFiManager suite is a set of tools which allows you to manage your
@@ -944,7 +1038,7 @@ wavelan card that uses the wireless extensions interface.
%{tde_datadir}/apps/kwifimanager
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png
%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz
-%doc %{tde_tdedocdir}/HTML/en/kwifimanager
+%{tde_tdedocdir}/HTML/en/kwifimanager/
%post -n trinity-kwifimanager
for f in hicolor ; do
@@ -986,6 +1080,8 @@ automatically when needed.
%package -n trinity-lisa
Summary: LAN information server for Trinity
Group: Applications/Internet
+Requires: trinity-konqueror >= %{tde_version}
+Requires: trinity-tdebase-data >= %{tde_version}
%description -n trinity-lisa
LISa is intended to provide TDE with a kind of "network neighborhood"
@@ -1002,7 +1098,7 @@ but relying only on the TCP/IP protocol.
%{tde_datadir}/applnk/.hidden/kcmreslisa.desktop
%{tde_datadir}/apps/konqsidebartng/virtual_folders/services/lisa.desktop
%{tde_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{tde_datadir}/apps/lisa/README
+%{tde_datadir}/apps/lisa/
%{tde_datadir}/apps/remoteview/lan.desktop
%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/
%{tde_tdedocdir}/HTML/en/lisa/
@@ -1024,7 +1120,7 @@ Summary: Zeroconf support for TDE
Group: Applications/Internet
%description -n trinity-kdnssd
-A kioslave and kded module that provide Zeroconf support. Try
+A tdeioslave and tded module that provide Zeroconf support. Try
"zeroconf:/" in Konqueror.
%files -n trinity-kdnssd
@@ -1053,7 +1149,7 @@ update-desktop-database 2> /dev/null || :
##########
-%if 0%{?suse_version} || 0%{?pclinuxos}
+%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0
%debug_package
%endif
@@ -1061,6 +1157,15 @@ update-desktop-database 2> /dev/null || :
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
+%{?tde_patch:%patch1 -p1}
+
+# Workaround libiw detection failure on opensuse
+%if 0%{?suse_version}
+%__sed -i "wifi/ConfigureChecks.cmake" -e "s|^check_library_exists.*|set( HAVE_IW 1 )|"
+%endif
+
+# Update icons for some control center modules
+%__sed -i "filesharing/simple/fileshare.desktop" -e "s|^Icon=.*|Icon=kcmfileshare|"
%build
@@ -1085,6 +1190,7 @@ fi
-DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
-DCMAKE_SKIP_RPATH=OFF \
-DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+ -DCMAKE_NO_BUILTIN_CHRPATH=ON \
-DCMAKE_VERBOSE_MAKEFILE=ON \
\
-DBIN_INSTALL_DIR=%{tde_bindir} \
@@ -1115,6 +1221,17 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} -C build
+# Adds missing icons in 'hicolor' theme
+# These icons are copied from 'crystalsvg' theme, provided by 'tdelibs'.
+%__mkdir_p %{buildroot}%{tde_datadir}/icons/hicolor/{16x16,22x22,32x32,48x48,64x64,128x128}/apps/
+pushd %{buildroot}%{tde_datadir}/icons
+for i in {16,22,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/kget.png hicolor/"$i"x"$i"/apps/kget.png ;done
+for i in {32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krdc.png hicolor/"$i"x"$i"/apps/krdc.png ;done
+for i in {16,32,48}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/krfb.png hicolor/"$i"x"$i"/apps/krfb.png ;done
+for i in {16,22,32,48,128}; do %__cp %{?buildroot}%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/apps/ktalkd.png hicolor/"$i"x"$i"/apps/ktalkd.png ;done
+for i in {16,22,32,48,64,128}; do %__cp $BUILD_ROOT%{tde_datadir}/icons/crystalsvg/"$i"x"$i"/actions/share.png hicolor/"$i"x"$i"/apps/kcmfileshare.png ;done
+popd
+
%if 0%{?with_consolehelper}
# Run kppp through consolehelper, and rename it to 'kppp3'
%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3
@@ -1130,28 +1247,62 @@ USER=root
PROGRAM=%{tde_sbindir}/kppp3
SESSION=true
EOF
+
# Renames 'kppp' as 'kppp3' in launch icon
%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|"
%endif
+# Remove setuid bit on some binaries.
+if [ -r "%{?buildroot}%{tde_bindir}/kppp" ]; then
+ chmod 0755 "%{?buildroot}%{tde_bindir}/kppp"
+fi
+
# ktalk
%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk
# Avoids conflict with trinity-kvirc
%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/
+# Icons from TDE Control Center should only be displayed in TDE
+for i in %{?buildroot}%{tde_tdeappdir}/*.desktop ; do
+ if grep -q "^Categories=.*X-KDE-settings" "${i}"; then
+ if ! grep -q "OnlyShowIn=KDE" "${i}" ; then
+ echo "OnlyShowIn=KDE;" >>"${i}"
+ fi
+ fi
+done
+
+# Updates applications categories for openSUSE
+%if 0%{?suse_version}
+%suse_update_desktop_file kcmkrfb
+%suse_update_desktop_file fileshare
+%suse_update_desktop_file kopete Network InstantMessaging
+%suse_update_desktop_file ksirc Network IRCClient
+%suse_update_desktop_file Kppp Network Dialup
+%suse_update_desktop_file -r kppplogview System Monitor
+%suse_update_desktop_file kdict Office Dictionary
+%suse_update_desktop_file -r krdc System RemoteAccess
+%suse_update_desktop_file -r krfb System RemoteAccess
+%suse_update_desktop_file -r kget System TrayIcon
+%suse_update_desktop_file -r kwifimanager System Network
+%suse_update_desktop_file kcmwifi
+%suse_update_desktop_file -u knewsticker-standalone Network News
+%suse_update_desktop_file %{buildroot}%{tde_datadir}/apps/remoteview/zeroconf.desktop
+%endif
+
+# Links duplicate files
+%fdupes "%{?buildroot}%{tde_datadir}"
+
%clean
%__rm -rf %{buildroot}
-%changelog
-* Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-3
-- Build for Fedora 19
+%if 0%{?suse_version}
+# Check permissions on setuid files (openSUSE specific)
+%verifyscript
+%verify_permissions -e %{tde_bindir}/kppp
+%endif
-* Sun Jul 28 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-2
-- Rebuild with NDEBUG option
-- Disable 'lisa' service
-* Mon Jun 03 2013 Francois Andriot <francois.andriot@free.fr> - 3.5.13.2-1
-- Initial release for TDE 3.5.13.2
+%changelog
diff --git a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
index ad8188f40..8d22f2fc6 100644
--- a/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
+++ b/redhat/main/tdenetwork/trinity-tdenetwork-rpmlintrc
@@ -1 +1,3 @@
setBadness('permissions-file-setuid-bit', 0)
+setBadness('library-without-ldconfig-postun', 0)
+setBadness('library-without-ldconfig-postin', 0)