diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-14 21:30:52 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-14 21:30:52 +0200 |
| commit | 25e81ae17ce0dbb745fb38bf80976a8428a8bfd5 (patch) | |
| tree | 1a52b89b2e80669da688475e3a6f2e0c2ddfaa4e | |
| parent | 6de6c5661d72584cee263f7819e9b897a784ef94 (diff) | |
| download | tde-packaging-25e81ae17ce0dbb745fb38bf80976a8428a8bfd5.tar.gz tde-packaging-25e81ae17ce0dbb745fb38bf80976a8428a8bfd5.zip | |
RPM Packaging: cleanup tdenetwork
31 files changed, 0 insertions, 3836 deletions
diff --git a/redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch b/redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch deleted file mode 100644 index 4f7903d6d..000000000 --- a/redhat/tdenetwork/kdenetwork-3.2.3-resolv.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- kdenetwork-3.2.3/kppp/connect.cpp.orig 2004-07-01 16:03:52.861908057 +0200 -+++ kdenetwork-3.2.3/kppp/connect.cpp 2004-07-01 16:33:35.943692521 +0200 -@@ -1399,9 +1399,13 @@ - - void addpeerdns() { - int fd, fd2; -+ TQString p = "/var/run/ppp/resolv.conf"; -+ -+ if (!TQFile::exists(p)) -+ p = "/etc/ppp/resolv.conf"; - - if((fd = Requester::rq->openResolv(O_WRONLY|O_APPEND)) >= 0) { -- if((fd2 = open("/etc/ppp/resolv.conf", O_RDONLY)) >= 0) { -+ if((fd2 = open(p.latin1(), O_RDONLY)) >= 0) { - char c; - int i = 0; - while(i++ < 100 && read(fd2, &c, 1) == 1) { -@@ -1412,7 +1416,7 @@ - } - close(fd2); - } else -- fprintf(stderr, "failed to read from /etc/ppp/resolv.conf\n"); -+ fprintf(stderr, "failed to read from %s\n", p.latin1()); - close(fd); - } - add_domain(gpppdata.domain()); diff --git a/redhat/tdenetwork/kdenetwork-3.5.12.spec b/redhat/tdenetwork/kdenetwork-3.5.12.spec deleted file mode 100644 index 7ef987e99..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.12.spec +++ /dev/null @@ -1,502 +0,0 @@ -# Default version for this component -%if "%{?version}" == "" -%define version 3.5.12 -%endif -%define release 5 - -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?_prefix}" != "/usr" -%define _variant .opt -%define _docdir %{_prefix}/share/doc -%endif - -# TDE 3.5.12 specific building variables -BuildRequires: autoconf automake libtool m4 -%define tde_docdir %{_docdir} -%define tde_includedir %{_includedir}/kde -%define tde_libdir %{_libdir}/kde3 - - -# Fedora review: http://bugzilla.redhat.com/195486 - -## Conditional build: -# disabled, for now, doesn't build -- Rex -#define _enable_jingle --enable-jingle -%define _enable_sametime_plugin --enable-sametime-plugin -#define _enable_slp --enable-slp -# RHEL6: xmms is outdated ! -#define _with_xmms --with-xmms -%ifnarch s390 s390x -%define _with_wifi --with-wifi -%endif - -%define console_helper 1 - -Name: trinity-kdenetwork -Version: %{?version} -Release: %{?release}%{?dist}%{?_variant} -Summary: K Desktop Environment - Network Applications - -Vendor: Trinity Project -Packager: Francois Andriot <francois.andriot@free.fr> -URL: http://www.trinitydesktop.org/ - -License: GPLv2 -Group: Applications/Internet - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Provides: kdenetwork3 = %{version}-%{release} - -Source0: kdenetwork-%{version}.tar.gz -Source1: kppp.pamd -Source2: ktalk -Source4: lisarc -Source5: lisa.redhat - -# RedHat/Fedora legacy patches -Patch3: kdenetwork-3.5.8-kppp.patch -Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch - -# Trinity official patches, from SVN -# Use libv4l1-videodev.h when available in kdenetwork -Patch7: r1243951.diff - -# Trinity unofficial patches -# Compiling Kopete for Fedora15 ... -Patch8: kdenetwork-kopete-gcc45.patch - -Requires: %{name}-libs = %{version}-%{release} - -BuildRequires: gettext -BuildRequires: trinity-kdelibs-devel -BuildRequires: coreutils -BuildRequires: openssl-devel -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel -%endif -%if "%{?_with_wifi:1}" == "1" -%if 0%{?fedora} > 5 || 0%{?rhel} > 4 -BuildRequires: wireless-tools-devel -%else -BuildRequires: wireless-tools -%endif -%endif -%{?_enable_slp:BuildRequires: openslp-devel} -## kopete: -BuildRequires: libxml2-devel libxslt-devel -%ifarch %{ix86} -# BR: %{_includedir}/valgrind/valgrind.h -BuildRequires: valgrind -%endif -#jabber -BuildRequires: libidn-devel -#jabber/jingle -%{?_enable_jingle:BuildRequires: expat-devel glib2-devel ortp-devel speex-devel} -# jabber/ssl -#{?fedora:Requires(hint): qca-tls} -# sametime -%{?_enable_sametime_plugin:BuildRequires: meanwhile-devel} -%{?_with_xmms:BuildRequires: xmms-devel} -Requires: jasper -## kppp -Requires: ppp -## krdc -Requires: rdesktop -## lisa -Requires(preun): chkconfig -Requires(post): chkconfig -#Requires(hint): samba-client -BuildRequires: avahi-qt3-devel - -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: libv4l-devel -%endif - -%if 0%{?console_helper} -Requires: usermode-gtk -%endif - - -%description -Networking applications, including: -* kget: downloader manager -* kio_lan: lan browsing kio slave -* knewsticker: RDF newsticker applet -* kopete: chat client -* kppp: dialer and front end for pppd -* krdc: a client for Desktop Sharing and other VNC servers -* krfb: Desktop Sharing server, allow others to access your desktop via VNC -* lisa: lan information server - -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Provides: kdenetwork3-devel = %{version}-%{release} -Requires: %{name}-libs = %{version}-%{release} -Requires: trinity-kdelibs-devel -%description devel -%{summary}. - -%package extras -Summary: Extras packages for %{name} -Group: Applications/Internet -Requires: %{name}-libs = %{version}-%{release} -%if "%{?_with_xmms:1}" == "1" -Obsoletes: %{name}-nowlistening < %{version}-%{release} -Provides: %{name}-nowlistening = %{version}-%{release} -%endif -%description extras -More Networking applications for the K Desktop Environment: - * ksirc - * kdict - * ktalkd - * kpf - * kwifimanager -%if "%{?_with_xmms:1}" == "1" - * nowlistening (xmms) plugin for Kopete. -%endif - -%package libs -Summary: %{name} runtime libraries -Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} -# helps multilib upgrades -Obsoletes: %{name} < %{version}-%{release} -# include to be paranoid, installing libs-only is still mostly untested -- Rex -Requires: %{name} = %{version}-%{release} -%description libs -%{summary}. - - -%prep -%setup -q -n kdenetwork - -%if %{console_helper} -%patch3 -p1 -b .kppp -%endif -%patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd -%patch7 -p1 -%patch8 -p1 - -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" -%__make -f "admin/Makefile.common" - - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{_bindir}:${PATH}" -export LDFLAGS="-L%{_libdir} -I%{_includedir}" - -%configure \ - --enable-new-ldflags \ - --disable-dependency-tracking \ - --disable-rpath \ - --disable-debug \ - --disable-warnings \ - --enable-final \ - --includedir=%{tde_includedir} \ - %{?_enable_jingle} %{!?_enable_jingle:--disable-jingle} \ - %{?_enable_sametime_plugin} %{!?_enable_sametime_plugin:--disable-sametime-plugin} \ - %{?_enable_slp} %{!?_enable_slp:--disable-slp} \ - %{?_with_wifi} %{!?_with_wifi:--without-wifi} \ - %{?_with_xmms} %{!?_with_xmms:--without-xmms} \ - --with-extra-includes=%{_includedir}/tqt - -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{_bindir}:${PATH}" -%__rm -rf %{buildroot} - -%__make install DESTDIR=%{buildroot} -# RHEL6: kppp seems to be not installed by previous command ??? -%__make install DESTDIR=%{buildroot} -C kppp - - -## File lists -# locale's -%find_lang %{name} || touch %{name}.lang -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -# Show only in KDE, FIXME, need to re-evaluate these -- Rex -for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \ - kwifimanager kget knewsticker ksirc kdict ; do - if [ -f %{buildroot}%{_datadir}/applications/kde/$i.desktop ] ; then - echo "OnlyShowIn=KDE;" >> %{buildroot}%{_datadir}/applications/kde/$i.desktop - fi -done - -%if %console_helper -# Run kppp through consolehelper -install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 -mkdir -p %{buildroot}%{_sbindir} -mv %{buildroot}%{_bindir}/kppp %{buildroot}%{_sbindir} -ln -s consolehelper %{buildroot}%{_bindir}/kppp -mkdir -p %{buildroot}/etc/security/console.apps -cat > %{buildroot}/etc/security/console.apps/kppp3 <<EOF -USER=root -PROGRAM=%{_sbindir}/kppp -SESSION=true -EOF -%endif - -# ktalk -install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk - -# Add lisa startup script -install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc -install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa - -%post -/sbin/chkconfig --add lisa ||: -for f in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - -%postun -for f in crystalsvg hicolor locolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done -update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : - -%preun -if [ $1 -eq 0 ]; then - /sbin/chkconfig --del lisa ||: - /sbin/service lisa stop > /dev/null 2>&1 ||: -fi - -%post libs -/sbin/ldconfig - -%postun libs -/sbin/ldconfig - -%post extras -for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done - -%postun extras -for f in crystalsvg hicolor ; do - touch --no-create %{_datadir}/icons/$f 2> /dev/null ||: - gtk-update-icon-cache -q %{_datadir}/icons/$f 2> /dev/null ||: -done - - -%clean -%__rm -rf %{buildroot} - - -%files extras -%defattr(-,root,root,-) - -# ksirc -%{_docdir}/HTML/??/ksirc/ -%{_bindir}/ksirc -%{_libdir}/libkdeinit_ksirc.* -%{_libdir}/kde3/ksirc.* -%{_datadir}/applications/kde/ksirc.desktop -%{_datadir}/apps/ksirc/ -%config(noreplace) %{_datadir}/config/ksircrc -%{_datadir}/icons/hicolor/*/apps/ksirc.* - -# kdict -%{_docdir}/HTML/en/kdict -%{_bindir}/kdict -%{_libdir}/kde3/kdict* -%{_libdir}/libkdeinit_kdict.* -%{_datadir}/applications/kde/kdict.desktop -%{_datadir}/apps/kdict -%{_datadir}/apps/kicker/applets/kdictapplet.desktop -%{_datadir}/icons/hicolor/*/apps/kdict.* - -# ktalk -%{_docdir}/HTML/en/ktalkd -%{_bindir}/ktalkd* -%{_libdir}/kde3/kcm_ktalkd.* -%{_datadir}/applications/kde/kcmktalkd.desktop -%config(noreplace) %{_datadir}/config/ktalkdrc -%{_datadir}/icons/crystalsvg/*/apps/ktalkd.* -%{_datadir}/sounds/ktalkd.wav -%config(noreplace) %{_sysconfdir}/xinetd.d/ktalk - -# kpf -%{_docdir}/HTML/en/kpf -%{_libdir}/kde3/kpf* -%{_datadir}/apps/kicker/applets/kpfapplet.desktop -%{_datadir}/icons/crystalsvg/*/apps/kpf.* -%{_datadir}/services/kpfpropertiesdialogplugin.desktop - -%if "%{?_with_wifi:1}" == "1" -# kwifimanager -%doc %{_docdir}/HTML/en/kwifimanager -%{_bindir}/kwifimanager -%{_libdir}/kde3/kcm_wifi.* -%{_datadir}/applications/kde/kcmwifi.desktop -%{_datadir}/applications/kde/kwifimanager.desktop -%{_datadir}/apps/kwifimanager -%{_datadir}/icons/hicolor/*/apps/kwifimanager.png -%endif - -%if "%{?_with_xmms:1}" == "1" -#files nowlistening -#defattr(-,root,root,-) -%{_datadir}/apps/kopete/*nowlisteningchatui* -%{_datadir}/apps/kopete/*nowlisteningui* -%{_datadir}/services/kconfiguredialog/*nowlistening* -%{_datadir}/services/*nowlistening* -%{_libdir}/kde3/*nowlistening* -%endif - -%files -f %{name}.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING README - -# ksirc -%exclude %{_bindir}/ksirc -%exclude %{_libdir}/libkdeinit_ksirc.* -%exclude %{_libdir}/kde3/ksirc.* -%exclude %{_datadir}/applications/kde/ksirc.desktop -%exclude %{_datadir}/apps/ksirc/ -%exclude %{_datadir}/config/ksircrc -%exclude %{_docdir}/HTML/??/ksirc/ -%exclude %{_datadir}/icons/hicolor/??x??/apps/ksirc.png - -# kdict -%exclude %{_docdir}/HTML/en/kdict -%exclude %{_bindir}/kdict -%exclude %{_libdir}/kde3/kdict* -%exclude %{_libdir}/libkdeinit_kdict.* -%exclude %{_datadir}/applications/kde/kdict.desktop -%exclude %{_datadir}/apps/kdict -%exclude %{_datadir}/apps/kicker/applets/kdictapplet.desktop -%exclude %{_datadir}/icons/hicolor/128x128/apps/kdict.png -%exclude %{_datadir}/icons/hicolor/??x??/apps/kdict.png -%exclude %{_datadir}/icons/hicolor/scalable/apps/kdict.svgz - -# ktalk -%exclude %{_docdir}/HTML/en/ktalkd -%exclude %{_sysconfdir}/xinetd.d/ktalk -%exclude %{_bindir}/ktalkd* -%exclude %{_libdir}/kde3/kcm_ktalkd.* -%exclude %{_datadir}/applications/kde/kcmktalkd.desktop -%exclude %{_datadir}/config/ktalkdrc -%exclude %{_datadir}/icons/crystalsvg/128x128/apps/ktalkd.png -%exclude %{_datadir}/icons/crystalsvg/??x??/apps/ktalkd.png -%exclude %{_datadir}/sounds/ktalkd.wav - -# kpf -%exclude %{_libdir}/kde3/kpf* -%exclude %{_datadir}/apps/kicker/applets/kpfapplet.desktop -%exclude %{_docdir}/HTML/en/kpf -%exclude %{_datadir}/icons/crystalsvg/??x??/apps/kpf.png -%exclude %{_datadir}/services/kpfpropertiesdialogplugin.desktop - -%ifnarch s390 s390x -# kwifimanager -%exclude %{_bindir}/kwifimanager -%exclude %{_libdir}/kde3/kcm_wifi.* -%exclude %{_datadir}/applications/kde/kcmwifi.desktop -%exclude %{_datadir}/applications/kde/kwifimanager.desktop -%exclude %{_datadir}/apps/kwifimanager -%exclude %{_docdir}/HTML/en/kwifimanager -%exclude %{_datadir}/icons/hicolor/128x128/apps/kwifimanager.png -%exclude %{_datadir}/icons/hicolor/??x??/apps/kwifimanager.png -%exclude %{_datadir}/icons/hicolor/scalable/apps/kwifimanager.svgz -%endif - -# nowlistening -%if "%{?_with_xmms:1}" == "1" -%exclude %{_datadir}/apps/kopete/*nowlisteningchatui* -%exclude %{_datadir}/apps/kopete/*nowlisteningui* -%exclude %{_datadir}/services/kconfiguredialog/*nowlistening* -%exclude %{_datadir}/services/*nowlistening* -%exclude %{_libdir}/kde3/*nowlistening* -%endif - -%{_docdir}/HTML/en/* -%if %console_helper -%config(noreplace) /etc/security/console.apps/kppp3 -%config(noreplace) /etc/pam.d/kppp3 -%{_sbindir}/kppp -%else -%attr(4755,root,root) %{_bindir}/kppp -%endif -%config(noreplace) %{_sysconfdir}/lisarc -%config(noreplace) %{_initrddir}/lisa -%{_libdir}/libkdeinit_*.so -%if "%{?_with_wifi:1}" == "1" -%{_libdir}/libkwireless.* -%endif -%{_libdir}/kde3/* -%{_libdir}/kconf_update_bin/* -%{_bindir}/* -%{_datadir}/apps/* -%{_datadir}/applications/kde/* -%{_datadir}/applnk/.hidden/* -%{_datadir}/config/* -%{_datadir}/config.kcfg/* -%{_datadir}/icons/*/*/*/* -%{_datadir}/mimelnk/* -%{_datadir}/services/* -%{_datadir}/servicetypes/* -%{_datadir}/sounds/* - -%files libs -%defattr(-,root,root,-) -%{_libdir}/libkopete*.so.* -%{_libdir}/libkopete*.la -%{_libdir}/librss.so.* -%{_libdir}/librss.la - -%files devel -%defattr(-,root,root,-) -%{_includedir}/kde/* -%{_libdir}/libkopete*.so -%{_libdir}/librss.so - - -%changelog -* Mon Sep 19 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-5 -- Add support for RHEL5 - -* Sun Sep 11 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-4 -- Import to GIT - -* Tue Aug 23 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-3 -- Add correction for Fedora 15 -- Add patch7 for V4L compilation - -* Mon Aug 22 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-2 -- Correct macro to install under "/opt", if desired - -* Fri Aug 05 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.12-1 -- Initial version -- Spec file based on Fedora 8 "kdenetwork 7:3.5.10-1" - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp b/redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp deleted file mode 100644 index 6edd39faa..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-dummy.cpp +++ /dev/null @@ -1,3 +0,0 @@ -#include "kdemacros.h" -extern "C" KDE_EXPORT void *init_libkopete_msn_shared(); -extern "C" KDE_EXPORT void *init_kopete_msn() { return init_libkopete_msn_shared(); } diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch b/redhat/tdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch deleted file mode 100644 index 594ac300a..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-fix_a_fatal_error_message.patch +++ /dev/null @@ -1,20 +0,0 @@ -commit 5c988de1bdaf2c4cf692e6c195375607a8c67ab0 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1343320500 -0500 - - Fix a fatal error message - Thanks to 'Nix' for the patch! - -diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt -index b6cc031..318b672 100644 ---- a/kopete/plugins/netmeeting/CMakeLists.txt -+++ b/kopete/plugins/netmeeting/CMakeLists.txt -@@ -10,7 +10,7 @@ - ################################################# - - if( NOT BUILD_KOPETE_PROTOCOL_MSN ) -- tde_message_error( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." ) -+ tde_message_fatal( "netmeeting plugin needs msn protocol.\n Add -DBUILD_KOPETE_PROTOCOL_MSN=ON to cmake flags." ) - endif( ) - - include_directories( diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch b/redhat/tdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch deleted file mode 100644 index bee5cb11f..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-fix_alphabet_string_error.patch +++ /dev/null @@ -1,97 +0,0 @@ -commit 3516f9bc3f3af5ae21cdbd2d3af835645cf72274 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1327531037 -0600 - - Fix linear alphabet string errors - -diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc -index 63130db..e0ec1b9 100644 ---- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc -+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc -@@ -24,7 +24,7 @@ static const string::size_type np = string::npos; - const string Base64::Base64Table( - // 0000000000111111111122222222223333333333444444444455555555556666 - // 0123456789012345678901234567890123456789012345678901234567890123 -- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"); - - // Decode Table gives the index of any valid base64 character in the Base64 table] - // 65 == A, 97 == a, 48 == 0, 43 == +, 47 == / -diff --git a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp -index fcdd3d4..06df3f7 100644 ---- a/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp -+++ b/kopete/protocols/jabber/libiris/cutestuff/util/base64.cpp -@@ -44,7 +44,7 @@ TQByteArray Base64::encode(const TQByteArray &s) - { - int i; - int len = s.size(); -- char tbl[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; -+ char tbl[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/="; - int a, b, c; - - TQByteArray p((len+2)/3*4); -diff --git a/kopete/protocols/oscar/liboscar/md5.c b/kopete/protocols/oscar/liboscar/md5.c -index 1ca18d1..e627358 100644 ---- a/kopete/protocols/oscar/liboscar/md5.c -+++ b/kopete/protocols/oscar/liboscar/md5.c -@@ -55,7 +55,7 @@ main() - "abc", /*900150983cd24fb0d6963f7d28e17f72*/ - "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ - "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ -- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - /*d174ab98d277d9f5a5611c2c9f419d9f*/ - "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ - }; -diff --git a/kopete/protocols/yahoo/libkyahoo/crypt.c b/kopete/protocols/yahoo/libkyahoo/crypt.c -index 76620bc..ee15c34 100644 ---- a/kopete/protocols/yahoo/libkyahoo/crypt.c -+++ b/kopete/protocols/yahoo/libkyahoo/crypt.c -@@ -45,7 +45,7 @@ static const char md5_salt_prefix[] = "$1$"; - - /* Table with characters for base64 transformation. */ - static const char b64t[64] = --"./0123456789ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; -+"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - - char *yahoo_crypt(const char *key, const char *salt); - -diff --git a/kopete/protocols/yahoo/libkyahoo/libyahoo.c b/kopete/protocols/yahoo/libkyahoo/libyahoo.c -index 32e6f2b..a97e7be 100644 ---- a/kopete/protocols/yahoo/libkyahoo/libyahoo.c -+++ b/kopete/protocols/yahoo/libkyahoo/libyahoo.c -@@ -60,7 +60,7 @@ extern char *yahoo_crypt(char *, char *); - void yahooBase64(unsigned char *out, const unsigned char *in, int inlen) - /* raw bytes in quasi-big-endian order to base 64 string (NUL-terminated) */ - { -- char base64digits[] = "ABCDEFGHIJKLMNOPTQRSTUVWXYZ" -+ char base64digits[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ" - "abcdefghijklmnopqrstuvwxyz" - "0123456789._"; - -diff --git a/kopete/protocols/yahoo/libkyahoo/md5.c b/kopete/protocols/yahoo/libkyahoo/md5.c -index 5bc2c13..5a537e0 100644 ---- a/kopete/protocols/yahoo/libkyahoo/md5.c -+++ b/kopete/protocols/yahoo/libkyahoo/md5.c -@@ -69,7 +69,7 @@ main() - "abc", /*900150983cd24fb0d6963f7d28e17f72*/ - "message digest", /*f96b697d7cb7938d525a2f31aaf161d0*/ - "abcdefghijklmnopqrstuvwxyz", /*c3fcd3d76192e4007dfb496cca67e13b*/ -- "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", -+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789", - /*d174ab98d277d9f5a5611c2c9f419d9f*/ - "12345678901234567890123456789012345678901234567890123456789012345678901234567890" /*57edf4a22be3c955ac49da2e2107b67a*/ - }; -diff --git a/kppp/providerdb.cpp b/kppp/providerdb.cpp -index d7f6004..4129754 100644 ---- a/kppp/providerdb.cpp -+++ b/kppp/providerdb.cpp -@@ -44,7 +44,7 @@ - #include <ksimpleconfig.h> - - --#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPTQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_" -+#define UNENCODED_CHARS "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789_" - - TQWizard* ProviderDB::wiz = 0L; - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch b/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch deleted file mode 100644 index d205ede38..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 0a2892edc380aa11fb5474004e02fd4d86abdec1 -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1340214777 +0200 - - Fix html special chars in kopete nowlistening plugin - This partially resolves Bug 944 - -diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp -index a914818..1f1fed5 100644 ---- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp -+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp -@@ -20,6 +20,7 @@ - - #include <tqtimer.h> - #include <tqstringlist.h> -+#include <tqstylesheet.h> - #include <tqregexp.h> - - #include <kdebug.h> -@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) - if(!NowListeningConfig::self()->chatAdvertising()) - return; - -- TQString originalBody = msg.plainBody(); -+ TQString originalBody = msg.escapedBody(); - - // If it is a /media message, don't process it - if(originalBody.startsWith(NowListeningConfig::self()->header())) -@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) - { - TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update - if( !advert.isEmpty() ) -- newBody = originalBody + "<br>" + advert; -+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert); - - // If we send because the information has changed since it was last sent, we must - // rebuild the list of contacts the latest information was sent to. -@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString - pl, - message, - Kopete::Message::Outbound, -- Kopete::Message::RichText ); -+ Kopete::Message::PlainText ); - theChat->sendMessage( msg ); - } - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch b/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch deleted file mode 100644 index c6df5ffd7..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening_2.patch +++ /dev/null @@ -1,46 +0,0 @@ -commit 2d699f523902244113eeec627ca6b9b18b740da0 -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1340214777 +0200 - - Fix html special chars in kopete nowlistening plugin - This partially resolves Bug 994 - -diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp -index a914818..1f1fed5 100644 ---- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp -+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp -@@ -20,6 +20,7 @@ - - #include <tqtimer.h> - #include <tqstringlist.h> -+#include <tqstylesheet.h> - #include <tqregexp.h> - - #include <kdebug.h> -@@ -189,7 +190,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) - if(!NowListeningConfig::self()->chatAdvertising()) - return; - -- TQString originalBody = msg.plainBody(); -+ TQString originalBody = msg.escapedBody(); - - // If it is a /media message, don't process it - if(originalBody.startsWith(NowListeningConfig::self()->header())) -@@ -222,7 +223,7 @@ void NowListeningPlugin::slotOutgoingMessage(Kopete::Message& msg) - { - TQString advert = mediaPlayerAdvert(false); // false since newTrackPlaying() did the update - if( !advert.isEmpty() ) -- newBody = originalBody + "<br>" + advert; -+ newBody = originalBody + "<br>" + TQStyleSheet::escape(advert); - - // If we send because the information has changed since it was last sent, we must - // rebuild the list of contacts the latest information was sent to. -@@ -501,7 +502,7 @@ void NowListeningPlugin::advertiseToChat( Kopete::ChatSession *theChat, TQString - pl, - message, - Kopete::Message::Outbound, -- Kopete::Message::RichText ); -+ Kopete::Message::PlainText ); - theChat->sendMessage( msg ); - } - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch b/redhat/tdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch deleted file mode 100644 index 92f0d72bc..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-fix_parallel_build.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 35c41f35b08e981caa062f963ad2611ee6ef35a9 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1343320733 -0500 - - Fix a parallel build bug - Thanks to 'Nix' for the patch! - -diff --git a/filesharing/advanced/propsdlgplugin/CMakeLists.txt b/filesharing/advanced/propsdlgplugin/CMakeLists.txt -index f6477d1..26d94f5 100644 ---- a/filesharing/advanced/propsdlgplugin/CMakeLists.txt -+++ b/filesharing/advanced/propsdlgplugin/CMakeLists.txt -@@ -32,6 +32,7 @@ install( FILES - - tde_add_library( propsdlgplugin_common STATIC_PIC AUTOMOC - SOURCES propertiespage.cpp propertiespagegui.ui -+ DEPENDENCIES filesharesamba - ) - - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch b/redhat/tdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch deleted file mode 100644 index e63bfed4f..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch +++ /dev/null @@ -1,66 +0,0 @@ -commit f670853164f8a23f3656fa9de72b12b962b9bcaa -Author: Slávek Banko <slavek.banko@axis.cz> -Date: 1339294006 +0200 - - Improve Kaffeine support in Kopete now listening plugin - -diff --git a/kopete/plugins/nowlistening/nlkaffeine.cpp b/kopete/plugins/nowlistening/nlkaffeine.cpp -index c2b70ba..77dd84c 100644 ---- a/kopete/plugins/nowlistening/nlkaffeine.cpp -+++ b/kopete/plugins/nowlistening/nlkaffeine.cpp -@@ -40,7 +40,7 @@ void NLKaffeine::update() - m_newTrack = false; - TQString newTrack; - bool error = true; // Asume we have a error first. -- TQCString kaffeineIface("Kaffeine"), kaffeineGetTrack("getTitle()"); -+ TQCString kaffeineIface("KaffeineIface"), kaffeineGetTrack("title()"); - - // see if kaffeine is registered with DCOP - if ( m_client->isApplicationRegistered( "kaffeine" ) ) -@@ -52,10 +52,10 @@ void NLKaffeine::update() - if ( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, - replyType, replyData ) ) - { -- kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine >= 0.5" << endl; -- // Trying with the new Kaffeine DCOP interface (>=0.5) -- kaffeineIface = "KaffeineIface"; -- kaffeineGetTrack = "title()"; -+ kdDebug ( 14307 ) << k_funcinfo << " Trying DCOP interface of Kaffeine < 0.5" << endl; -+ // Trying with the old Kaffeine DCOP interface (<0.5) -+ kaffeineIface = "Kaffeine"; -+ kaffeineGetTrack = "getTitle()"; - if( !m_client->call( "kaffeine", kaffeineIface, "isPlaying()", data, replyType, replyData ) ) - { - kdDebug( 14307 ) << k_funcinfo << " DCOP error on Kaffeine." << endl; -@@ -94,6 +94,31 @@ void NLKaffeine::update() - m_newTrack = true; - m_track = newTrack; - } -+ if ( kaffeineIface == "Kaffeine" ) -+ { -+ // old Kaffeine DCOP interface (<0.5) -+ return; -+ } -+ -+ if ( m_client->call( "kaffeine", kaffeineIface, "album()", data, -+ replyType, replyData ) ) -+ { -+ TQDataStream reply( replyData, IO_ReadOnly ); -+ -+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { -+ reply >> m_album; -+ } -+ } -+ -+ if ( m_client->call( "kaffeine", kaffeineIface, "artist()", data, -+ replyType, replyData ) ) -+ { -+ TQDataStream reply( replyData, IO_ReadOnly ); -+ -+ if ( replyType == TQSTRING_OBJECT_NAME_STRING ) { -+ reply >> m_artist; -+ } -+ } - } - else - kdDebug ( 14307 ) << "Kaffeine is not running!\n" << endl; diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch b/redhat/tdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch deleted file mode 100644 index a01c8ab81..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_jabber_protocol.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h.ORI 2011-11-27 05:38:43.500726484 -0500 -+++ kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/base/sigslot.h 2011-11-27 05:39:19.901925857 -0500 -@@ -80,6 +80,7 @@ - - #include <set> - #include <list> -+#include <cstddef> - - // On our copy of sigslot.h, we force single threading - #define SIGSLOT_PURE_ISO ---- kdenetwork/kopete/protocols/jabber/CMakeLists.txt.ORI 2011-11-27 05:55:08.369780670 -0500 -+++ kdenetwork/kopete/protocols/jabber/CMakeLists.txt 2011-11-27 05:55:12.350662883 -0500 -@@ -80,6 +80,6 @@ - jabberclient-static kopetejabberui-static - iris_jabber-static iris_xmpp_core-static iris_xmpp_im-static iris-static - qca-static cutestuff_network-static cutestuff_util-static ${JINGLE_LIBRARIES} -- kopete-shared -+ kopete-shared idn - DESTINATION ${PLUGIN_INSTALL_DIR} - ) ---- kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt.ORI 2011-11-27 06:01:44.412062605 -0500 -+++ kdenetwork/kopete/protocols/jabber/kioslave/CMakeLists.txt 2011-11-27 06:01:56.658700254 -0500 -@@ -37,6 +37,6 @@ - LINK - jabberclient-static - iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static -- qca-static cutestuff_network-static cutestuff_util-static kio-shared -+ qca-static cutestuff_network-static cutestuff_util-static kio-shared idn - DESTINATION ${PLUGIN_INSTALL_DIR} - ) diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch b/redhat/tdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch deleted file mode 100644 index a7e39357b..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2011-11-27 13:27:13.236739020 -0500 -+++ kdenetwork/kopete/plugins/motionautoaway/motionawayplugin.cpp 2011-11-27 13:28:48.217257573 -0500 -@@ -75,7 +75,12 @@ - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) - #define _LINUX_TIME_H - #endif -+ -+#ifdef HAVE_LIBV4L1_VIDEODEV_H -+#include <libv4l1-videodev.h> -+#else - #include <linux/videodev.h> -+#endif - - #define DEF_WIDTH 352 - #define DEF_HEIGHT 288 diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch b/redhat/tdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch deleted file mode 100644 index 160efd367..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_msn_protocol.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdenetwork/kopete/protocols/msn/CMakeLists.txt.ORI 2011-11-27 05:05:56.814440165 -0500 -+++ kdenetwork/kopete/protocols/msn/CMakeLists.txt 2011-11-27 05:10:21.605900492 -0500 -@@ -28,6 +28,7 @@ - ${CMAKE_BINARY_DIR} - ${CMAKE_SOURCE_DIR}/kopete/libkopete - ${CMAKE_SOURCE_DIR}/kopete/libkopete/ui -+ ${CMAKE_SOURCE_DIR}/kopete/libkopete/private - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} - ) diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch b/redhat/tdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch deleted file mode 100644 index b338236f8..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-kopete_sms_protocol.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- kdenetwork/kopete/protocols/sms/services/smsclient.cpp.ORI 2011-11-27 05:22:47.001212554 -0500 -+++ kdenetwork/kopete/protocols/sms/services/smsclient.cpp 2011-11-27 05:22:58.253085350 -0500 -@@ -67,7 +67,7 @@ - return; - } - -- TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"). TQString()); -+ TQString programName = c->readEntry(TQString("%1:%2").tqarg("SMSClient").tqarg("ProgramName"), TQString()); - if (programName.isNull()) - programName = "/usr/bin/sms_client"; - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-missing_ldflags.patch b/redhat/tdenetwork/kdenetwork-3.5.13-missing_ldflags.patch deleted file mode 100644 index 88d7fd0f1..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-missing_ldflags.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- kdenetwork/wifi/CMakeLists.txt.ldflags 2011-10-29 04:43:38.000000000 +0200 -+++ kdenetwork/wifi/CMakeLists.txt 2012-08-08 15:14:31.956605213 +0200 -@@ -21,6 +21,7 @@ - ${CMAKE_BINARY_DIR} - ${TDE_INCLUDE_DIR} - ${TQT_INCLUDE_DIRS} -+ ${ARTS_INCLUDE_DIRS}/.. - ) - - link_directories( diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch b/redhat/tdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch deleted file mode 100644 index 727b0967f..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-reference_to_qmake_h.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-06-21 20:37:08.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc 2011-11-28 18:20:03.852267846 -0600 -@@ -31,7 +31,7 @@ - #include "talk/p2p/client/sessionclient.h" - #include "talk/p2p/base/helpers.h" - #include "talk/base/logging.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/constants.h" - #include "talk/xmllite/xmlprinter.h" - #include <iostream> -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-08-12 15:11:23.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc 2011-11-28 18:20:03.813268480 -0600 -@@ -30,7 +30,7 @@ - #include "talk/base/logging.h" - #include "talk/session/receiver.h" - #include "talk/session/phone/phonesessionclient.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - namespace { - - const std::string NS_PHONE("http://www.google.com/session/phone"); -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-06-21 20:37:11.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc 2011-11-28 18:20:04.262270904 -0600 -@@ -28,7 +28,7 @@ - #include <string> - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlconstants.h" - - //#define new TRACK_NEW -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-06-21 20:37:11.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc 2011-11-28 18:20:04.268270508 -0600 -@@ -32,7 +32,7 @@ - - #include "talk/base/common.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlparser.h" - #include "talk/xmllite/xmlbuilder.h" - #include "talk/xmllite/xmlprinter.h" -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-06-21 20:37:11.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.h 2011-11-28 18:20:04.288018707 -0600 -@@ -31,7 +31,7 @@ - #include <iosfwd> - #include <string> - #include "talk/base/scoped_ptr.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - - namespace buzz { - -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-06-21 20:37:11.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.h 2011-11-28 18:20:04.245270846 -0600 -@@ -31,7 +31,7 @@ - #include <string> - #include "talk/base/scoped_ptr.h" - #include "talk/base/stl_decl.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - - namespace buzz { - -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-06-21 20:37:09.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc 2011-11-28 18:20:03.076020148 -0600 -@@ -29,7 +29,7 @@ - #include "talk/base/basicdefs.h" - #include "talk/xmllite/xmlconstants.h" - #include "talk/xmllite/xmlelement.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/jid.h" - #include "talk/xmpp/constants.h" - namespace buzz { -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-06-21 20:37:09.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.h 2011-11-28 18:20:03.139020370 -0600 -@@ -29,7 +29,7 @@ - #define _CRICKET_XMPP_XMPPLIB_BUZZ_CONSTANTS_H_ - - #include <string> --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmpp/jid.h" - - -diff -urN /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h ---- /dev/shm/kdenetwork/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-06-21 20:37:09.000000000 -0500 -+++ /dev/shm/kdenetwork.new/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengine.h 2011-11-28 18:20:03.059020250 -0600 -@@ -30,7 +30,7 @@ - - // also part of the API - #include "talk/xmpp/jid.h" --#include "talk/xmllite/tqname.h" -+#include "talk/xmllite/qname.h" - #include "talk/xmllite/xmlelement.h" - - diff --git a/redhat/tdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch b/redhat/tdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch deleted file mode 100644 index 55bf4f8a8..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13-remove_more_applications_from_menu.patch +++ /dev/null @@ -1,39 +0,0 @@ -commit f86a25380b4901bbd828dde8f35adb5b789d40c6 -Author: Darrell Anderson <humanreadable@yahoo.com> -Date: 1331690526 -0500 - - Remove "More Applications" from TDE menu. - This partially resolves bug report 653. - -diff --git a/kdict/kdict.desktop b/kdict/kdict.desktop -index d274d23..0b63798 100644 ---- a/kdict/kdict.desktop -+++ b/kdict/kdict.desktop -@@ -150,4 +150,4 @@ GenericName[zu]=Isichaza magama esixhumekile - X-KDE-StartupNotify=true - X-DCOP-ServiceType=Unique - DocPath=kdict/index.html --Categories=Qt;KDE;Network;X-KDE-More;Office;Dictionary; -+Categories=Qt;KDE;Network;Office;Dictionary; -diff --git a/knewsticker/knewsticker-standalone.desktop b/knewsticker/knewsticker-standalone.desktop -index b164e52..08d0d1e 100644 ---- a/knewsticker/knewsticker-standalone.desktop -+++ b/knewsticker/knewsticker-standalone.desktop -@@ -92,5 +92,5 @@ GenericName[zu]=Umlungiseleli Wezindaba - Terminal=false - X-KDE-StartupNotify=true - X-DCOP-ServiceType=Unique --Categories=Qt;KDE;Network;X-KDE-More;News; -+Categories=Qt;KDE;Network;News; - NoDisplay=true -diff --git a/kppp/logview/kppplogview.desktop b/kppp/logview/kppplogview.desktop -index 39ba64f..401718f 100644 ---- a/kppp/logview/kppplogview.desktop -+++ b/kppp/logview/kppplogview.desktop -@@ -74,5 +74,5 @@ Path= - Type=Application - Terminal=false - X-DCOP-ServiceType=Multi --Categories=Qt;KDE;Network;X-KDE-More;Dialup; -+Categories=Qt;KDE;Network;Dialup; - NoDisplay=true diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch b/redhat/tdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch deleted file mode 100644 index e97a4ec27..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.1-add_cmake_macro.patch +++ /dev/null @@ -1,24 +0,0 @@ -From caedf8323c45b376c824de343f31de78664b2511 Mon Sep 17 00:00:00 2001 -From: Serghei Amelian <serghei.amelian@gmail.com> -Date: Sun, 12 Feb 2012 21:08:53 +0000 -Subject: [TDEMacros.cmake] added tde_save_and_set() macro - ---- -diff --git a/modules/TDEMacros.cmake b/modules/TDEMacros.cmake -index 075b7eb..1091755 100644 ---- a/modules/TDEMacros.cmake -+++ b/modules/TDEMacros.cmake -@@ -1283,6 +1283,11 @@ macro( tde_save ) - endforeach() - endmacro() - -+macro( tde_save_and_set _var ) -+ set( __bak_${_var} ${${_var}} ) -+ set( ${_var} ${ARGN} ) -+endmacro( ) -+ - macro( tde_restore ) - foreach( _var ${ARGN} ) - set( ${_var} ${__bak_${_var}} ) --- -cgit v0.9.0.2-39-g756e diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch b/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch deleted file mode 100644 index f6b87914f..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_rhel4_libraries.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake.ORI 2012-10-09 20:58:42.674713186 +0200 -+++ kdenetwork-3.5.13.1/krfb/ConfigureChecks.cmake 2012-10-09 20:59:17.585002712 +0200 -@@ -11,5 +11,5 @@ - - pkg_search_module( XTST xtst ) - if( NOT XTST_FOUND ) -- tde_message_fatal( "xtst is required, but was not found on your system" ) -+ set( XTST_LIBRARIES "-lXtst" ) - endif( ) diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch b/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch deleted file mode 100644 index bf225a26e..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch +++ /dev/null @@ -1,58 +0,0 @@ -commit 6f17856dec29f6a84d5e38b6db12fdc632cd4394 -Author: Timothy Pearson <kb9vqf@pearsoncomputing.net> -Date: 1339484900 -0500 - - Fix build errors - Thanks to Roman Savochenko for the patch! - -diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/kioslave/CMakeLists.txt -index 6c691ae..9539457 100644 ---- a/kopete/protocols/jabber/kioslave/CMakeLists.txt -+++ b/kopete/protocols/jabber/kioslave/CMakeLists.txt -@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC - LINK - jabberclient-static idn - iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static -- qca-static cutestuff_network-static cutestuff_util-static kio-shared idn -+ qca-static cutestuff_network-static cutestuff_util-static kio-shared - DESTINATION ${PLUGIN_INSTALL_DIR} - ) -diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp -index 9fb5a92..984e843 100644 ---- a/kopete/protocols/sms/services/smsclient.cpp -+++ b/kopete/protocols/sms/services/smsclient.cpp -@@ -59,7 +59,7 @@ void SMSClient::send(const Kopete::Message& msg) - m_msg = msg; - - KConfigGroup* c = m_account->configGroup(); -- TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName"); -+ TQString provider = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProviderName")); - - if (provider.isNull()) - { -@@ -67,7 +67,7 @@ void SMSClient::send(const Kopete::Message& msg) - return; - } - -- TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); -+ TQString programName = c->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName")); - if (programName.isNull()) - programName = "/usr/bin/sms_client"; - -@@ -97,14 +97,14 @@ TQWidget* SMSClient::configureWidget(TQWidget* parent) - prefWidget->configDir->setMode(KFile::Directory); - TQString configDir; - if (m_account) -- configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir"); -+ configDir = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ConfigDir")); - if (configDir.isNull()) - configDir = "/etc/sms"; - prefWidget->configDir->setURL(configDir); - - TQString programName; - if (m_account) -- programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName"); -+ programName = m_account->configGroup()->readEntry(TQString("%1:%2").arg("SMSClient").arg("ProgramName")); - if (programName.isNull()) - programName = "/usr/bin/sms_client"; - prefWidget->program->setURL(programName); diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff b/redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff deleted file mode 100644 index b9540655f..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.1-wifi3.diff +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/wifi/ConfigureChecks.cmake b/wifi/ConfigureChecks.cmake -index f3a7ddb..86ca98b 100644 ---- a/wifi/ConfigureChecks.cmake -+++ b/wifi/ConfigureChecks.cmake -@@ -21,7 +21,9 @@ endif( ) - - - # check for wireless tools -+tde_save_and_set( CMAKE_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS} "-lm" ) - check_library_exists( iw iw_get_stats "" HAVE_IW ) -+tde_restore( CMAKE_REQUIRED_FLAGS ) - if( HAVE_IW ) - check_include_file( iwlib.h HAVE_IWLIB_H ) - # we need at least wireless tools >= 27 diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.1.spec b/redhat/tdenetwork/kdenetwork-3.5.13.1.spec deleted file mode 100644 index 06783f10d..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.1.spec +++ /dev/null @@ -1,1188 +0,0 @@ -# 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 - -# TDE 3.5.13 specific building variables -%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_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} - - -# 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 - -Name: trinity-tdenetwork -Version: 3.5.13.1 -Release: 2%{?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 - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kdenetwork-3.5.13.1.tar.gz -Source1: kppp.pamd -Source2: ktalk -Source4: lisarc -Source5: lisa.redhat - -# RedHat/Fedora legacy patches -Patch3: kdenetwork-3.5.8-kppp.patch -Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch - -# [kdenetwork] Missing LDFLAGS cause FTBFS -Patch1: kdenetwork-3.5.13-missing_ldflags.patch -# [kdenetwork] FTBFS in SMS client [Bug #1241] -Patch2: kdenetwork-3.5.13.1-fix_smsclient_ftbfs.patch -# [kdenetwork] Fix iwlib support in openSUSE -Patch7: kdenetwork-3.5.13.1-add_cmake_macro.patch -Patch8: kdenetwork-3.5.13.1-wifi3.diff - -# RHEL4 specific -Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch - - -BuildRequires: gettext -BuildRequires: trinity-tqtinterface-devel >= %{version} -BuildRequires: trinity-tdelibs-devel >= %{version} -BuildRequires: coreutils -BuildRequires: openssl-devel -BuildRequires: sqlite-devel -BuildRequires: gnutls-devel - -# GADU support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_gadu 1 -BuildRequires: libgadu-devel -%endif - -%if 0%{?fedora} >= 5 || 0%{?rhel} >= 5 -BuildRequires: libXmu-devel -BuildRequires: libXScrnSaver-devel -BuildRequires: libXtst-devel -BuildRequires: libXxf86vm-devel -%endif - -# Wifi support -%if "%{?_with_wifi:1}" == "1" -%if 0%{?fedora} >= 6 || 0%{?rhel} >= 5 -BuildRequires: wireless-tools-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel -%endif -%if 0%{?rhel} == 5 -BuildRequires: wireless-tools -%endif -%if 0%{?suse_version} -BuildRequires: libiw-devel -%endif -%endif - -# OpenSLP support -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version} -%define with_openslp 1 -BuildRequires: openslp-devel -%endif - -%ifarch %{ix86} -# BR: %{tde_includedir}/valgrind/valgrind.h -BuildRequires: valgrind -%endif - -%{?_with_xmms:BuildRequires: xmms-devel} - -# V4L support -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -BuildRequires: libv4l-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}v4l-devel -%endif - - -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel - -#jabber -BuildRequires: libidn-devel -#jabber/jingle -%if 0%{?suse_version} -BuildRequires: libexpat-devel -%else -BuildRequires: expat-devel -%endif -BuildRequires: glib2-devel -BuildRequires: speex-devel -# jabber/ssl -#{?fedora:Requires(hint): qca-tls} -Requires: jasper -# MEANWHILE -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 || 0%{?suse_version} -%define with_meanwhile 1 -BuildRequires: meanwhile-devel -%endif -%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 -BuildRequires: speex-devel -%endif - -Obsoletes: trinity-kdenetwork < %{version}-%{release} -Provides: trinity-kdenetwork = %{version}-%{release} -Obsoletes: trinity-kdenetwork-libs < %{version}-%{release} -Provides: trinity-kdenetwork-libs = %{version}-%{release} -Obsoletes: trinity-kdenetwork-extras < %{version}-%{release} -Provides: trinity-kdenetwork-extras = %{version}-%{release} -Obsoletes: tdenetwork < %{version}-%{release} -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: trinity-kget = %{version}-%{release} -Requires: trinity-knewsticker = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-kopete-nowlistening = %{version}-%{release} -Requires: trinity-kpf = %{version}-%{release} -Requires: trinity-kppp = %{version}-%{release} -Requires: trinity-krdc = %{version}-%{release} -Requires: trinity-krfb = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-ktalkd = %{version}-%{release} -Requires: trinity-kwifimanager = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-lisa = %{version}-%{release} - -%description -This metapackage includes a collection of network and networking related -applications provided with the official release of Trinity. - -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 -* kget: downloader manager -* knewsticker: RDF newsticker applet -* kopete: chat client -* kopete-nowlistening: (xmms) plugin for Kopete. -* kpf: Public fileserver for Trinity -* kppp: dialer and front end for pppd -* krdc: a client for Desktop Sharing and other VNC servers -* krfb: Desktop Sharing server, allow others to access your desktop via VNC -* ksirc: IRC client for Trinity -* ktalkd: Talk daemon for Trinity -* kwifimanager: Wireless lan manager for Trinity -* librss: RSS library for Trinity -* lisa: lan information server - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README - - -########## - -%package -n trinity-dcoprss -Summary: RSS utilities for Trinity -Group: Applications/Internet - -%description -n trinity-dcoprss -dcoprss is a RSS to DCOP bridge, allowing all -DCOP aware applications to access RSS news feeds. There is also -a few sample utilities provided. -RSS is a standard for publishing news headlines. -DCOP is the TDE interprocess communication protocol. - -%files -n trinity-dcoprss -%defattr(-,root,root,-) -%{tde_bindir}/feedbrowser -%{tde_bindir}/rssclient -%{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 -Summary: Development files for the Trinity network module -Group: Development/Libraries -Requires: trinity-kdict = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-kdelibs-devel - -Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} -Provides: trinity-kdenetwork-devel = %{version}-%{release} -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 -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_libdir}/libkopete.la -%{tde_libdir}/libkopete.so -%{tde_libdir}/libkopete_msn_shared.la -%{tde_libdir}/libkopete_msn_shared.so -%{tde_libdir}/libkopete_oscar.la -%{tde_libdir}/libkopete_oscar.so -%{tde_libdir}/libkopete_videodevice.la -%{tde_libdir}/libkopete_videodevice.so -%{tde_libdir}/librss.la -%{tde_libdir}/librss.so - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%package filesharing -#Recommends: perl-suid -Summary: Network filesharing configuration module for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-filesharing < %{version}-%{release} -Provides: tdenetwork-filesharing = %{version}-%{release} - -%description filesharing -This package provides a Trinity Control Center module to configure -NFS and Samba. - -%files filesharing -%defattr(-,root,root,-) -%{tde_tdelibdir}/fileshare_propsdlgplugin.la -%{tde_tdelibdir}/fileshare_propsdlgplugin.so -%{tde_tdelibdir}/kcm_fileshare.la -%{tde_tdelibdir}/kcm_fileshare.so -%{tde_tdelibdir}/kcm_kcmsambaconf.la -%{tde_tdelibdir}/kcm_kcmsambaconf.so -%{tde_tdeappdir}/fileshare.desktop -%{tde_tdeappdir}/kcmsambaconf.desktop -%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png -%{tde_datadir}/services/fileshare_propsdlgplugin.desktop - -%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 -Summary: Dictionary client for Trinity -Group: Applications/Internet - -%description -n trinity-kdict -KDict is an advanced TDE graphical client for the DICT Protocol, with full -Unicode support. It enables you to search through dictionary databases for a -word or phrase, then displays suitable definitions. KDict tries to ease -basic as well as advanced queries. - -%files -n trinity-kdict -%defattr(-,root,root,-) -%{tde_bindir}/kdict -%{tde_tdelibdir}/kdict.* -%{tde_tdelibdir}/kdict_panelapplet.* -%{tde_libdir}/libkdeinit_kdict.* -%{tde_tdeappdir}/kdict.desktop -%{tde_datadir}/apps/kdict -%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop -%{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 kfile-plugins -Summary: Torrent metainfo plugin for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release} -Provides: tdenetwork-kfile-plugins = %{version}-%{release} - -%description kfile-plugins -This package provides a metainformation plugin for bittorrent files. -TDE uses kfile-plugins to provide metainfo tab in the files properties -dialog in konqueror and other file-handling applications. - -%files kfile-plugins -%{tde_tdelibdir}/kfile_torrent.la -%{tde_tdelibdir}/kfile_torrent.so -%{tde_datadir}/services/kfile_torrent.desktop - -%post kfile-plugins -update-desktop-database 2> /dev/null || : - -%postun kfile-plugins -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kget -Summary: download manager for Trinity -Group: Applications/Internet - -%description -n trinity-kget -KGet is a a download manager similar to GetRight or Go!zilla. It keeps -all your downloads in one dialog and you can add and remove transfers. -Transfers can be paused, resumed, queued or scheduled. -Dialogs display info about status of transfers - progress, size, speed -and remaining time. Program supports drag & drop from TDE -applications and Netscape. - -%files -n trinity-kget -%defattr(-,root,root,-) -%{tde_bindir}/kget -%{tde_tdelibdir}/khtml_kget.la -%{tde_tdelibdir}/khtml_kget.so -%{tde_tdeappdir}/kget.desktop -%{tde_datadir}/apps/kget -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc -%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop -%{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}/mimelnk/application/x-kgetlist.desktop -%{tde_datadir}/sounds/KGet_Added.ogg -%{tde_datadir}/sounds/KGet_Finished.ogg -%{tde_datadir}/sounds/KGet_Finished_All.ogg -%{tde_datadir}/sounds/KGet_Started.ogg -%{tde_tdedocdir}/HTML/en/kget - -%post -n trinity-kget -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-kget -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-knewsticker -Summary: news ticker applet for Trinity -Group: Applications/Internet - -%description -n trinity-knewsticker -This is a news ticker applet for the Trinity panel. It can scroll news from -your favorite news sites, such as lwn.net, /. and freshmeat.net. -To achieve this, KNewsTicker requires the news sites to provide a -RSS feed to newsitems. KNewsTicker already comes with a selection of -good news sources which provide such files. - -%files -n trinity-knewsticker -%defattr(-,root,root,-) -%{tde_bindir}/knewstickerstub -%{tde_tdelibdir}/knewsticker_panelapplet.la -%{tde_tdelibdir}/knewsticker_panelapplet.so -%{tde_tdelibdir}/kntsrcfilepropsdlg.la -%{tde_tdelibdir}/kntsrcfilepropsdlg.so -%{tde_tdeappdir}/knewsticker-standalone.desktop -%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop -%{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}/icons/hicolor/*/apps/knewsticker.png -%{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 -Summary: instant messenger for Trinity -Group: Applications/Internet -URL: http://kopete.kde.org - -%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. - -Support for more IM protocols can be added through a plugin system. - -%files -n trinity-kopete -%defattr(-,root,root,-) -# nowlistening support -%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui* -%exclude %{tde_datadir}/apps/kopete/*nowlisteningui* -%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%exclude %{tde_datadir}/services/kconfiguredialog/*nowlistening* -%exclude %{tde_datadir}/services/*nowlistening* -%exclude %{tde_tdelibdir}/*nowlistening* -# Main kopete package -%{tde_bindir}/kopete -%{tde_bindir}/kopete_latexconvert.sh -%{tde_libdir}/kconf_update_bin/kopete_account_kconf_update -%{tde_libdir}/kconf_update_bin/kopete_nameTracking_kconf_update -%{tde_libdir}/kconf_update_bin/kopete_pluginloader2_kconf_update -%{tde_tdelibdir}/kcm_kopete_*.so -%{tde_tdelibdir}/kcm_kopete_*.la -%{tde_tdelibdir}/kio_jabberdisco.la -%{tde_tdelibdir}/kio_jabberdisco.so -%{tde_tdelibdir}/kopete_*.la -%{tde_tdelibdir}/kopete_*.so -%{tde_tdelibdir}/libkrichtexteditpart.la -%{tde_tdelibdir}/libkrichtexteditpart.so -%{tde_libdir}/libkopete_msn_shared.so.* -%{tde_libdir}/libkopete_oscar.so.* -%{tde_libdir}/libkopete.so.* -%{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}/config.kcfg/historyconfig.kcfg -%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg -%{tde_datadir}/config.kcfg/kopete.kcfg -%{tde_datadir}/config.kcfg/latexconfig.kcfg -%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png -%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png -#%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png -%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png -%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz -%{tde_datadir}/icons/hicolor/*/apps/kopete.png -%{tde_datadir}/icons/hicolor/*/actions/emoticon.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png -#%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png -%{tde_datadir}/icons/hicolor/*/actions/newmsg.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png -%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png -%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz -%{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 -%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop -%{tde_datadir}/services/kopete_*.desktop -%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png -%{tde_datadir}/servicetypes/kopete*.desktop -%{tde_datadir}/sounds/Kopete_*.ogg -%{tde_tdedocdir}/HTML/en/kopete -# jingle support for kopete -%{tde_bindir}/relayserver -%{tde_bindir}/stunserver -# winpopup support for kopete -%{tde_bindir}/winpopup-install.sh -%{tde_bindir}/winpopup-send.sh -# meanwhile protocol support for kopete -%if 0%{?with_meanwhile} -%{tde_tdelibdir}/new_target0.la -%{tde_tdelibdir}/new_target0.so -%endif -# motionaway plugin for kopete -%{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 - -########## - -%package -n trinity-kopete-nowlistening -Summary: Nowlistening (xmms) plugin for Kopete. -Group: Applications/Internet - -%description -n trinity-kopete-nowlistening -Kopete includes the "Now Listening" plug-in that can report what music you -are currently listening to, in a number of different players, including -noatun, kscd, juk, kaffeine and amarok. - -%files -n trinity-kopete-nowlistening -%defattr(-,root,root,-) -%{tde_datadir}/apps/kopete/*nowlisteningchatui* -%{tde_datadir}/apps/kopete/*nowlisteningui* -%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%{tde_datadir}/services/kconfiguredialog/*nowlistening* -%{tde_datadir}/services/*nowlistening* -%{tde_tdelibdir}/*nowlistening* - -########## - -%package -n trinity-kpf -Summary: Public fileserver for Trinity -Group: Applications/Internet - -%description -n trinity-kpf -kpf provides simple file sharing using HTTP. kpf is strictly a public -fileserver, which means that there are no access restrictions to shared -files. Whatever you select for sharing is available to anyone. kpf is -designed to be used for sharing files with friends. - -%files -n trinity-kpf -%defattr(-,root,root,-) -%{tde_tdelibdir}/kpf* -%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kpf.* -%{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 -Summary: modem dialer and ppp frontend for Trinity -Group: Applications/Internet -Requires: ppp -%if 0%{?rhel} || 0%{?fedora} -Requires: usermode-gtk -%else -Requires: usermode -%endif - -%description -n trinity-kppp -KPPP is a dialer and front end for pppd. It allows for interactive -script generation and network setup. It will automate the dialing in -process to your ISP while letting you conveniently monitor the entire -process. - -Once connected KPPP will provide a rich set of statistics and keep -track of the time spent online for you. - -%files -n trinity-kppp -%defattr(-,root,root,-) -%config(noreplace) /etc/security/console.apps/kppp3 -%config(noreplace) /etc/pam.d/kppp3 -%{tde_bindir}/kppp3 -%{tde_bindir}/kppplogview -%{_sbindir}/kppp3 -%{tde_sbindir}/kppp3 -%{tde_tdeappdir}/Kppp.desktop -%{tde_tdeappdir}/kppplogview.desktop -%{tde_datadir}/apps/checkrules -%{tde_datadir}/apps/kppp -%{tde_datadir}/icons/hicolor/*/apps/kppp.png -%{tde_tdedocdir}/HTML/en/kppp - -%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 || : - -%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 -Summary: Remote Desktop Connection for Trinity -Group: Applications/Internet -Requires: rdesktop - -%description -n trinity-krdc -krdc is an TDE graphical client for the rfb protocol, used by VNC, -and if rdesktop is installed, krdc can connect to Windows Terminal -Servers using RDP. - -%files -n trinity-krdc -%defattr(-,root,root,-) -%{tde_bindir}/krdc -%{tde_tdeappdir}/krdc.desktop -%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop -%{tde_datadir}/apps/krdc -%{tde_datadir}/icons/crystalsvg/*/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 - 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-krfb -Summary: Desktop Sharing for Trinity -Group: Applications/Internet - -%description -n trinity-krfb -Desktop Sharing (krfb) is a server application that allows you to share -your current session with a user on another machine, who can use a -VNC client like krdc to view or even control the desktop. It doesn't -require you to start a new X session - it can share the current session. -This makes it very useful when you want someone to help you perform a -task. - -%files -n trinity-krfb -%defattr(-,root,root,-) -%{tde_bindir}/krfb -%{tde_bindir}/krfb_httpd -%{tde_tdelibdir}/kcm_krfb.la -%{tde_tdelibdir}/kcm_krfb.so -%{tde_tdelibdir}/kded_kinetd.la -%{tde_tdelibdir}/kded_kinetd.so -%{tde_tdeappdir}/kcmkrfb.desktop -%{tde_tdeappdir}/krfb.desktop -%{tde_datadir}/apps/kinetd/eventsrc -%{tde_datadir}/apps/krfb -%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png -%{tde_datadir}/icons/locolor/*/apps/krfb.png -%{tde_datadir}/services/kded/kinetd.desktop -%{tde_datadir}/services/kinetd_krfb.desktop -%{tde_datadir}/services/kinetd_krfb_httpd.desktop -%{tde_datadir}/servicetypes/kinetdmodule.desktop -%{tde_tdedocdir}/HTML/en/krfb - -%post -n trinity-krfb -for f in crystalsvg 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-ksirc -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 -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 -recommended package libio-socket-ssl-perl. - -%files -n trinity-ksirc -%defattr(-,root,root,-) -%{tde_bindir}/dsirc -%{tde_bindir}/ksirc -%{tde_libdir}/libkdeinit_ksirc.* -%{tde_tdelibdir}/ksirc.* -%{tde_tdeappdir}/ksirc.desktop -%{tde_datadir}/apps/ksirc/ -%config(noreplace) %{tde_datadir}/config/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 -Summary: Talk daemon for Trinity -Group: Applications/Internet - -%description -n trinity-ktalkd -KTalkd is an enhanced talk daemon - a program to handle incoming talk -requests, announce them and allow you to respond to it using a talk -client. Note that KTalkd is designed to run on a single-user workstation, -and shouldn't be run on a multi-user machine. - -%files -n trinity-ktalkd -%defattr(-,root,root,-) -%{tde_bindir}/ktalkd* -%{tde_bindir}/mail.local -%{tde_tdelibdir}/kcm_ktalkd.* -%{tde_tdeappdir}/kcmktalkd.desktop -%config(noreplace) %{tde_datadir}/config/ktalkdrc -%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.* -%{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 - 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%if "%{?_with_wifi:1}" == "1" -%package -n trinity-kwifimanager -#Depends: ${shlibs:Depends}, wireless-tools -#Suggests: khelpcenter-trinity -Summary: Wireless lan manager for Trinity -Group: Applications/Internet - -%description -n trinity-kwifimanager -KWiFiManager suite is a set of tools which allows you to manage your -wireless LAN connection under the K Desktop Environment. It provides -information about your current connection. KWiFiManager supports every -wavelan card that uses the wireless extensions interface. - -%files -n trinity-kwifimanager -%defattr(-,root,root,-) -%{tde_bindir}/kwifimanager -%{tde_tdelibdir}/kcm_wifi.* -%{tde_tdelibdir}/libkwireless.la -%{tde_tdelibdir}/libkwireless.so -%{tde_tdeappdir}/kcmwifi.desktop -%{tde_tdeappdir}/kwifimanager.desktop -%{tde_datadir}/apps/kicker/applets/kwireless.desktop -%{tde_datadir}/apps/kwifimanager -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz -%doc %{tde_tdedocdir}/HTML/en/kwifimanager - -%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 - -########## - -%package -n trinity-librss -Summary: RSS library for Trinity -Group: Environment/Libraries - -%description -n trinity-librss -This is the runtime package for programs that use the TDE RSS library. -End users should not need to install this, it should get installed -automatically when needed. - -%files -n trinity-librss -%defattr(-,root,root,-) -%{tde_libdir}/librss.so.* - -%post -n trinity-librss -/sbin/ldconfig - -%postun -n trinity-librss -/sbin/ldconfig - -########## - -%package -n trinity-lisa -Summary: LAN information server for Trinity -Group: Applications/Internet -%if 0%{?suse_version} -Requires(preun): aaa_base -Requires(post): aaa_base -%else -Requires(preun): chkconfig -Requires(post): chkconfig -%endif - -%description -n trinity-lisa -LISa is intended to provide KDE with a kind of "network neighborhood" -but relying only on the TCP/IP protocol. - -%files -n trinity-lisa -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/lisarc* -%config(noreplace) %{_initrddir}/lisa -%{tde_tdelibdir}/kcm_lanbrowser.la -%{tde_tdelibdir}/kcm_lanbrowser.so -%{tde_tdelibdir}/kio_lan.la -%{tde_tdelibdir}/kio_lan.so -%{tde_datadir}/applnk/.hidden/kcmkiolan.desktop -%{tde_datadir}/applnk/.hidden/kcmlisa.desktop -%{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/remoteview/lan.desktop -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/common -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.docbook -%{tde_tdedocdir}/HTML/en/lisa/ -%{tde_datadir}/services/lan.protocol -%{tde_datadir}/services/rlan.protocol -%{tde_bindir}/lisa -%{tde_bindir}/reslisa - -%post -n trinity-lisa -/sbin/chkconfig --add lisa ||: -update-desktop-database 2> /dev/null || : - -%postun -n trinity-lisa -if [ $1 -eq 0 ]; then - /sbin/service lisa stop > /dev/null 2>&1 ||: - /sbin/chkconfig --del lisa ||: -fi -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kdnssd -#Recommends: avahi-daemon -#Suggests: avahi-autoipd | zeroconf -Summary: Zeroconf support for KDE -Group: Applications/Internet - -%description -n trinity-kdnssd -A kioslave and kded module that provide Zeroconf support. Try -"zeroconf:/" in Konqueror. - -%files -n trinity-kdnssd -%defattr(-,root,root,-) -%{tde_datadir}/services/zeroconf.protocol -%{tde_datadir}/services/invitation.protocol -%{tde_datadir}/services/kded/dnssdwatcher.desktop -%{tde_datadir}/apps/remoteview/zeroconf.desktop -%{tde_datadir}/apps/zeroconf/_http._tcp -%{tde_datadir}/apps/zeroconf/_ftp._tcp -%{tde_datadir}/apps/zeroconf/_ldap._tcp -%{tde_datadir}/apps/zeroconf/_webdav._tcp -%{tde_datadir}/apps/zeroconf/_nfs._tcp -%{tde_datadir}/apps/zeroconf/_ssh._tcp -%{tde_datadir}/apps/zeroconf/_rfb._tcp -%{tde_tdelibdir}/kio_zeroconf.so -%{tde_tdelibdir}/kio_zeroconf.la -%{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%{?suse_version} || 0%{?pclinuxos} -%debug_package -%endif - -########## - -%prep -%setup -q -n kdenetwork-3.5.13.1 - -%patch1 -p1 -b .ldflags -%patch2 -p1 -b .ftbfs -%patch3 -p1 -b .kppp -%patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd -%patch7 -p1 -d cmake -%patch8 -p1 - -%if 0%{?rhel} == 4 -%patch201 -p1 -b .rhel4 -%endif - -%build -unset QTDIR || : ; . /etc/profile.d/qt3.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" - -# Specific path for RHEL4 -if [ -d /usr/X11R6 ]; then - export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" -fi - -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DWITH_JINGLE=ON \ - %{?with_speex:-DWITH_SPEEX=ON} \ - -DWITH_WEBCAM=ON \ - -DWITH_GSM=OFF \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON \ - -DBUILD_KOPETE_PLUGIN_ALL=ON \ - -DBUILD_KOPETE_PROTOCOL_ALL=ON \ - %{!?with_gadu:-DBUILD_KOPETE_PROTOCOL_GADU=OFF} \ - %{!?with_meanwhile:-DBUILD_KOPETE_PROTOCOL_MEANWHILE=OFF} \ - .. - -# Tdenetwork is not smp safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -# Show only in KDE, FIXME, need to re-evaluate these -- Rex -for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \ - kwifimanager kget knewsticker ksirc kdict ; do - if [ -f %{buildroot}%{tde_tdeappdir}/$i.desktop ] ; then - echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop - fi -done - -# Run kppp through consolehelper, and rename it to 'kppp3' -%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 -%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir} -%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3 -%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3 -%if "%{tde_prefix}" != "/usr" -%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3 -%endif -%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps -cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF -USER=root -PROGRAM=%{tde_sbindir}/kppp3 -SESSION=true -EOF -%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|" - -# ktalk -%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk - -# Add lisa startup script -%__install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc -%__install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa - -# RHEL 5: Avoids conflict with 'kdenetwork' -%if 0%{?rhel} == 5 -%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde -%endif - -# Avoids conflict with trinity-kvirc -%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ - -%clean -%__rm -rf %{buildroot} - - - -%changelog -* Sun Sep 30 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13.1-1 -- Initial release for TDE 3.5.13.1 diff --git a/redhat/tdenetwork/kdenetwork-3.5.13.spec b/redhat/tdenetwork/kdenetwork-3.5.13.spec deleted file mode 100644 index a2ca35c90..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.13.spec +++ /dev/null @@ -1,1182 +0,0 @@ -# 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 - -# TDE 3.5.13 specific building variables -%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_sbindir %{tde_prefix}/sbin - -%define tde_tdeappdir %{tde_datadir}/applications/kde -%define tde_tdedocdir %{tde_docdir}/kde -%define tde_tdeincludedir %{tde_includedir}/kde -%define tde_tdelibdir %{tde_libdir}/trinity - -%define _docdir %{tde_docdir} - - -# 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 - -Name: trinity-tdenetwork -Version: 3.5.13 -Release: 6%{?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 - -Prefix: %{tde_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: kdenetwork-%{version}.tar.gz -Source1: kppp.pamd -Source2: ktalk -Source4: lisarc -Source5: lisa.redhat - -# RedHat/Fedora legacy patches -Patch3: kdenetwork-3.5.8-kppp.patch -Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch - -# [kdenetworks] Missing LDFLAGS cause FTBFS -Patch1: kdenetwork-3.5.13-missing_ldflags.patch -# [kdenetwork] Fix kopete protocol compilation [Bug #695] -Patch10: kdenetwork-3.5.13-kopete_msn_protocol.patch -Patch11: kdenetwork-3.5.13-kopete_sms_protocol.patch -Patch12: kdenetwork-3.5.13-kopete_jabber_protocol.patch -Patch13: kdenetwork-3.5.13-kopete_motionawayplugin_ftbfs.patch -# [kdenetwork] Fix references to "qname.h" [Bug #700] -Patch14: kdenetwork-3.5.13-reference_to_qmake_h.patch -# WTF is this ? shitty hack in autotool was forgotten in CMAKE port ! [Bug #695] -Source10: kdenetwork-3.5.13-dummy.cpp -# [tdenetwork] Fix linear alphabet string errors [Commit #3516f9bc] -Patch15: kdenetwork-3.5.13-fix_alphabet_string_error.patch -# [tdenetwork] Remove "More Applications" from TDE menu. [Bug #653] [Commit #f86a2538] -Patch17: kdenetwork-3.5.13-remove_more_applications_from_menu.patch -# [tdenetwork] Improve Kaffeine support in Kopete now listening plugin [Commit #f6708531] -Patch18: kdenetwork-3.5.13-improve_kaffeine_support_in_nowlistening_plugin.patch -# [tdenetwork] Fix html special chars in kopete nowlistening plugin [Bug #944] [Commit #0a2892ed] -Patch19: kdenetwork-3.5.13-fix_html_specialchar_in_kopete_nowlistening.patch -# [tdenetwork] Fix a fatal error message [Commit #5c988de1] -Patch20: kdenetwork-3.5.13-fix_a_fatal_error_message.patch -# [tdenetwork] Fix a parallel build bug [Commit #35c41f35] -Patch21: kdenetwork-3.5.13-fix_parallel_build.patch - -BuildRequires: gettext -BuildRequires: trinity-kdelibs-devel -BuildRequires: coreutils -BuildRequires: openssl-devel -#BuildRequires: avahi-qt3-devel -BuildRequires: sqlite-devel -BuildRequires: gnutls-devel -BuildRequires: libgadu-devel -BuildRequires: speex-devel - -%if 0%{?fedora} > 4 || 0%{?rhel} > 4 -BuildRequires: libXmu-devel libXScrnSaver-devel libXtst-devel libXxf86vm-devel -%endif -%if "%{?_with_wifi:1}" == "1" -%if 0%{?fedora} > 5 || 0%{?rhel} > 4 -BuildRequires: wireless-tools-devel -%else -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}iw29-devel -%else -# RHEL 5 -BuildRequires: wireless-tools -%endif -%endif -%endif -BuildRequires: openslp-devel -%ifarch %{ix86} -# BR: %{tde_includedir}/valgrind/valgrind.h -BuildRequires: valgrind -%endif -%{?_with_xmms:BuildRequires: xmms-devel} - -%if 0%{?rhel} >= 6 || 0%{?fedora} >= 15 -BuildRequires: libv4l-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}v4l-devel -%endif - -Obsoletes: trinity-kdenetwork < %{version}-%{release} -Provides: trinity-kdenetwork = %{version}-%{release} -Obsoletes: trinity-kdenetwork-libs < %{version}-%{release} -Provides: trinity-kdenetwork-libs = %{version}-%{release} -Obsoletes: trinity-kdenetwork-extras < %{version}-%{release} -Provides: trinity-kdenetwork-extras = %{version}-%{release} -Obsoletes: tdenetwork < %{version}-%{release} -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: trinity-kget = %{version}-%{release} -Requires: trinity-knewsticker = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-kopete-nowlistening = %{version}-%{release} -Requires: trinity-kpf = %{version}-%{release} -Requires: trinity-kppp = %{version}-%{release} -Requires: trinity-krdc = %{version}-%{release} -Requires: trinity-krfb = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-ktalkd = %{version}-%{release} -Requires: trinity-kwifimanager = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-lisa = %{version}-%{release} - -%description -This metapackage includes a collection of network and networking related -applications provided with the official release of Trinity. - -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 -* kget: downloader manager -* knewsticker: RDF newsticker applet -* kopete: chat client -* kopete-nowlistening: (xmms) plugin for Kopete. -* kpf: Public fileserver for Trinity -* kppp: dialer and front end for pppd -* krdc: a client for Desktop Sharing and other VNC servers -* krfb: Desktop Sharing server, allow others to access your desktop via VNC -* ksirc: IRC client for Trinity -* ktalkd: Talk daemon for Trinity -* kwifimanager: Wireless lan manager for Trinity -* librss: RSS library for Trinity -* lisa: lan information server - -%files -%defattr(-,root,root,-) -%doc AUTHORS COPYING README - - -########## - -%package -n trinity-dcoprss -Summary: RSS utilities for Trinity -Group: Applications/Internet - -%description -n trinity-dcoprss -dcoprss is a RSS to DCOP bridge, allowing all -DCOP aware applications to access RSS news feeds. There is also -a few sample utilities provided. -RSS is a standard for publishing news headlines. -DCOP is the TDE interprocess communication protocol. - -%files -n trinity-dcoprss -%defattr(-,root,root,-) -%{tde_bindir}/feedbrowser -%{tde_bindir}/rssclient -%{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 -Summary: Development files for the Trinity network module -Group: Development/Libraries -Requires: trinity-kdict = %{version}-%{release} -Requires: trinity-kopete = %{version}-%{release} -Requires: trinity-ksirc = %{version}-%{release} -Requires: trinity-librss = %{version}-%{release} -Requires: trinity-kdelibs-devel - -Obsoletes: trinity-kdenetwork-devel < %{version}-%{release} -Provides: trinity-kdenetwork-devel = %{version}-%{release} -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 -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_libdir}/libkopete.la -%{tde_libdir}/libkopete.so -%{tde_libdir}/libkopete_msn_shared.la -%{tde_libdir}/libkopete_msn_shared.so -%{tde_libdir}/libkopete_oscar.la -%{tde_libdir}/libkopete_oscar.so -%{tde_libdir}/libkopete_videodevice.la -%{tde_libdir}/libkopete_videodevice.so -%{tde_libdir}/librss.la -%{tde_libdir}/librss.so - -%post devel -/sbin/ldconfig - -%postun devel -/sbin/ldconfig - -########## - -%package filesharing -#Recommends: perl-suid -Summary: Network filesharing configuration module for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-filesharing < %{version}-%{release} -Provides: tdenetwork-filesharing = %{version}-%{release} - -%description filesharing -This package provides a Trinity Control Center module to configure -NFS and Samba. - -%files filesharing -%defattr(-,root,root,-) -%{tde_tdelibdir}/fileshare_propsdlgplugin.la -%{tde_tdelibdir}/fileshare_propsdlgplugin.so -%{tde_tdelibdir}/kcm_fileshare.la -%{tde_tdelibdir}/kcm_fileshare.so -%{tde_tdelibdir}/kcm_kcmsambaconf.la -%{tde_tdelibdir}/kcm_kcmsambaconf.so -%{tde_tdeappdir}/fileshare.desktop -%{tde_tdeappdir}/kcmsambaconf.desktop -%{tde_datadir}/icons/hicolor/*/apps/kcmsambaconf.png -%{tde_datadir}/services/fileshare_propsdlgplugin.desktop - -%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 -Summary: Dictionary client for Trinity -Group: Applications/Internet - -%description -n trinity-kdict -KDict is an advanced TDE graphical client for the DICT Protocol, with full -Unicode support. It enables you to search through dictionary databases for a -word or phrase, then displays suitable definitions. KDict tries to ease -basic as well as advanced queries. - -%files -n trinity-kdict -%defattr(-,root,root,-) -%{tde_bindir}/kdict -%{tde_tdelibdir}/kdict.* -%{tde_tdelibdir}/kdict_panelapplet.* -%{tde_libdir}/libkdeinit_kdict.* -%{tde_tdeappdir}/kdict.desktop -%{tde_datadir}/apps/kdict -%{tde_datadir}/apps/kicker/applets/kdictapplet.desktop -%{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 kfile-plugins -Summary: Torrent metainfo plugin for Trinity -Group: Applications/Internet - -Obsoletes: tdenetwork-kfile-plugins < %{version}-%{release} -Provides: tdenetwork-kfile-plugins = %{version}-%{release} - -%description kfile-plugins -This package provides a metainformation plugin for bittorrent files. -TDE uses kfile-plugins to provide metainfo tab in the files properties -dialog in konqueror and other file-handling applications. - -%files kfile-plugins -%{tde_tdelibdir}/kfile_torrent.la -%{tde_tdelibdir}/kfile_torrent.so -%{tde_datadir}/services/kfile_torrent.desktop - -%post kfile-plugins -update-desktop-database 2> /dev/null || : - -%postun kfile-plugins -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kget -Summary: download manager for Trinity -Group: Applications/Internet - -%description -n trinity-kget -KGet is a a download manager similar to GetRight or Go!zilla. It keeps -all your downloads in one dialog and you can add and remove transfers. -Transfers can be paused, resumed, queued or scheduled. -Dialogs display info about status of transfers - progress, size, speed -and remaining time. Program supports drag & drop from TDE -applications and Netscape. - -%files -n trinity-kget -%defattr(-,root,root,-) -%{tde_bindir}/kget -%{tde_tdelibdir}/khtml_kget.la -%{tde_tdelibdir}/khtml_kget.so -%{tde_tdeappdir}/kget.desktop -%{tde_datadir}/apps/kget -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.desktop -%{tde_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc -%{tde_datadir}/apps/konqueror/servicemenus/kget_download.desktop -%{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}/mimelnk/application/x-kgetlist.desktop -%{tde_datadir}/sounds/KGet_Added.ogg -%{tde_datadir}/sounds/KGet_Finished.ogg -%{tde_datadir}/sounds/KGet_Finished_All.ogg -%{tde_datadir}/sounds/KGet_Started.ogg -%{tde_tdedocdir}/HTML/en/kget - -%post -n trinity-kget -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-kget -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-knewsticker -Summary: news ticker applet for Trinity -Group: Applications/Internet - -%description -n trinity-knewsticker -This is a news ticker applet for the Trinity panel. It can scroll news from -your favorite news sites, such as lwn.net, /. and freshmeat.net. -To achieve this, KNewsTicker requires the news sites to provide a -RSS feed to newsitems. KNewsTicker already comes with a selection of -good news sources which provide such files. - -%files -n trinity-knewsticker -%defattr(-,root,root,-) -%{tde_bindir}/knewstickerstub -%{tde_tdelibdir}/knewsticker_panelapplet.la -%{tde_tdelibdir}/knewsticker_panelapplet.so -%{tde_tdelibdir}/kntsrcfilepropsdlg.la -%{tde_tdelibdir}/kntsrcfilepropsdlg.so -%{tde_tdeappdir}/knewsticker-standalone.desktop -%{tde_datadir}/applnk/.hidden/knewstickerstub.desktop -%{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}/icons/hicolor/*/apps/knewsticker.png -%{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 -Summary: instant messenger for Trinity -Group: Applications/Internet -URL: http://kopete.kde.org - -#Recommends: qca-tls -#Suggests: tdeartwork-emoticons-trinity, khelpcenter-trinity, imagemagick, gnupg, gnomemeeting -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: meanwhile-devel -#jabber -BuildRequires: libidn-devel -#jabber/jingle -BuildRequires: expat-devel -BuildRequires: glib2-devel -BuildRequires: ortp-devel -BuildRequires: speex-devel -# jabber/ssl -#{?fedora:Requires(hint): qca-tls} -Requires: jasper - -%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. - -Support for more IM protocols can be added through a plugin system. - -%files -n trinity-kopete -%defattr(-,root,root,-) -# nowlistening support -%exclude %{tde_datadir}/apps/kopete/*nowlisteningchatui* -%exclude %{tde_datadir}/apps/kopete/*nowlisteningui* -%exclude %{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%exclude %{tde_datadir}/services/kconfiguredialog/*nowlistening* -%exclude %{tde_datadir}/services/*nowlistening* -%exclude %{tde_tdelibdir}/*nowlistening* -# Main kopete package -%{tde_bindir}/kopete -%{tde_bindir}/kopete_latexconvert.sh -%{tde_libdir}/kconf_update_bin/kopete_account_kconf_update -%{tde_libdir}/kconf_update_bin/kopete_nameTracking_kconf_update -%{tde_libdir}/kconf_update_bin/kopete_pluginloader2_kconf_update -%{tde_tdelibdir}/kcm_kopete_*.so -%{tde_tdelibdir}/kcm_kopete_*.la -%{tde_tdelibdir}/kio_jabberdisco.la -%{tde_tdelibdir}/kio_jabberdisco.so -%{tde_tdelibdir}/kopete_*.la -%{tde_tdelibdir}/kopete_*.so -%{tde_tdelibdir}/libkrichtexteditpart.la -%{tde_tdelibdir}/libkrichtexteditpart.so -%{tde_libdir}/libkopete_msn_shared.so.* -%{tde_libdir}/libkopete_oscar.so.* -%{tde_libdir}/libkopete.so.* -%{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}/config.kcfg/historyconfig.kcfg -%{tde_datadir}/config.kcfg/kopeteidentityconfigpreferences.kcfg -%{tde_datadir}/config.kcfg/kopete.kcfg -%{tde_datadir}/config.kcfg/latexconfig.kcfg -%{tde_datadir}/icons/crystalsvg/*/actions/voicecall.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamreceive.png -%{tde_datadir}/icons/crystalsvg/*/actions/webcamsend.png -%{tde_datadir}/icons/crystalsvg/*/actions/account_offline_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/add_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_away_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_busy_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_food_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_invisible_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_phone_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/contact_xa_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/delete_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/edit_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/emoticon.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_chatty.png -#%{tde_datadir}/icons/crystalsvg/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_group.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_invisible.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_na.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_original.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_raw.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/crystalsvg/*/actions/jabber_xa.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteavailable.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteaway.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopeteeditstatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/kopetestatusmessage.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_away.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_offline.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_online.png -%{tde_datadir}/icons/crystalsvg/*/actions/metacontact_unknown.png -%{tde_datadir}/icons/crystalsvg/*/actions/newmsg.png -%{tde_datadir}/icons/crystalsvg/*/actions/search_user.png -%{tde_datadir}/icons/crystalsvg/*/actions/show_offliners.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/crystalsvg/*/actions/status_unknown.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_aim.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_gadu.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_http-ws.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_icq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_irc.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_msn.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_qq.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_smtp.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_tlen.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_gateway_yahoo.png -%{tde_datadir}/icons/crystalsvg/*/apps/jabber_protocol.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_all_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_offline.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_away.png -%{tde_datadir}/icons/crystalsvg/*/apps/kopete_some_online.png -%{tde_datadir}/icons/crystalsvg/*/mimetypes/kopete_emoticons.png -%{tde_datadir}/icons/crystalsvg/scalable/actions/account_offline_overlay.svgz -%{tde_datadir}/icons/hicolor/*/apps/kopete.png -%{tde_datadir}/icons/hicolor/*/actions/emoticon.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_away.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_chatty.png -#%{tde_datadir}/icons/hicolor/*/actions/jabber_connecting.mng -%{tde_datadir}/icons/hicolor/*/actions/jabber_group.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_invisible.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_na.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_offline.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_online.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_original.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_raw.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_off.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_serv_on.png -%{tde_datadir}/icons/hicolor/*/actions/jabber_xa.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteavailable.png -%{tde_datadir}/icons/hicolor/*/actions/kopeteaway.png -%{tde_datadir}/icons/hicolor/*/actions/newmsg.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown_overlay.png -%{tde_datadir}/icons/hicolor/*/actions/status_unknown.png -%{tde_datadir}/icons/hicolor/*/apps/jabber_protocol.png -%{tde_datadir}/icons/hicolor/scalable/apps/kopete2.svgz -%{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 -%{tde_datadir}/services/kconfiguredialog/kopete_*.desktop -%{tde_datadir}/services/kopete_*.desktop -%{tde_datadir}/icons/crystalsvg/16x16/apps/jabber_gateway_sms.png -%{tde_datadir}/servicetypes/kopete*.desktop -%{tde_datadir}/sounds/Kopete_*.ogg -%{tde_tdedocdir}/HTML/en/kopete -# jingle support for kopete -%{tde_bindir}/relayserver -%{tde_bindir}/stunserver -# winpopup support for kopete -%{tde_bindir}/winpopup-install.sh -%{tde_bindir}/winpopup-send.sh -# meanwhile protocol support for kopete -%{tde_tdelibdir}/new_target0.la -%{tde_tdelibdir}/new_target0.so -# motionaway plugin for kopete -%{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 - -########## - -%package -n trinity-kopete-nowlistening -Summary: Nowlistening (xmms) plugin for Kopete. -Group: Applications/Internet - -%description -n trinity-kopete-nowlistening -Kopete includes the "Now Listening" plug-in that can report what music you -are currently listening to, in a number of different players, including -noatun, kscd, juk, kaffeine and amarok. - -%files -n trinity-kopete-nowlistening -%defattr(-,root,root,-) -%{tde_datadir}/apps/kopete/*nowlisteningchatui* -%{tde_datadir}/apps/kopete/*nowlisteningui* -%{tde_datadir}/config.kcfg/nowlisteningconfig.kcfg -%{tde_datadir}/services/kconfiguredialog/*nowlistening* -%{tde_datadir}/services/*nowlistening* -%{tde_tdelibdir}/*nowlistening* - -########## - -%package -n trinity-kpf -Summary: Public fileserver for Trinity -Group: Applications/Internet - -%description -n trinity-kpf -kpf provides simple file sharing using HTTP. kpf is strictly a public -fileserver, which means that there are no access restrictions to shared -files. Whatever you select for sharing is available to anyone. kpf is -designed to be used for sharing files with friends. - -%files -n trinity-kpf -%defattr(-,root,root,-) -%{tde_tdelibdir}/kpf* -%{tde_datadir}/apps/kicker/applets/kpfapplet.desktop -%{tde_datadir}/icons/crystalsvg/*/apps/kpf.* -%{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 -Summary: modem dialer and ppp frontend for Trinity -Group: Applications/Internet -Requires: ppp -%if 0%{?rhel} || 0%{?fedora} -Requires: usermode-gtk -%else -Requires: usermode -%endif - -%description -n trinity-kppp -KPPP is a dialer and front end for pppd. It allows for interactive -script generation and network setup. It will automate the dialing in -process to your ISP while letting you conveniently monitor the entire -process. - -Once connected KPPP will provide a rich set of statistics and keep -track of the time spent online for you. - -%files -n trinity-kppp -%defattr(-,root,root,-) -%config(noreplace) /etc/security/console.apps/kppp3 -%config(noreplace) /etc/pam.d/kppp3 -%{tde_bindir}/kppp3 -%{tde_bindir}/kppplogview -%{_sbindir}/kppp3 -%{tde_sbindir}/kppp3 -%{tde_tdeappdir}/Kppp.desktop -%{tde_tdeappdir}/kppplogview.desktop -%{tde_datadir}/apps/checkrules -%{tde_datadir}/apps/kppp -%{tde_datadir}/icons/hicolor/*/apps/kppp.png -%{tde_tdedocdir}/HTML/en/kppp - -%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 || : - -%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 -Summary: Remote Desktop Connection for Trinity -Group: Applications/Internet -Requires: rdesktop - -%description -n trinity-krdc -krdc is an TDE graphical client for the rfb protocol, used by VNC, -and if rdesktop is installed, krdc can connect to Windows Terminal -Servers using RDP. - -%files -n trinity-krdc -%defattr(-,root,root,-) -%{tde_bindir}/krdc -%{tde_tdeappdir}/krdc.desktop -%{tde_datadir}/apps/konqueror/servicemenus/smb2rdc.desktop -%{tde_datadir}/apps/krdc -%{tde_datadir}/icons/crystalsvg/*/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 - 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-krfb -Summary: Desktop Sharing for Trinity -Group: Applications/Internet - -%description -n trinity-krfb -Desktop Sharing (krfb) is a server application that allows you to share -your current session with a user on another machine, who can use a -VNC client like krdc to view or even control the desktop. It doesn't -require you to start a new X session - it can share the current session. -This makes it very useful when you want someone to help you perform a -task. - -%files -n trinity-krfb -%defattr(-,root,root,-) -%{tde_bindir}/krfb -%{tde_bindir}/krfb_httpd -%{tde_tdelibdir}/kcm_krfb.la -%{tde_tdelibdir}/kcm_krfb.so -%{tde_tdelibdir}/kded_kinetd.la -%{tde_tdelibdir}/kded_kinetd.so -%{tde_tdeappdir}/kcmkrfb.desktop -%{tde_tdeappdir}/krfb.desktop -%{tde_datadir}/apps/kinetd/eventsrc -%{tde_datadir}/apps/krfb -%{tde_datadir}/icons/crystalsvg/*/apps/krfb.png -%{tde_datadir}/icons/locolor/*/apps/krfb.png -%{tde_datadir}/services/kded/kinetd.desktop -%{tde_datadir}/services/kinetd_krfb.desktop -%{tde_datadir}/services/kinetd_krfb_httpd.desktop -%{tde_datadir}/servicetypes/kinetdmodule.desktop -%{tde_tdedocdir}/HTML/en/krfb - -%post -n trinity-krfb -for f in crystalsvg 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-ksirc -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 -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 -recommended package libio-socket-ssl-perl. - -%files -n trinity-ksirc -%defattr(-,root,root,-) -%{tde_bindir}/dsirc -%{tde_bindir}/ksirc -%{tde_libdir}/libkdeinit_ksirc.* -%{tde_tdelibdir}/ksirc.* -%{tde_tdeappdir}/ksirc.desktop -%{tde_datadir}/apps/ksirc/ -%config(noreplace) %{tde_datadir}/config/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 -Summary: Talk daemon for Trinity -Group: Applications/Internet - -%description -n trinity-ktalkd -KTalkd is an enhanced talk daemon - a program to handle incoming talk -requests, announce them and allow you to respond to it using a talk -client. Note that KTalkd is designed to run on a single-user workstation, -and shouldn't be run on a multi-user machine. - -%files -n trinity-ktalkd -%defattr(-,root,root,-) -%{tde_bindir}/ktalkd* -%{tde_bindir}/mail.local -%{tde_tdelibdir}/kcm_ktalkd.* -%{tde_tdeappdir}/kcmktalkd.desktop -%config(noreplace) %{tde_datadir}/config/ktalkdrc -%{tde_datadir}/icons/crystalsvg/*/apps/ktalkd.* -%{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 - 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 - gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || : -done -update-desktop-database 2> /dev/null || : - -########## - -%if "%{?_with_wifi:1}" == "1" -%package -n trinity-kwifimanager -#Depends: ${shlibs:Depends}, wireless-tools -#Suggests: khelpcenter-trinity -Summary: Wireless lan manager for Trinity -Group: Applications/Internet - -%description -n trinity-kwifimanager -KWiFiManager suite is a set of tools which allows you to manage your -wireless LAN connection under the K Desktop Environment. It provides -information about your current connection. KWiFiManager supports every -wavelan card that uses the wireless extensions interface. - -%files -n trinity-kwifimanager -%defattr(-,root,root,-) -%{tde_bindir}/kwifimanager -%{tde_tdelibdir}/kcm_wifi.* -%{tde_tdelibdir}/libkwireless.la -%{tde_tdelibdir}/libkwireless.so -%{tde_tdeappdir}/kcmwifi.desktop -%{tde_tdeappdir}/kwifimanager.desktop -%{tde_datadir}/apps/kicker/applets/kwireless.desktop -%{tde_datadir}/apps/kwifimanager -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.png -%{tde_datadir}/icons/hicolor/*/apps/kwifimanager.svgz -%doc %{tde_tdedocdir}/HTML/en/kwifimanager - -%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 - -########## - -%package -n trinity-librss -Summary: RSS library for Trinity -Group: Environment/Libraries - -%description -n trinity-librss -This is the runtime package for programs that use the TDE RSS library. -End users should not need to install this, it should get installed -automatically when needed. - -%files -n trinity-librss -%defattr(-,root,root,-) -%{tde_libdir}/librss.so.* - -%post -n trinity-librss -/sbin/ldconfig - -%postun -n trinity-librss -/sbin/ldconfig - -########## - -%package -n trinity-lisa -Summary: LAN information server for Trinity -Group: Applications/Internet -Requires(preun): chkconfig -Requires(post): chkconfig - -%description -n trinity-lisa -LISa is intended to provide KDE with a kind of "network neighborhood" -but relying only on the TCP/IP protocol. - -%files -n trinity-lisa -%defattr(-,root,root,-) -%config(noreplace) %{_sysconfdir}/lisarc* -%config(noreplace) %{_initrddir}/lisa -%{tde_tdelibdir}/kcm_lanbrowser.la -%{tde_tdelibdir}/kcm_lanbrowser.so -%{tde_tdelibdir}/kio_lan.la -%{tde_tdelibdir}/kio_lan.so -%{tde_datadir}/applnk/.hidden/kcmkiolan.desktop -%{tde_datadir}/applnk/.hidden/kcmlisa.desktop -%{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/remoteview/lan.desktop -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/common -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.cache.bz2 -%{tde_tdedocdir}/HTML/en/kcontrol/lanbrowser/index.docbook -%{tde_tdedocdir}/HTML/en/lisa -%{tde_datadir}/services/lan.protocol -%{tde_datadir}/services/rlan.protocol -%{tde_bindir}/lisa -%{tde_bindir}/reslisa - -%post -n trinity-lisa -/sbin/chkconfig --add lisa ||: -update-desktop-database 2> /dev/null || : - -%postun -n trinity-lisa -if [ $1 -eq 0 ]; then - /sbin/chkconfig --del lisa ||: - /sbin/service lisa stop > /dev/null 2>&1 ||: -fi -update-desktop-database 2> /dev/null || : - -########## - -%package -n trinity-kdnssd -#Recommends: avahi-daemon -#Suggests: avahi-autoipd | zeroconf -Summary: Zeroconf support for KDE -Group: Applications/Internet - -%description -n trinity-kdnssd -A kioslave and kded module that provide Zeroconf support. Try -"zeroconf:/" in Konqueror. - -%files -n trinity-kdnssd -%defattr(-,root,root,-) -%{tde_datadir}/services/zeroconf.protocol -%{tde_datadir}/services/invitation.protocol -%{tde_datadir}/services/kded/dnssdwatcher.desktop -%{tde_datadir}/apps/remoteview/zeroconf.desktop -%{tde_datadir}/apps/zeroconf/_http._tcp -%{tde_datadir}/apps/zeroconf/_ftp._tcp -%{tde_datadir}/apps/zeroconf/_ldap._tcp -%{tde_datadir}/apps/zeroconf/_webdav._tcp -%{tde_datadir}/apps/zeroconf/_nfs._tcp -%{tde_datadir}/apps/zeroconf/_ssh._tcp -%{tde_datadir}/apps/zeroconf/_rfb._tcp -%{tde_tdelibdir}/kio_zeroconf.so -%{tde_tdelibdir}/kio_zeroconf.la -%{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 || : - -########## - -%prep -%setup -q -n kdenetwork - -%patch1 -p1 -b .ldflags -%patch3 -p1 -b .kppp -%patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd -%patch10 -p1 -%patch11 -p1 -%patch12 -p1 -%patch13 -p1 -%patch14 -p4 -%patch15 -p1 -%patch17 -p1 -%patch18 -p1 -%patch19 -p1 -%patch20 -p1 -%patch21 -p1 - - -# TDE 3.5.13: missing 'dummy.cpp' in MSN protocol -%__install -m 644 %{SOURCE10} kopete/protocols/msn/dummy.cpp - -%build -unset QTDIR || : ; . /etc/profile.d/qt.sh -export PATH="%{tde_bindir}:${PATH}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" -export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" -export LD_LIBRARY_PATH="%{tde_libdir}" - -%if 0%{?rhel} || 0%{?fedora} -%__mkdir_p build -cd build -%endif - -%cmake \ - -DBIN_INSTALL_DIR=%{tde_bindir} \ - -DINCLUDE_INSTALL_DIR=%{tde_tdeincludedir} \ - -DLIB_INSTALL_DIR=%{tde_libdir} \ - -DSHARE_INSTALL_PREFIX=%{tde_datadir} \ - -DWITH_JINGLE=ON \ - -DWITH_SPEEX=ON \ - -DWITH_WEBCAM=ON \ - -DWITH_GSM=OFF \ - -DWITH_ARTS=ON \ - -DBUILD_ALL=ON \ - -DBUILD_KOPETE_PROTOCOL_ALL=ON \ - -DBUILD_KOPETE_PLUGIN_ALL=ON \ - .. - -# Tdenetwork is not smp safe ! -%__make VERBOSE=1 - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} -C build - - -## File lists -# HTML (1.0) -HTML_DIR=$(kde-config --expandvars --install html) -if [ -d %{buildroot}$HTML_DIR ]; then -for lang_dir in %{buildroot}$HTML_DIR/* ; do - if [ -d $lang_dir ]; then - lang=$(basename $lang_dir) - echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang - # replace absolute symlinks with relative ones - pushd $lang_dir - for i in *; do - [ -d $i -a -L $i/common ] && %{__rm} -f $i/common && ln -sf ../common $i/common - done - popd - fi -done -fi - -# Show only in KDE, FIXME, need to re-evaluate these -- Rex -for i in fileshare kcmkrfb kcmktalkd kcmwifi krfb kppp kppplogview \ - kwifimanager kget knewsticker ksirc kdict ; do - if [ -f %{buildroot}%{tde_datadir}/applications/kde/$i.desktop ] ; then - echo "OnlyShowIn=KDE;" >> %{buildroot}%{tde_datadir}/applications/kde/$i.desktop - fi -done - -# Run kppp through consolehelper, and rename it to 'kppp3' -%__install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kppp3 -%__mkdir_p %{buildroot}%{tde_sbindir} %{buildroot}%{_sbindir} -%__mv %{buildroot}%{tde_bindir}/kppp %{buildroot}%{tde_sbindir}/kppp3 -%__ln_s %{_bindir}/consolehelper %{buildroot}%{tde_bindir}/kppp3 -%if "%{tde_prefix}" != "/usr" -%__ln_s %{tde_sbindir}/kppp3 %{?buildroot}%{_sbindir}/kppp3 -%endif -%__mkdir_p %{buildroot}%{_sysconfdir}/security/console.apps -cat > %{buildroot}%{_sysconfdir}/security/console.apps/kppp3 <<EOF -USER=root -PROGRAM=%{tde_sbindir}/kppp3 -SESSION=true -EOF -%__sed -i %{buildroot}%{tde_tdeappdir}/Kppp.desktop -e "/Exec=/ s|kppp|kppp3|" - -# ktalk -%__install -p -m 0644 -D %{SOURCE2} %{buildroot}%{_sysconfdir}/xinetd.d/ktalk - -# Add lisa startup script -%__install -p -m 0644 -D %{SOURCE4} %{buildroot}%{_sysconfdir}/lisarc -%__install -p -m 0755 -D %{SOURCE5} %{buildroot}%{_initrddir}/lisa - -# RHEL 5: Avoids conflict with 'kdenetwork' -%if 0%{?rhel} == 5 -%__mv -f %{buildroot}%{_sysconfdir}/lisarc %{buildroot}%{_sysconfdir}/lisarc.tde -%endif - -# Avoids conflict with trinity-kvirc -%__mv -f %{buildroot}%{tde_datadir}/services/irc.protocol %{buildroot}%{tde_datadir}/apps/kopete/ - -%clean -%__rm -rf %{buildroot} - - - -%changelog -* Wed Aug 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-6 -- Renames to 'trinity-tdenetwork' -- Fix html special chars in kopete nowlistening plugin [Bug #944] [Commit #0a2892ed] -- Fix a fatal error message [Commit #5c988de1] -- Fix a parallel build bug [Commit #35c41f35] - -* Sat Jun 16 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-5 -- Split single package in multiple packages -- Removes useless 'Provides' -- Updates 'BuildRequires' -- Fix linear alphabet string errors [Commit #3516f9bc] -- Remove "More Applications" from TDE menu. [Bug #653] [Commit #f86a2538] -- Improve Kaffeine support in Kopete now listening plugin [Commit #f6708531] - -* Sun Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 -- Enable Kopete protocols & plugins compilation -- Enables all features (openslp, jingle, ...) on all distros -- Moves 'irc.protocol' file to prevent conflict with other packages - -* Thu Nov 17 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 -- Fix symbolic link to 'consolehelper' - -* Sat Nov 12 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 -- Removes conflict on file 'lisarc' for RHEL 5 - -* Sun Oct 30 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-1 -- Initial release for RHEL 6, RHEL 5 and Fedora 15 - -* Tue Oct 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-0 -- Import to GIT - diff --git a/redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch b/redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch deleted file mode 100644 index ebd9fa7fa..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.8-kppp.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up kdenetwork-3.5.8/kppp/Kppp.desktop.kppp kdenetwork-3.5.8/kppp/Kppp.desktop ---- kdenetwork-3.5.8/kppp/Kppp.desktop.kppp 2007-10-08 04:49:13.000000000 -0500 -+++ kdenetwork-3.5.8/kppp/Kppp.desktop 2007-10-13 16:03:03.000000000 -0500 -@@ -66,5 +66,4 @@ Path= - Type=Application - Terminal=false - X-KDE-StartupNotify=true --X-DCOP-ServiceType=Multi - Categories=Qt;KDE;Network;Dialup; diff --git a/redhat/tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch b/redhat/tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch deleted file mode 100644 index 8d7c53693..000000000 --- a/redhat/tdenetwork/kdenetwork-3.5.9-krfb_httpd.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff -ur kdenetwork-orig/krfb/krfb_httpd/krfb_httpd kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd ---- kdenetwork-orig/krfb/krfb_httpd/krfb_httpd 2007-05-14 09:40:05.000000000 +0200 -+++ kdenetwork-3.5.9/krfb/krfb_httpd/krfb_httpd 2008-02-26 12:43:21.000000000 +0100 -@@ -6,17 +6,14 @@ - fi - - read request url httptype || exit 0 --url="${url/ --/}" --httptype="${httptype/ --/}" -+url="${url/
/}" -+httptype="${httptype/
/}" - - if [ "x$httptype" != "x" ]; then - line="x" - while [ -n "$line" ]; do - read line || exit 0 -- line="${line/ --/}" -+ line="${line/
/}" - done - fi - # echo "url = $url, request = $request" >> /tmp/httpd.log -@@ -38,7 +35,7 @@ - content=" - <HTML><HEAD><TITLE>$LOGNAME's desktop</TITLE></HEAD> - <BODY> --<APPLET CODE=VncViewer.class ARCHIVE=VncViewer.jar WIDTH=$width HEIGHT=$height> -+<APPLET CODE=vncviewer/VNCViewer.class ARCHIVE=vncviewer.jar WIDTH=$width HEIGHT=$height> - <param name=PORT value=$port> - </APPLET> - </BODY></HTML>" diff --git a/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch b/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch deleted file mode 100644 index f93e68922..000000000 --- a/redhat/tdenetwork/kdenetwork-kopete-gcc45.patch +++ /dev/null @@ -1,57 +0,0 @@ -*** kdenetwork/kopete/protocols/testbed/testbedaccount.h.ORI 2011-08-24 00:30:58.403965000 +0200 ---- kdenetwork/kopete/protocols/testbed/testbedaccount.h 2011-08-24 00:31:29.706965000 +0200 -*************** -*** 59,65 **** - /** - * 'Connect' to the testbed server. Only sets myself() online. - */ -! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus::OnlineStatus() ); - /** - * Disconnect from the server. Only sets myself() offline. - */ ---- 59,65 ---- - /** - * 'Connect' to the testbed server. Only sets myself() online. - */ -! virtual void connect( const Kopete::OnlineStatus& initialStatus = Kopete::OnlineStatus() ); - /** - * Disconnect from the server. Only sets myself() offline. - */ -*** kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp.ORI 2011-08-24 00:28:22.080965001 +0200 ---- kdenetwork/kopete/kopete/contactlist/kopetegroupviewitem.cpp 2011-08-24 00:28:36.149965002 +0200 -*************** -*** 175,181 **** - // the sorting itself is rather slow. Therefore we call delayedSort, which tries - // to group multiple sort requests into one. - using namespace Kopete::UI::ListView; -! if ( ListView::ListView *lv = dynamic_cast<ListView::ListView *>( listView() ) ) - lv->delayedSort(); - else - listView()->sort(); ---- 175,181 ---- - // the sorting itself is rather slow. Therefore we call delayedSort, which tries - // to group multiple sort requests into one. - using namespace Kopete::UI::ListView; -! if ( ListView *lv = dynamic_cast<ListView *>( listView() ) ) - lv->delayedSort(); - else - listView()->sort(); -*** kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp.ORI 2011-08-24 00:29:00.953965001 +0200 ---- kdenetwork/kopete/kopete/chatwindow/krichtexteditpart.cpp 2011-08-24 00:29:21.080965001 +0200 -*************** -*** 38,44 **** - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) - { -! KopeteRichTextEditPart::KopeteRichTextEditPart( wparent, wname, false ); - } - - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) ---- 38,44 ---- - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *wparent, const char *wname, TQObject*, const char*, const TQStringList& ) - : KParts::ReadOnlyPart( wparent, wname ? wname : "rich_text_part" ) - { -! KopeteRichTextEditPart( wparent, wname, false ); - } - - KopeteRichTextEditPart::KopeteRichTextEditPart( TQWidget *parent, const char *name, int capabilities ) diff --git a/redhat/tdenetwork/lisa.redhat b/redhat/tdenetwork/lisa.redhat deleted file mode 100644 index bcc059e86..000000000 --- a/redhat/tdenetwork/lisa.redhat +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/bash -# -# Startup script for LISa -# -# chkconfig: - 92 36 -# description: LISa is a small daemon which is intended to run on \ -# end user systems. It provides something like a \ -# "network neighbourhood", but only relying on the TCP/IP \ -# protocol stack, no smb or whatever.\ -# The information about the hosts in your "neighbourhood" \ -# is provided via TCP port 7741. -# processname: lisa -# config: /etc/lisarc - -# Source function library. -. /etc/rc.d/init.d/functions - -# Source function library. -if [ -f /etc/init.d/functions ] ; then - . /etc/init.d/functions -elif [ -f /etc/rc.d/init.d/functions ] ; then - . /etc/rc.d/init.d/functions -else - exit 0 -fi - -# Some definitions. -lisa=/usr/bin/lisa -prog=LISa -OPTIONS="--quiet --config=/etc/lisarc" -RETVAL=0 - -# -start() { - echo -n $"Starting $prog: " - daemon $lisa $OPTIONS - RETVAL=$? - echo - if [ $RETVAL = 0 ] ; then - touch /var/lock/subsys/lisa - else - RETVAL=1 - fi - return $RETVAL -} - -stop() { - echo -n $"Stopping $prog: " - killproc $lisa - RETVAL=$? - echo - if [ $RETVAL = 0 ] ; then - rm -f /var/lock/subsys/lisa - else - RETVAL=1 - fi - return $RETVAL -} - -reload() { - echo -n $"Reloading $prog: " - killproc $lisa -HUP - RETVAL=$? - echo -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - status) - status $lisa - RETVAL=$? - ;; - restart) - stop - start - ;; - condrestart) - [ -f /var/lock/subsys/lisa ] && restart - ;; - *) - echo $"Usage: $prog {start|stop|restart|status|condrestart}" - exit 1 -esac - -exit $RETVAL diff --git a/redhat/tdenetwork/lisarc b/redhat/tdenetwork/lisarc deleted file mode 100644 index 9b5cc84d1..000000000 --- a/redhat/tdenetwork/lisarc +++ /dev/null @@ -1,10 +0,0 @@ -PingAddresses = 127.0.0.1/255.255.255.0; -PingNames = -AllowedAddresses = 127.0.0.1/255.255.255.0; -BroadcastNetwork = 127.0.0.1/255.255.255.0; -SearchUsingNmblookup = 0 -FirstWait = 30 -SecondWait = -1 -UpdatePeriod = 150 -DeliverUnnamedHosts = 1 -MaxPingsAtOnce = 256 diff --git a/redhat/tdenetwork/r1243951.diff b/redhat/tdenetwork/r1243951.diff deleted file mode 100644 index 1ee7d4e3b..000000000 --- a/redhat/tdenetwork/r1243951.diff +++ /dev/null @@ -1,42 +0,0 @@ -Index: kdenetwork/kopete/libkopete/avdevice/configure.in.in -=================================================================== ---- kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 0) -+++ kdenetwork/kopete/libkopete/avdevice/configure.in.in (revision 1243951) -@@ -0,0 +1,21 @@ -+# -- Check for libv4l1-videodev.h presence -------------------- -+ -+AC_MSG_CHECKING([for libv4l1-videodev.h]) -+ -+AC_TRY_COMPILE([ -+#include <libv4l1-videodev.h> -+], -+[ -+], -+ ac_have_libv4l1_videodev_h=yes -+, -+ ac_have_libv4l1_videodev_h=no -+) -+ -+if test $ac_have_libv4l1_videodev_h = yes; then -+ AC_DEFINE(HAVE_LIBV4L1_VIDEODEV_H, 1, [Define if you have libv4l1-videodev.h installed]) -+fi -+ -+AC_MSG_RESULT($ac_have_libv4l1_videodev_h) -+ -+# -- End libv4l1-videodev.h ---------------------------------------------- -Index: kdenetwork/kopete/libkopete/avdevice/videodevice.h -=================================================================== ---- kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243950) -+++ kdenetwork/kopete/libkopete/avdevice/videodevice.h (revision 1243951) -@@ -52,7 +52,11 @@ - - #include <linux/fs.h> - #include <linux/kernel.h> -+#if defined(HAVE_LIBV4L1_VIDEODEV_H) -+#include <libv4l1-videodev.h> -+#else - #include <linux/videodev.h> -+#endif - #define VIDEO_MODE_PAL_Nc 3 - #define VIDEO_MODE_PAL_M 4 - #define VIDEO_MODE_PAL_N 5 diff --git a/redhat/tdenetwork/tdenetwork-14.0.0.spec b/redhat/tdenetwork/tdenetwork-14.0.0.spec index 4f3efc16b..26958aa8b 100644 --- a/redhat/tdenetwork/tdenetwork-14.0.0.spec +++ b/redhat/tdenetwork/tdenetwork-14.0.0.spec @@ -52,14 +52,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: kppp.pamd Source2: ktalk - -# [kdenetwork] Missing LDFLAGS cause FTBFS -Patch1: kdenetwork-3.5.13-missing_ldflags.patch - -# RHEL4 specific -Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch -Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch - BuildRequires: cmake >= 2.8 BuildRequires: gettext BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -1116,12 +1108,6 @@ update-desktop-database 2> /dev/null || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ldflags - -%if 0%{?rhel} == 4 -%patch201 -p1 -b .rhel4 -%patch202 -p1 -b .rhel4 -%endif %build unset QTDIR QTINC QTLIB diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch b/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch deleted file mode 100644 index 6c3204712..000000000 --- a/redhat/tdenetwork/tdenetwork-3.5.13.2-fix_conflicting_definitions.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp.ORI 2013-06-17 19:40:31.327502606 +0200 -+++ trinity-tdenetwork-3.5.13.2/kopete/plugins/motionautoaway/motionawayplugin.cpp 2013-06-17 19:43:02.745097904 +0200 -@@ -44,32 +44,6 @@ - - #include "kopeteaccountmanager.h" - #include "kopeteaway.h" --/* The following is a hack: -- * e.g. Mandrake 9.x ships with a patched -- * kernel which doesn't define this 64 bit types (we need GNU C lib -- * because we use long long and warning - gcc extensions.) -- * -- * This is caused by the !defined(__STRICT_ANSI__) check in -- * /usr/include/asm/types.h -- */ --#if !defined(__u64) && defined(__GNUC__) --#if SIZEOF_UNSIGNED_LONG >= 8 --typedef unsigned long __u64; --#else --typedef unsigned long long __u64; --#endif --#endif -- --#if !defined(__s64) && defined(__GNUC__) --#if SIZEOF_LONG >= 8 --typedef signed long __s64; --#else --typedef __signed__ long long __s64; --#endif --#endif --/* -- * End hack -- */ - - #include <linux/version.h> - #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,5,50) diff --git a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec index 85229f43c..35dcfa815 100644 --- a/redhat/tdenetwork/tdenetwork-3.5.13.2.spec +++ b/redhat/tdenetwork/tdenetwork-3.5.13.2.spec @@ -52,19 +52,6 @@ Source0: %{name}-%{version}%{?preversion:~%{preversion}}.tar.gz Source1: kppp.pamd Source2: ktalk -# RedHat/Fedora legacy patches -Patch3: kdenetwork-3.5.8-kppp.patch -Patch4: kdenetwork-3.2.3-resolv.patch -# include more/proper ppp headers -Patch6: kdenetwork-3.5.9-krfb_httpd.patch - -# [kdenetwork] Missing LDFLAGS cause FTBFS -Patch1: kdenetwork-3.5.13-missing_ldflags.patch - -# RHEL4 specific -Patch201: kdenetwork-3.5.13.1-fix_rhel4_libraries.patch -Patch202: tdenetwork-3.5.13.2-fix_conflicting_definitions.patch - BuildRequires: cmake >= 2.8 BuildRequires: gettext BuildRequires: trinity-tqtinterface-devel >= %{tde_version} @@ -1075,15 +1062,6 @@ update-desktop-database 2> /dev/null || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .ldflags -%patch3 -p1 -b .kppp -%patch4 -p1 -b .resolv -%patch6 -p1 -b .krfb_httpd - -%if 0%{?rhel} == 4 -%patch201 -p1 -b .rhel4 -%patch202 -p1 -b .rhel4 -%endif %build unset QTDIR QTINC QTLIB |