diff options
Diffstat (limited to 'mandriva/2010.2/kdenetwork')
6 files changed, 0 insertions, 1781 deletions
diff --git a/mandriva/2010.2/kdenetwork/kde3-kdenetwork.spec b/mandriva/2010.2/kdenetwork/kde3-kdenetwork.spec deleted file mode 100644 index 6665781aa..000000000 --- a/mandriva/2010.2/kdenetwork/kde3-kdenetwork.spec +++ /dev/null @@ -1,997 +0,0 @@ -%define _requires_exceptions devel\(linux-gate\) - -%define lib_name_orig lib%{name} -%define lib_major 2 -%define lib_name %mklibname kdenetwork %lib_major -%define oname kdenetwork3 - -Name: kde3-kdenetwork -Version: 3.5.12 -Release: %mkrel 1 -Epoch: 2 -Group: Graphical desktop/KDE3 -Summary: K Desktop Environment - Network Applications -License: GPL -URL: http://www.kde.org -Source: ftp://ftp.kde.org/pub/kde/stable/%version/src/kdenetwork-%version.tar.bz2 -Source1: %{oname}-kppp.pamd -Source2: kdenetwork-lisa -Patch1: kdenetwork-3.5.7-add-slovenian-provider.patch -Patch2: kdenetwork-3.5.7-fix-kdebug-120625.patch -#Patch3: kdenetwork-3.5.8-fix-desktop-files.patch -#Patch4: kdenetwork-3.5.9-fix-underlinking.patch -Patch5: kdenetwork-3.5.10-wformat.patch -#Patch6: kdenetwork-3.5.10-gcc44.patch -#Patch7: kdenetwork-3.5.10-kopete_fix_yahoo.patch -Patch8: kde-3.5.10-acinclude.patch -#Patch9: fix_autotools.patch -Patch10: kdebase-3.5.12-move-xdg-menu-dir.patch -Patch11: kdebase-3.5.12-config.patch -BuildRoot: %_tmppath/%name-%version-%release-root -%if %mdkversion < 201000 -BuildRequires: autoconf <= 1:2.63 -%else -BuildRequires: autoconf >= 1:2.65 -%endif -BuildRequires: automake > 1.5 -BuildRequires: arts3-devel -BuildRequires: freetype2-devel -BuildRequires: kde3-macros -BuildRequires: gettext -BuildRequires: kdelibs-devel -BuildRequires: kdelibs-common >= 3.1.93-5mdk -BuildRequires: bzip2-devel -BuildRequires: jpeg-devel -BuildRequires: lcms-devel -BuildRequires: mng-devel -BuildRequires: png-devel -BuildRequires: wireless-tools -BuildRequires: avahi-compat-libdns_sd-devel -BuildRequires: avahi-client-devel -BuildRequires: mesaglut-devel -BuildRequires: X11-devel -BuildRequires: expat-devel -BuildRequires: speex-devel -BuildRequires: ortp-devel -BuildRequires: meanwhile-devel -BuildRequires: gadu-devel -BuildRequires: libopenssl-devel -BuildRequires: libopenslp-devel -BuildRequires: libaudiofile-devel -BuildRequires: libz-devel -BuildRequires: libxml2-devel -BuildRequires: libxslt-devel -BuildRequires: libiw-devel -BuildRequires: qca2-devel -BuildRequires: libidn-devel -BuildRequires: libgsmlib-devel -BuildRequires: libxtst-devel -Requires: %{name}-kdict = %epoch:%version-%release -Requires: %{name}-kget = %epoch:%version-%release -Requires: %{name}-ksirc = %epoch:%version-%release -Requires: %{name}-ktalk = %epoch:%version-%release -Requires: %{name}-krfb = %epoch:%version-%release -Requires: %{name}-kopete = %epoch:%version-%release -Requires: %{name}-knewsticker = %epoch:%version-%release -Obsoletes: %{name}-kxmlrpcd -Obsoletes: %lib_name-kxmlrpcd -Obsoletes: kdenetwork_kroupware -Obsoletes: kdenetwork_kroupware-kppp -Obsoletes: libkdenetwork_kroupware2 -Obsoletes: libkdenetwork_kroupware2-devel -Obsoletes: kit -Obsoletes: kdenetwork-kmail < 3.1.6 -Obsoletes: kdenetwork-knode < 3.1.6 -Obsoletes: kdenetwork-korn < 3.1.6 -Obsoletes: kdenetwork <= 2:3.5.10 -Obsoletes: %{oname}-kget -Obsoletes: %{oname}-ksirc -Obsoletes: %{oname}-ktalk -Obsoletes: %{oname}-krfb -Obsoletes: %{oname}-kopete -Obsoletes: %{oname}-knewsticker -Provides: %{oname} = %epoch:%version-%release - - -%description -Networking applications for the K Desktop Environment. - -- kdict: graphical client for the DICT protocol. -- kit: AOL instant messenger client, using the TOC protocol -- knewsticker: RDF newsticker applet -- kpf: public fileserver applet -- ksirc: IRC client -- ktalkd: talk daemon -- lanbrowsing: lan browsing kio slave -- krfb: Desktop Sharing server, allow others to access your desktop via VNC -- krdc: a client for Desktop Sharing and other VNC servers - -%if %mdkversion < 200900 -%post -p /sbin/ldconfig -%endif - -%if %mdkversion < 200900 -%postun -p /sbin/ldconfig -%endif - -%files - -#----------------------------------------------------------- - -%package common -Summary: Common files for kdenetwork -Group: Graphical desktop/KDE3 - -Requires: kdebase3-progs >= 3.1 -Requires: kdelibs3 >= 3.1.1-15mdk -Requires: %lib_name-common = %epoch:%version-%release -Obsoletes: %{name} < 2:3.5.9 -Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9 -Obsoletes: %lib_name-kxmlrpcd < 2:3.5.9 -Obsoletes: kdenetwork-common -Obsoletes: kdenetwork3-common -Provides: kdenetwork-common = %epoch:%version-%release -Provides: kdenetwork3-common = %epoch:%version-%release - -%description common -Common files for kdenetwork - -%files common -%defattr(-,root,root,-) -%_kde3_libdir/kde3/kfile_torrent.* -%_kde3_libdir/kde3/kio_zeroconf.* -%_kde3_datadir/services/emailwindow.desktop -%_kde3_datadir/services/kfile_torrent.desktop -%_kde3_bindir/feedbrowser -%_kde3_bindir/rssclient -%_kde3_bindir/rssservice - -%_kde3_datadir/services/kntsrcfilepropsdlg.desktop -%_kde3_appsdir/remoteview/* - -%dir %_kde3_appsdir/zeroconf/ -%_kde3_appsdir/zeroconf/* -%_kde3_datadir/services/kded/dnssdwatcher.desktop -%_kde3_libdir/kde3/kded_dnssdwatcher.* -%_kde3_datadir/services/zeroconf.protocol - -# KPF -%dir %_kde3_docdir/HTML/en/kpf/ -%doc %_kde3_docdir/HTML/en/kpf/* -%_kde3_appsdir/kicker/applets/kpfapplet.desktop -%_kde3_datadir/icons/*/*/*/kpf.png -%_kde3_libdir/kde3/kpf_panelapplet.* -%_kde3_libdir/kde3/kpfpropertiesdialog.* -%_kde3_datadir/services/kpfpropertiesdialogplugin.desktop - -#----------------------------------------------------------- - -%package -n %lib_name-common -Group: System/Libraries -Summary: Libraries for kdenetwork -Obsoletes: %lib_name < 2:3.5.9 -Provides: %lib_name = %epoch:%version-%release -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9 -Obsoletes: %lib_name-kxmlrpcd < 2:3.5.9 - -%description -n %lib_name-common -Libraries for kdenetwork. - -%if %mdkversion < 200900 -%post -n %lib_name-common -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %lib_name-common -p /sbin/ldconfig -%endif - -%files -n %lib_name-common -%defattr(-,root,root,-) -%_kde3_libdir/librss.la -%_kde3_libdir/librss.so.* - -#----------------------------------------------------------- - -%package devel -Summary: Header files for kdenetwork -Group: Development/KDE and Qt -Obsoletes: %lib_name-kopete-devel < 2:3.5.7-%mkrel 4 -Obsoletes: %lib_name-common-devel < 2:3.5.7-%mkrel 4 -Obsoletes: %lib_name-devel < 2:3.5.7-%mkrel 4 -Provides: %lib_name-kopete-devel = %epoch:%version -Provides: %lib_name-common-devel = %epoch:%version -Provides: %lib_name-devel = %epoch:%version -Requires: %lib_name-common = %epoch:%version -Requires: %lib_name-kopete = %epoch:%version -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-devel <= 2:3.5.10 -Obsoletes: kdenetwork-devel -Obsoletes: kdenetwork3-devel -Provides: kdenetwork-devel = %epoch:%version-%release -Provides: kdenetwork3-devel = %epoch:%version-%release - -%description devel -Header files for kdenetwork. - -%files devel -%defattr(-,root,root,-) -%_kde3_libdir/*.so -%_kde3_includedir/* -%exclude %_kde3_libdir/libkdeinit_* -%exclude %_kde3_libdir/libkwireless.* - -#----------------------------------------------------------- - -%package kopete -Group: Graphical desktop/KDE3 -Summary: Kopete -Requires: %{name}-common >= %epoch:%version-%release -Requires: %lib_name-kopete >= %epoch:%version-%release -Provides: kopete3 -Provides: kde3-kopete -Obsoletes: kopete <= 0.7.1-7mdk -Obsoletes: kopete = %epoch:%version-%release -Obsoletes: kdenetwork-kopete-nowlistening < %epoch:3.5.4 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-kopete -Obsoletes: kdenetwork3-kopete -Provides: kdenetwork-kopete = %epoch:%version-%release -Provides: kdenetwork3-kopete = %epoch:%version-%release -Conflicts: lisa < 1:3.4.2-11mdk - -BuildConflicts: xmms-devel -#Need for yahoo webcam -Requires: jasper - -%description kopete -Kopete is a flexible and extendable multiple protocol instant messaging -system designed as a plugin-based system. - -All protocols are plugins and allow modular installment, configuration, -and usage without the main application knowing anything about the plugin -being loaded. - -The goal of Kopete is to provide users with a standard and easy to use -interface between all of their instant messaging systems, but at the same -time also providing developers with the ease of writing plugins to support -a new protocol. - -The core Kopete development team provides a handful of plugins that most -users can use, in addition to templates for new developers to base a -plugin off of. - -%post kopete -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun kopete -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files kopete -%defattr(-,root,root,-) -%_kde3_bindir/kopete -%_kde3_bindir/winpopup-* -%_kde3_libdir/kconf_update_bin/kopete-nameTracking-kconf_update -%dir %_kde3_docdir/HTML/en/kopete -%doc %_kde3_docdir/HTML/en/kopete/* -%_kde3_appsdir/kopete* -%_kde3_appsdir/kconf_update/kopete-* -%_kde3_datadir/applications/kde/kopete.desktop -%_kde3_libdir/kde3/kopete_* -%_kde3_libdir/kde3/kcm_kopete_* -%_kde3_libdir/kde3/libkrichtexteditpart.* -%_kde3_datadir/services/kconfiguredialog/kopete_* -%_kde3_datadir/sounds/*.ogg -%_kde3_datadir/servicetypes/kopete*.desktop -%_kde3_datadir/services/kopete*.desktop -%_kde3_datadir/mimelnk/application/x-icq.desktop -%_kde3_datadir/mimelnk/application/x-kopete-emoticons.desktop -%dir %_kde3_datadir/config.kcfg/ -%_kde3_datadir/config.kcfg/historyconfig.kcfg -%_kde3_datadir/services/chatwindow.desktop -%_kde3_datadir/services/rdp.protocol -%_kde3_datadir/services/rssservice.desktop -%_kde3_datadir/services/aim.protocol -%_kde3_datadir/services/irc.protocol -%_kde3_iconsdir/*/*/*/kopete* -%_kde3_iconsdir/*/*/*/jabber* -%_kde3_iconsdir/*/*/*/webcam* -%_kde3_iconsdir/*/*/*/*_user* -%_kde3_iconsdir/*/*/*/*_offliners* -%_kde3_iconsdir/*/*/*/voice* -%_kde3_iconsdir/*/*/*/meta* -%_kde3_iconsdir/*/*/*/account* -%_kde3_iconsdir/*/*/*/emotico* -%_kde3_iconsdir/*/*/*/new* -%_kde3_iconsdir/*/*/*/contact* -%_kde3_iconsdir/*/*/*/status* -%_kde3_datadir/config.kcfg/kopete.kcfg -%_kde3_datadir/config.kcfg/kopeteidentityconfigpreferences.kcfg -%_kde3_datadir/services/invitation.protocol -%_kde3_datadir/services/jabberdisco.protocol -%exclude %_kde3_libdir/kde3/kcm_kopete_latex.* -%exclude %_kde3_libdir/kde3/kopete_latex.* -%exclude %_kde3_datadir/services/kopete_latex.desktop -%exclude %_kde3_datadir/services/kconfiguredialog/kopete_latex_config.desktop -%exclude %_kde3_appsdir/kopete/icons/crystalsvg/32x32/apps/latex.png -%exclude %_kde3_datadir/config.kcfg/nowlisteningconfig.kcfg - -#----------------------------------------------------------- - -%package kopete-latex -Group: Graphical desktop/KDE3 -Summary: Kopete latex plugin for write andd read mesages in latex -Requires: %{name}-kopete -Requires: ImageMagick -Obsoletes: kdenetwork-kopete-latex -Obsoletes: kdenetwork3-kopete-latex -Provides: kdenetwork-kopete-latex = %epoch:%version-%release -Provides: kdenetwork3-kopete-latex = %epoch:%version-%release - -%description kopete-latex -Kopete latex plugin for write andd read mesages in latexinder - -%files kopete-latex -%defattr(-,root,root,-) -%_kde3_libdir/kde3/kcm_kopete_latex.* -%_kde3_libdir/kde3/kopete_latex.* -%_kde3_datadir/services/kopete_latex.desktop -%_kde3_datadir/config.kcfg/latexconfig.kcfg -%_kde3_bindir/kopete_latexconvert.sh -%_kde3_datadir/services/kconfiguredialog/kopete_latex_config.desktop -%_kde3_appsdir/kopete/icons/crystalsvg/32x32/apps/latex.png - -#----------------------------------------------------------- - -%package -n %lib_name-kopete -Summary: Multi-protocol plugin-based instant messenger -Group: System/Libraries -Obsoletes: libkopete1 < 2:3.5.9 -Provides: libkopete1 = %epoch:%version-%release -Conflicts: libkopete1 <= 0.7.1-7mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk - -%description -n %lib_name-kopete -Kopete is a flexible and extendable multiple protocol instant messaging -system designed as a plugin-based system. - -All protocols are plugins and allow modular installment, configuration, -and usage without the main application knowing anything about the plugin -being loaded. - -The goal of Kopete is to provide users with a standard and easy to use -interface between all of their instant messaging systems, but at the same -time also providing developers with the ease of writing plugins to support -a new protocol. - -The core Kopete development team provides a handful of plugins that most -users can use, in addition to templates for new developers to base a -plugin off of. - -%if %mdkversion < 200900 -%post -n %lib_name-kopete -p /sbin/ldconfig -%endif -%if %mdkversion < 200900 -%postun -n %lib_name-kopete -p /sbin/ldconfig -%endif - -%files -n %lib_name-kopete -%defattr(-, root, root) -%_kde3_libdir/libkopete*.so.* -%_kde3_libdir/libkopete*.la -%_kde3_libdir/kconf_update_bin/kopete-account-kconf_update -%_kde3_libdir/kconf_update_bin/kopete-pluginloader2-kconf_update - -#----------------------------------------------------------- - -%package -n lisa -Group: Graphical desktop/KDE3 -Summary: Lisa server -Requires: %{name}-common >= %{epoch}:%version-%release -Obsoletes: ksambaplugin <= 0.5 -Obsoletes: %{name}-lisa <= 2:3.5.10 -Conflicts: kdenetwork-common < 1:3.4.2-11mdk -Conflicts: kdenetwork-kopete < 1:3.4.2-11mdk - - -%description -n lisa -LISa is intended to provide a kind of "network neighbourhood" but only -relying on the TCP/IP protocol stack, no smb or whatever. - -%post -n lisa -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif -%_post_service lisa - -%preun -n lisa -%_preun_service lisa - -%postun -n lisa -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files -n lisa -%defattr(-,root,root) -%_kde3_bindir/lisa -%_kde3_bindir/reslisa -%dir %_kde3_datadir/applnk/.hidden/ -%_kde3_datadir/applnk/.hidden/kcmkiolan.desktop -%_kde3_datadir/applnk/.hidden/kcmlisa.desktop -%_kde3_datadir/applnk/.hidden/kcmreslisa.desktop -%dir %_kde3_docdir/HTML/en/kcontrol/lanbrowser/ -%doc %_kde3_docdir/HTML/en/kcontrol/lanbrowser/* -%_kde3_datadir/services/fileshare_propsdlgplugin.desktop -%_kde3_iconsdir/*/*/*/kcmsambaconf.png -%_kde3_datadir/applications/kde/fileshare.desktop -%_kde3_datadir/applications/kde/kcmsambaconf.desktop -%_kde3_appsdir/konqueror/dirtree/remote/lan.desktop -%_kde3_libdir/kde3/kio_lan.* -%_kde3_libdir/kde3/kcm_lanbrowser.* -%_kde3_libdir/kde3/fileshare_propsdlgplugin.* -%_kde3_libdir/kde3/kcm_fileshare.* -%_kde3_libdir/kde3/kcm_kcmsambaconf.* -%_kde3_appsdir/konqsidebartng/virtual_folders/services/lisa.desktop -%_kde3_appsdir/konqueror/servicemenus/smb2rdc.desktop -%dir %_kde3_datadir/services/ -%_kde3_datadir/services/lan.protocol -%_kde3_datadir/services/rlan.protocol -%dir %_kde3_appsdir/lisa/ -%_kde3_appsdir/lisa/README -%dir %_kde3_docdir/HTML/en/lisa -%doc %_kde3_docdir/HTML/en/lisa/* -%config(noreplace) /etc/rc.d/init.d/lisa - -#----------------------------------------------------------- - -%package ktalk -Group: Graphical desktop/KDE3 -Summary: Ktalk program -Provides: ktalk3 -Provides: kde3-ktalk -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Conflicts: kdenetwork-ktalk < 2:3.5.9-4 -Obsoletes: kdenetwork-ktalk -Obsoletes: kdenetwork3-ktalk -Provides: kdenetwork-ktalk = %epoch:%version-%release -Provides: kdenetwork3-ktalk = %epoch:%version-%release - -%description ktalk -ktalk is a graphical talk client capable of multiple connections. It contains -an addressbook and provides word-wrap, copy and paste, configurable fonts, -ping, and file transfer. - -%post ktalk -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun ktalk -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files ktalk -%defattr(-,root,root,-) -%_kde3_bindir/ktalkd -%_kde3_bindir/ktalkdlg -%_kde3_bindir/mail.local -%dir %_kde3_docdir/HTML/en/ktalkd/ -%doc %_kde3_docdir/HTML/en/ktalkd/* -%_kde3_libdir/kde3/kcm_ktalkd.* -%dir %_kde3_datadir/sounds/ -%_kde3_datadir/sounds/ktalkd.wav -%_kde3_datadir/applications/kde/kcmktalkd.desktop -%_kde3_datadir/config/ktalkdrc -%dir %_kde3_docdir/HTML/en/kcontrol/kcmtalkd/ -%doc %_kde3_docdir/HTML/en/kcontrol/kcmtalkd/* -%_kde3_iconsdir/*/*/*/ktalkd* - -#----------------------------------------------------------- - -%package kppp -Group: Graphical desktop/KDE3 -Summary: Dialer and front end for pppd -Requires: ppp, %{name}-kppp-provider -Provides: kppp3 -Provides: kde3-kppp -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Conflicts: kdenetwork-kppp < 2:3.5.9-4 -Obsoletes: kdenetwork-kppp -Obsoletes: kdenetwork3-kppp -Provides: kdenetwork-kppp = %epoch:%version-%release -Provides: kdenetwork3-kppp = %epoch:%version-%release - -%description kppp -Kppp is a dialer and front end for pppd. - -%post kppp -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun kppp -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files kppp -%defattr(-,root,root,-) -%dir %_sysconfdir/pam.d/ -%config(noreplace) %_sysconfdir/pam.d/kppp3 -%attr(4755,root,root) %_kde3_bindir/kppp -%_kde3_bindir/kppplogview -%dir %_kde3_appsdir/kppp -%_kde3_appsdir/kppp/* -%_kde3_datadir/applications/kde/Kppp.desktop -%_kde3_datadir/applications/kde/kppplogview.desktop -%_kde3_iconsdir/*/*/*/kppp.png -%dir %_kde3_docdir/HTML/en/kppp/ -%doc %_kde3_docdir/HTML/en/kppp/* -%exclude %_kde3_appsdir/kppp/Rules -%exclude %_kde3_appsdir/kppp/Provider - -#----------------------------------------------------------- - -%package kppp-provider -Group: Graphical desktop/KDE3 -Summary: List of providers for pppd -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-kppp-provider -Obsoletes: kdenetwork3-kppp-provider -Provides: kdenetwork-kppp-provider = %epoch:%version-%release -Provides: kdenetwork3-kppp-provider = %epoch:%version-%release - -%description kppp-provider -List of providers for kppp - -%files kppp-provider -%defattr(-,root,root,-) -%_kde3_appsdir/kppp/Rules -%_kde3_appsdir/kppp/Provider - -#----------------------------------------------------------- - -%package ksirc -Group: Graphical desktop/KDE3 -Summary: KDE IRC -Provides: ksirc3 -Provides: kde3-ksirc -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9 -Obsoletes: %lib_name-ksirc < 2:3.5.9 -Obsoletes: kdenetwork-ksirc <= 2:3.5.10 -Obsoletes: kdenetwork-ksirc -Obsoletes: kdenetwork3-ksirc -Provides: kdenetwork-ksirc = %epoch:%version-%release -Provides: kdenetwork3-ksirc = %epoch:%version-%release - -%description ksirc -KDE internet relay chat client. - -%post ksirc -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun ksirc -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files ksirc -%defattr(-,root,root,-) -%_kde3_bindir/ksirc -%_kde3_bindir/dsirc -%_kde3_datadir/applications/kde/ksirc.desktop -%dir %_kde3_docdir/HTML/en/ksirc/ -%doc %_kde3_docdir/HTML/en/ksirc/* -%_kde3_datadir/config/ksircrc -%_kde3_libdir/kde3/ksirc.* -%dir %_kde3_appsdir/ksirc/ -%_kde3_appsdir/ksirc/* -%_kde3_iconsdir/*/*/*/ksirc.png -%_kde3_libdir/libkdeinit_ksirc.* - -#----------------------------------------------------------- - -%package kwifimanager -Group: Graphical desktop/KDE3 -Summary: KWifimanager -Provides: kwifimanager3 -Provides: kde3-kwifimanager -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common < 1:3.4.2-11mdk -Requires: wireless-tools -Obsoletes: %lib_name-kwifimanager < 2:3.5.9 -Obsoletes: kdenetwork-kwifimanager -Obsoletes: kdenetwork3-kwifimanager -Provides: kdenetwork-kwifimanager = %epoch:%version-%release -Provides: kdenetwork3-kwifimanager = %epoch:%version-%release - -%description kwifimanager -A wireless LAN connection monitor. - -%post kwifimanager -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun kwifimanager -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files kwifimanager -%defattr(-,root,root,-) -%_kde3_bindir/kwifimanager -%_kde3_datadir/applications/kde/kcmwifi.desktop -%_kde3_datadir/applications/kde/kwifimanager.desktop -%_kde3_appsdir/kicker/applets/kwireless.desktop -%dir %_kde3_appsdir/kwifimanager/ -%_kde3_appsdir/kwifimanager/* -%_kde3_iconsdir/*/*/*/kwifimanager* -%_kde3_libdir/libkwireless.* -%_kde3_libdir/kde3/kcm_wifi.* -%dir %_kde3_docdir/HTML/en/kwifimanager/ -%doc %_kde3_docdir/HTML/en/kwifimanager/* - -#----------------------------------------------------------- - -%package kdict -Group: Graphical desktop/KDE3 -Summary: Kdict program -Provides: kdict3 -Provides: kde3-kdict -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-kxmlrpcd < 2:3.5.9 -Obsoletes: %lib_name-kdict < 2:3.5.9 -Obsoletes: kdenetwork-kdict -Obsoletes: kdenetwork3-kdict -Provides: kdenetwork-kdict = %epoch:%version-%release -Provides: kdenetwork3-kdict = %epoch:%version-%release - -%description kdict -Kdict is a graphical client for the DICT Protocol. It enables you -to search through dictionary-like databases for a word or phrase, then -displays suitable definitions. - -%post kdict -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun kdict -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files kdict -%defattr(-,root,root,-) -%_kde3_bindir/kdict -%dir %_kde3_docdir/HTML/en/kdict/ -%doc %_kde3_docdir/HTML/en/kdict/* -%dir %_kde3_appsdir/kdict/ -%_kde3_appsdir/kdict/* -%_kde3_datadir/applications/kde/kdict.desktop -%_kde3_libdir/kde3/kdict_panelapplet.* -%_kde3_appsdir/kicker/applets/kdictapplet.desktop -%_kde3_iconsdir/*/*/*/kdict* -%_kde3_libdir/kde3/kdict.* -%_kde3_libdir/kde3/kio_jabberdisco.* -%_kde3_libdir/libkdeinit_kdict.* - -#----------------------------------------------------------- - -%package kget -Group: Graphical desktop/KDE3 -Summary: Kget program -Provides: kget3 -Provides: kde3-kget -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-kget -Obsoletes: kdenetwork3-kget -Provides: kdenetwork-kget = %epoch:%version-%release -Provides: kdenetwork3-kget = %epoch:%version-%release - -%description kget -An advanced download manager for KDE. - -%post kget -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun kget -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files kget -%defattr(-,root,root,-) -%_kde3_bindir/kget -%dir %_kde3_appsdir/kget/ -%_kde3_appsdir/kget/* -%_kde3_appsdir/khtml/kpartplugins/kget_plug_in.desktop -%_kde3_libdir/kde3/khtml_kget.* -%_kde3_datadir/applications/kde/kget.desktop -%_kde3_datadir/mimelnk/application/x-kgetlist.desktop -%_kde3_appsdir/khtml/kpartplugins/kget_plug_in.rc -%_kde3_iconsdir/*/*/*/khtml_kget* -%_kde3_iconsdir/*/*/*/kget* -%dir %_kde3_docdir/HTML/en/kget/ -%doc %_kde3_docdir/HTML/en/kget/* - -%_kde3_appsdir/konqueror/servicemenus/kget_download.desktop - -#----------------------------------------------------------- - -%package krfb -Group: Graphical desktop/KDE3 -Summary: Krfb, Krdc program -Provides: krdc3 -Provides: krfb3 -Provides: kde3-krdc -Provides: kde3-krfb -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common <= 3.1.3-37mdk -Obsoletes: kdenetwork-krfb -Obsoletes: kdenetwork3-krfb -Provides: kdenetwork-krfb = %epoch:%version-%release -Provides: kdenetwork3-krfb = %epoch:%version-%release - -%description krfb -KDE Desktop Sharing allows you to invite somebody at a remote -location to watch and possibly control your desktop. - -%post krfb -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun krfb -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files krfb -%defattr(-,root,root,-) -%_kde3_bindir/krdc -%_kde3_bindir/krfb -%_kde3_bindir/krfb_httpd -%_kde3_datadir/services/vnc.protocol -%_kde3_datadir/services/kinetd_krfb.desktop -%dir %_kde3_appsdir/kinetd/ -%_kde3_appsdir/kinetd/* -%dir %_kde3_docdir/HTML/en/krfb/ -%doc %_kde3_docdir/HTML/en/krfb/* -%doc %_kde3_docdir/HTML/en/krdc/* -%_kde3_datadir/applications/kde/kcmkrfb.desktop -%_kde3_datadir/applications/kde/krdc.desktop -%_kde3_datadir/applications/kde/krfb.desktop -%dir %_kde3_appsdir/krfb/ -%_kde3_appsdir/krfb/* -%dir %_kde3_appsdir/krdc/ -%_kde3_appsdir/krdc/* -%_kde3_libdir/kde3/kcm_krfb.* -%_kde3_libdir/kde3/kded_kinetd.* -%_kde3_iconsdir/*/*/*/krfb* -%_kde3_iconsdir/*/*/*/krdc* -%_kde3_datadir/servicetypes/kinetdmodule.desktop -%_kde3_datadir/services/kded/kinetd.desktop -%_kde3_datadir/services/kinetd_krfb_httpd.desktop - -#----------------------------------------------------------- - -%package knewsticker -Group: Graphical desktop/KDE3 -Summary: RDF newsticker applet -Provides: knewsticker3 -Provides: kde3-knewsticker -Obsoletes: %lib_name-knewsticker < 2:3.5.9 -Conflicts: kdenetwork <= 3.1-31mdk -Conflicts: kdepim <= 3.1.92 -Conflicts: kdenetwork-common < 1:3.4.2-11mdk -Obsoletes: kdenetwork-knewsticker -Obsoletes: kdenetwork3-knewsticker -Provides: kdenetwork-knewsticker = %epoch:%version-%release -Provides: kdenetwork3-knewsticker = %epoch:%version-%release - -%description knewsticker -Knewsticker: RDF newsticker applet - -%post knewsticker -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%update_menus -%endif - -%postun knewsticker -%if %mdkversion < 200900 -/sbin/ldconfig -%endif -%if %mdkversion < 200900 -%clean_menus -%endif - -%files knewsticker -%defattr(-,root,root,-) -%_kde3_bindir/knewstickerstub -%dir %_kde3_docdir/HTML/en/knewsticker/ -%doc %_kde3_docdir/HTML/en/knewsticker/* -%_kde3_datadir/applications/kde/knewsticker-standalone.desktop -%dir %_kde3_appsdir/knewsticker/ -%_kde3_appsdir/knewsticker/* -%_kde3_appsdir/kicker/applets/knewsticker.desktop -%dir %_kde3_appsdir/kconf_update/ -%_kde3_appsdir/kconf_update/knewsticker.upd -%_kde3_appsdir/kconf_update/knt-0.1-0.2.pl -%_kde3_iconsdir/*/*/*/knewsticker.png -%_kde3_datadir/applnk/.hidden/knewstickerstub.desktop -%_kde3_libdir/kde3/knewsticker_panelapplet.* -%_kde3_libdir/kde3/libkntsrcfilepropsdlg.* - -#----------------------------------------------------------- - -%prep -%setup -q -n kdenetwork-%version -%patch1 -p0 -%patch2 -p1 -#%patch3 -p0 -#%patch4 -p0 -%patch5 -p0 -#%patch6 -p1 -#%patch7 -p0 -%patch8 -p1 -#%patch9 -p1 -%patch10 -p0 -%patch11 -p0 - -%build - -PATH=%{qt3dir}/bin:%{_kde3_bindir}:$PATH; export PATH; -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/kde3/lib/ -export xdg_menudir=%_sysconfdir/xdg/kde/menus - -make -f admin/Makefile.common cvs - -%configure_kde3 \ - --with-extra-includes=/usr/include/avahi-compat-libdns_sd/:/opt/kde3/include/tqt \ - --with-extra-libs=/opt/kde3/lib \ - --without-xmms - -%make - -%install -rm -fr %buildroot -%makeinstall_std - -install -d -m 0755 %buildroot/etc/rc.d/init.d -install -m 0755 %SOURCE2 %buildroot/etc/rc.d/init.d/lisa - -install -d -m 0755 %buildroot/%_sysconfdir/pam.d/ -install -m 0644 %SOURCE1 %buildroot/%_sysconfdir/pam.d/kppp3 - -%clean -rm -fr %buildroot - - -%changelog -* Fri Jul 22 2010 Tim Williams <tim@my-place.org.uk> 2:3.5.12-1mvt2010.2 -+ Update to Trinity 3.5.12 sources -+ Add xdg and build process patches -+ Fix kdenetwork-3.5.7-fix-kdebug-120625.patch -- Remove kdenetwork-3.5.8-fix-desktop-files.patch -- Remove kdenetwork-3.5.9-fix-underlinking.patch -- Remove kdenetwork-3.5.10-gcc44.patch -- Remove kdenetwork-3.5.10-kopete_fix_yahoo.patch - -* Mon Jul 19 2010 Tim Williams <tim@my-place.org.uk> 2:3.5.10-8mvt2010.0 -+ Rebuild for MDV 2010.1 - -* Tue Jan 12 2010 Atilla ÖNTAŞ <atilla_ontas@mandriva.org> 2:3.5.10-7mvt2010.0 -+ Rebuilt for 2010.0 -+ Fix automake 1.11 and autoconf 2.64 incompability -+ Fix kopete yahoo protocol - -* Thu Apr 23 2009 Frederic Crozat <fcrozat@mandriva.com> 2:3.5.10-5mdv2009.1 -+ Revision: 368894 -- Fix uninstallable package - -* Wed Apr 22 2009 Frederic Crozat <fcrozat@mandriva.com> 2:3.5.10-4mdv2009.1 -+ Revision: 368670 -- Fix incorrect dependency on kdenetwork-common (Mdv bug #50180) - -* Wed Apr 22 2009 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.10-3mdv2009.1 -+ Revision: 368612 -- Fix conflicts - -* Fri Apr 03 2009 Nicolas Lécureuil <neoclust@mandriva.org> 2:3.5.10-2mdv2009.1 -+ Revision: 363689 -- Fix Requires for lisa - -* Thu Apr 02 2009 Helio Chissini de Castro <helio@mandriva.com> 2:3.5.10-1mdv2009.1 -+ Revision: 363587 -- Pushing back kde3 kdenetwork :-/ -- Another headache generated for the bring kde3 back to live - - + Nicolas Lécureuil <neoclust@mandriva.org> - - import kdenetwork - diff --git a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.10-wformat.patch b/mandriva/2010.2/kdenetwork/kdenetwork-3.5.10-wformat.patch deleted file mode 100644 index a71d30713..000000000 --- a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.10-wformat.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- kopete/plugins/statistics/sqlite/shell.c.orig 2009-04-02 20:04:41.000000000 +0200 -+++ kopete/plugins/statistics/sqlite/shell.c 2009-04-02 20:29:12.000000000 +0200 -@@ -356,7 +356,7 @@ - output_c_string(p->out, z); - } - if( bSep ){ -- fprintf(p->out, p->separator); -+ fprintf(p->out, "%s", p->separator); - } - } - -@@ -1005,7 +1005,7 @@ - }else - - if( c=='h' && strncmp(azArg[0], "help", n)==0 ){ -- fprintf(stderr,zHelp); -+ fprintf(stderr, "%s", zHelp); - }else - - if( c=='i' && strncmp(azArg[0], "import", n)==0 && nArg>=3 ){ ---- kopete/plugins/statistics/sqlite/vdbe.c.orig 2009-04-02 20:30:39.000000000 +0200 -+++ kopete/plugins/statistics/sqlite/vdbe.c 2009-04-02 20:31:02.000000000 +0200 -@@ -361,7 +361,7 @@ - } - } - zBuf[k++] = ']'; -- k += sprintf(&zBuf[k], encnames[pMem->enc]); -+ k += sprintf(&zBuf[k], "%s", encnames[pMem->enc]); - zBuf[k++] = 0; - } - } diff --git a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-add-slovenian-provider.patch b/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-add-slovenian-provider.patch deleted file mode 100644 index c987c7f20..000000000 --- a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-add-slovenian-provider.patch +++ /dev/null @@ -1,449 +0,0 @@ ---- kppp/DB/Provider/Slovenia/AmisNet.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/AmisNet 2007-05-29 17:15:17.000000000 +0200 -@@ -1,6 +1,6 @@ - # KDE Config File --# $Id: AmisNet 129308 2001-12-31 13:24:17Z romanm $ --# $Source$ -+# $Id: AmisNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/AmisNet,v $ - # - Name=AmisNet - AccountingEnabled=1 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/AgendaSloN 2007-05-29 17:16:29.000000000 +0200 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=AgendaSloN -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0889.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088932380 ---- kppp/DB/Provider/Slovenia/Arnes.old 2007-05-29 17:18:20.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Arnes 2005-03-10 10:12:11.000000000 +0100 -@@ -1,6 +1,6 @@ - # KDE Config File --# $Id: Arnes 129303 2001-12-31 12:48:40Z romanm $ --# $Source$ -+# $Id: Arnes,v 1.1 2001/12/31 12:48:40 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Arnes,v $ - # - Name=Arnes - AccountingEnabled=1 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/K2Net 2005-03-10 11:27:25.000000000 +0100 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=K2Net -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0889.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088932340 ---- kppp/DB/Provider/Slovenia/Kiss.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Kiss 2005-03-10 10:12:11.000000000 +0100 -@@ -1,6 +1,6 @@ - # KDE Config File --# $Id: Kiss 129303 2001-12-31 12:48:40Z romanm $ --# $Source$ -+# $Id: Kiss,v 1.1 2001/12/31 12:48:40 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Kiss,v $ - # - Name=Kiss - AccountingEnabled=1 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/MWdialup386 2005-03-10 11:39:56.000000000 +0100 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=MWdialup386 -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0888.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088832666 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/MaSiCoM 2005-03-10 11:32:34.000000000 +0100 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=MaSiCoM -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0888.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088832999 ---- kppp/DB/Provider/Slovenia/MojNet.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/MojNet 2005-03-10 10:12:11.000000000 +0100 -@@ -1,6 +1,6 @@ - # KDE Config File --# $Id: MojNet 129308 2001-12-31 13:24:17Z romanm $ --# $Source$ -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ - # - Name=MojNet - AccountingEnabled=1 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Netsi 2005-03-10 11:44:18.000000000 +0100 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=Netsi -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0889.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088932430 ---- /dev/null 2006-08-21 11:51:14.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Perftech 2005-03-10 11:30:46.000000000 +0100 -@@ -0,0 +1,27 @@ -+# KDE Config File -+# $Id: MojNet,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/MojNet,v $ -+# -+Name=Perftech -+AccountingEnabled=1 -+AccountingFile=/Slovenia/omrezje_0888.rst -+Authentication=1 -+AutoName=0 -+Command= -+DNS= -+AutoDNS=1 -+DefaultRoute=1 -+DisconnectCommand= -+Domain=moj.net -+ExDNSDisabled=0 -+Gateway=0.0.0.0 -+IPAddr=0.0.0.0 -+Password=%PASSWORD% -+ScriptArguments= -+ScriptCommands= -+StorePassword=1 -+SubnetMask=0.0.0.0 -+Username=%USERNAME% -+VolumeAccountingEnabled=0 -+pppdArguments= -+Phonenumber=088832360 - ---- kppp/DB/Provider/Slovenia/SiOL.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/SiOL 2005-03-10 10:12:11.000000000 +0100 -@@ -1,6 +1,6 @@ - # KDE Config File --# $Id: SiOL 129600 2002-01-02 21:25:21Z romanm $ --# $Source$ -+# $Id: SiOL,v 1.2 2002/01/02 21:25:21 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/SiOL,v $ - # - Name=SiOL - AccountingEnabled=1 ---- kppp/DB/Provider/Slovenia/Volja.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Volja 2005-03-10 11:53:30.000000000 +0100 -@@ -1,10 +1,10 @@ - # KDE Config File --# $Id: Volja 129308 2001-12-31 13:24:17Z romanm $ --# $Source$ -+# $Id: Volja,v 1.2 2001/12/31 13:24:17 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/DB/Provider/Slovenia/Volja,v $ - # - Name=Volja - AccountingEnabled=1 --AccountingFile=/Slovenia/omrezje_0889.rst -+AccountingFile=/Slovenia/omrezje_0888.rst - Authentication=1 - AutoName=0 - Command= -@@ -24,4 +24,4 @@ - Username=%USERNAME% - VolumeAccountingEnabled=0 - pppdArguments= --Phonenumber=088932480 -+Phonenumber=088832480 ---- kppp/DB/Provider/Slovenia/Makefile.am.old 2005-09-10 10:20:35.000000000 +0200 -+++ kppp/DB/Provider/Slovenia/Makefile.am 2007-05-29 17:45:49.000000000 +0200 -@@ -1,4 +1,4 @@ --pkg_DATA = AmisNet Arnes Kiss MojNet SiOL Volja -+pkg_DATA = AgendaSloN AmisNet Arnes K2Net Kiss MWdialup386 MaSiCoM MojNet Netsi Perftech SiOL Volja - - pkgdir = $(kde_datadir)/kppp/Provider/Slovenia - ---- kppp/Rules/Slovenia/omrezje_0880.rst.orig 2005-09-10 10:20:36.000000000 +0200 -+++ kppp/Rules/Slovenia/omrezje_0880.rst 2005-03-10 11:12:49.000000000 +0100 -@@ -1,9 +1,12 @@ - ################################################################ --# $Id: omrezje_0880.rst 135052 2002-02-02 20:19:29Z romanm $ --# $Source$ -+# $Id: omrezje_0880.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0880.rst,v $ - # - # RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0880 (ISP PROVIDER). - # -+# 2005-03-19 -+# Updated by gregor.pirnaver@email.si. -+# - # 2002-02-02: - # Updated by roman.maurer@amis.net, - # based on data provided by Primoz Hrvatin. -@@ -40,13 +43,16 @@ - # This is charged whenever you connect. The amount is payed to the - # phone company. - --per_connection=6.30 -+# per_connection=6.30 -+per_connection=0.0 -+minimum_costs=1.02 -+ - - # "on monday until sunday the costs - # are 2.04 on normal and 1.02 on discounted per each 60 seconds" - - on (monday..saturday) between (0:00..6:59) use (1.02, 60) --on (monday..saturday) between (7:00..18:59) use (2.04, 60) -+on (monday..saturday) between (7:00..18:59) use (1.84, 60) - on (monday..saturday) between (19:00..23:59) use (1.02, 60) - on (sunday) between () use (1.02, 60) - ---- kppp/Rules/Slovenia/omrezje_0889.rst.orig 2005-09-10 10:20:36.000000000 +0200 -+++ kppp/Rules/Slovenia/omrezje_0889.rst 2005-03-10 11:13:40.000000000 +0100 -@@ -1,9 +1,12 @@ - ################################################################ --# $Id: omrezje_0889.rst 135052 2002-02-02 20:19:29Z romanm $ --# $Source$ -+# $Id: omrezje_0889.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0889.rst,v $ - # - # RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0889 (ISP PROVIDERS). - # -+# 2005-03-19 -+# Updated by gregor.pirnaver@email.si. -+# - # 2002-02-02: - # Updated by roman.maurer@amis.net, - # based on data provided by Primoz Hrvatin. -@@ -30,14 +33,14 @@ - ################################################################ - - per_connection=0.0 --minimum_costs=2.52 -+minimum_costs=1.26 - - - # same as above. You must use 24 hour notation, or the accounting - # will not work correctly. (Example: write 15:00 for 3 pm) - - on (monday..saturday) between (0:00..6:59) use (1.26, 60) --on (monday..saturday) between (7:00..18:59) use (2.52, 60) -+on (monday..saturday) between (7:00..18:59) use (2.27, 60) - on (monday..saturday) between (19:00..23:59) use (1.26, 60) - on (sunday) between () use (1.26, 60) - ---- /dev/null 1970-01-01 01:00:00.000000000 +0100 -+++ kppp/Rules/Slovenia/omrezje_0888.rst 2007-05-29 19:56:14.000000000 +0200 -@@ -0,0 +1,62 @@ -+################################################################ -+# $Id: omrezje_0889.rst,v 1.2 2002/02/02 20:19:29 romanm Exp $ -+# $Source: /home/kde/kdenetwork/kppp/Rules/Slovenia/omrezje_0889.rst,v $ -+# -+# RULES FOR KPPP WITH SLOVENIAN PHONE NETWORK 0889 (ISP PROVIDERS). -+# -+# -+# 2005-03-19 -+# Updated by gregor.pirnaver@email.si. -+# -+# 2002-02-02: -+# Updated by roman.maurer@amis.net, -+# based on data provided by Primoz Hrvatin. -+# -+# 2000-09-25: -+# Prepared by Ales.Kosir@hermes.si, -+# based on data, provided by Srdjan Cvjetovic. -+# -+# Calls from stationary phone network to the ISP numbers 0889: -+# -+################################################################ -+name=omrezje-0888.rst -+ -+################################################################ -+# currency settings -+################################################################ -+ -+currency_symbol=SIT -+currency_position=right -+currency_digits=2 -+ -+################################################################ -+# connection settings -+################################################################ -+ -+per_connection=0.0 -+minimum_costs=3.36 -+ -+ -+# same as above. You must use 24 hour notation, or the accounting -+# will not work correctly. (Example: write 15:00 for 3 pm) -+ -+on (monday..saturday) between (0:00..6:59) use (3.36, 60) -+on (monday..saturday) between (7:00..18:59) use (4.20, 60) -+on (monday..saturday) between (19:00..23:59) use (3.36, 60) -+on (sunday) between () use (3.36, 60) -+ -+# Drzavni prazniki: -+# 1.1., 2.1 - Novo leto -+# 8.2. - Slovenski kulturni praznik -+# Easter - Velika noc -+# Easter Monday - Velikonocni ponedeljek -+# 27.4. - Dan upora proti okupatorju -+# 1.5.,2.5. - Praznik dela -+# - Binkosti -+# 25.6. - Dan drzavnosti -+# 15.8. - Marijino vnebovzetje -+# 31.10. - Dan reformacije -+# 1.11. - Dan spomina na mrtve -+# 25.12. - Bozic -+# 26.12. - Dan samostojnosti -+on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (3.36, 60) ---- kppp/Rules/Slovenia/stacionarno_omrezje.rst.orig 2005-09-10 10:20:36.000000000 +0200 -+++ kppp/Rules/Slovenia/stacionarno_omrezje.rst 2005-03-10 11:12:01.000000000 +0100 -@@ -2,6 +2,10 @@ - # - # NAME OF THE RULESET. This is NEEDED for accounting purposes. - # -+# -+# 2005-03-19 -+# Updated by gregor.pirnaver@email.si. -+# - # Prepared by Ales.Kosir@hermes.si, - # based on data, provided by Srdjan Cvjetovic - # -@@ -25,12 +29,12 @@ - ################################################################ - - per_connection=0.0 --minimum_costs=4.11 -+minimum_costs=5.04 - --on (monday..saturday) between (0:00..6:59) use (4.11, 120) --on (monday..saturday) between (7:00..18:59) use (4.11, 60) --on (monday..saturday) between (19:00..23:59) use (4.11, 120) --on (sunday) between () use (4.11, 120) -+on (monday..saturday) between (0:00..6:59) use (5.04, 120) -+on (monday..saturday) between (7:00..18:59) use (6.30, 60) -+on (monday..saturday) between (19:00..23:59) use (5.04, 120) -+on (sunday) between () use (5.04, 120) - - # Drzavni prazniki: - # 1.1., 2.1 - Novo leto -@@ -46,7 +50,7 @@ - # 1.11. - Dan spomina na mrtve - # 25.12. - Bozic - # 26.12. - Dan samostojnosti --on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (4.11, 120) -+on (01/01, 01/02, 02/08, easter, easter+1, 04/26, 05/01, 05/02, easter+50, 06/25, 08/15, 10/31, 11/01, 12/25, 12/26) between () use (5.04, 120) - - - ---- kppp/Rules/Slovenia/Makefile.am~ 2005-09-10 10:20:36.000000000 +0200 -+++ kppp/Rules/Slovenia/Makefile.am 2007-05-29 21:56:32.000000000 +0200 -@@ -1,4 +1,5 @@ - pkg_DATA = omrezje_0880.rst \ -+ omrezje_0888.rst \ - omrezje_0889.rst \ - stacionarno_omrezje.rst - diff --git a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-fix-kdebug-120625.patch b/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-fix-kdebug-120625.patch deleted file mode 100644 index b56a70254..000000000 --- a/mandriva/2010.2/kdenetwork/kdenetwork-3.5.7-fix-kdebug-120625.patch +++ /dev/null @@ -1,167 +0,0 @@ -diff -Nur kopete-0.12b1/kopete/protocols/irc/ircprotocol.cpp kopete-0.12b1f/kopete/protocols/irc/ircprotocol.cpp ---- kopete-0.12b1/kopete/protocols/irc/ircprotocol.cpp 2006-03-08 09:25:24.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/irc/ircprotocol.cpp 2006-03-14 20:03:46.000000000 +0800 -@@ -136,15 +136,15 @@ - TQStringList::split(' ',"irc_voice contact_away_overlay"), i18n("Away")), - - m_UserStatusOnline(Kopete::OnlineStatus::Online, -- 25, this, Online, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online), -+ 25, this, Online, TQString::null, ("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online), - - m_UserStatusAway(Kopete::OnlineStatus::Away, - 2, this, Online | Away, "contact_away_overlay", -- i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away), -+ ("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away), - m_UserStatusConnecting(Kopete::OnlineStatus::Connecting, - 1, this, Connecting, "irc_connecting", i18n("Connecting")), - m_UserStatusOffline(Kopete::OnlineStatus::Offline, -- 0, this, Offline, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline), -+ 0, this, Offline, TQString::null, ("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline), - - m_StatusUnknown(Kopete::OnlineStatus::Unknown, - 999, this, 999, "status_unknown", i18n("Status not available")), -diff -Nur kopete-0.12b1/kopete/protocols/jabber/jabberprotocol.cpp kopete-0.12b1f/kopete/protocols/jabber/jabberprotocol.cpp ---- kopete-0.12b1/kopete/protocols/jabber/jabberprotocol.cpp 2006-03-08 09:25:21.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/jabber/jabberprotocol.cpp 2006-03-14 20:03:51.000000000 +0800 -@@ -71,14 +71,15 @@ - - JabberProtocol::JabberProtocol (TQObject * parent, const char *name, const TQStringList &) - : Kopete::Protocol( JabberProtocolFactory::instance(), parent, name ), -- JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, JabberFreeForChat, "jabber_chatty", i18n ("Free for Chat"), i18n ("Free for Chat"), Kopete::OnlineStatusManager::FreeForChat, Kopete::OnlineStatusManager::HasAwayMessage ), -- JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, JabberOnline, TQString::null, i18n ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), -- JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, JabberAway, "contact_away_overlay", i18n ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage), -- JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, JabberXA, "contact_xa_overlay", i18n ("Extended Away"), i18n ("Extended Away"), 0, Kopete::OnlineStatusManager::HasAwayMessage), -- JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, JabberDND, "contact_busy_overlay", i18n ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage), -- JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, JabberOffline, TQString::null, i18n ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline, Kopete::OnlineStatusManager::HasAwayMessage ), -- JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, JabberInvisible, "contact_invisible_overlay", i18n ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible), -- JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, JabberConnecting, "jabber_connecting", i18n("Connecting")), -+ JabberKOSChatty(Kopete::OnlineStatus::Online, 100, this, 1, "jabber_chatty", ("Free to Chat"), i18n ("Free to Chat"), Kopete::OnlineStatusManager::Online), -+ JabberKOSOnline(Kopete::OnlineStatus::Online, 90, this, 0, TQString::null, ("Online"), i18n ("Online"), Kopete::OnlineStatusManager::Online), -+ JabberKOSAway(Kopete::OnlineStatus::Away, 80, this, 2, "jabber_away", ("Away"), i18n ("Away"), Kopete::OnlineStatusManager::Busy,Kopete::OnlineStatusManager::HasAwayMessage), -+ JabberKOSXA(Kopete::OnlineStatus::Away, 70, this, 3, "jabber_xa", ("Extended Away"), i18n ("Extended Away"), Kopete::OnlineStatusManager::Away), -+ JabberKOSDND(Kopete::OnlineStatus::Away, 60, this, 4, "jabber_na", ("Do not Disturb"), i18n ("Do not Disturb"), Kopete::OnlineStatusManager::Away), -+ JabberKOSOffline(Kopete::OnlineStatus::Offline, 50, this, 5, TQString::null, ("Offline") ,i18n ("Offline"), Kopete::OnlineStatusManager::Offline), -+ JabberKOSInvisible(Kopete::OnlineStatus::Invisible, 40, this, 6, "jabber_invisible", ("Invisible") ,i18n ("Invisible"), Kopete::OnlineStatusManager::Invisible), -+ JabberKOSConnecting(Kopete::OnlineStatus::Connecting, 30, this, 7, "jabber_connecting", i18n("Connecting")), -+ - propLastSeen(Kopete::Global::Properties::self()->lastSeen()), - propAwayMessage(Kopete::Global::Properties::self()->awayMessage()), - propFirstName(Kopete::Global::Properties::self()->firstName()), -diff -Nur kopete-0.12b1/kopete/protocols/msn/msnprotocol.cpp kopete-0.12b1f/kopete/protocols/msn/msnprotocol.cpp ---- kopete-0.12b1/kopete/protocols/msn/msnprotocol.cpp 2006-03-08 09:25:24.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/msn/msnprotocol.cpp 2006-03-14 20:03:51.000000000 +0800 -@@ -49,17 +49,17 @@ - - MSNProtocol::MSNProtocol( TQObject *parent, const char *name, const TQStringList & /* args */ ) - : Kopete::Protocol( MSNProtocolFactory::instance(), parent, name ), -- NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString::null, i18n( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online,Kopete::OnlineStatusManager::HasAwayMessage ), -- BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", i18n( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), -- BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", i18n( "Be Right Back" ), i18n( "Be &Right Back" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), -- AWY( Kopete::OnlineStatus::Away, 18, this, 4, "contact_away_overlay", i18n( "Away From Computer" ),i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ), -- PHN( Kopete::OnlineStatus::Away, 12, this, 5, "contact_phone_overlay", i18n( "On the Phone" ) , i18n( "On The &Phone" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), -- LUN( Kopete::OnlineStatus::Away, 15, this, 6, "contact_food_overlay", i18n( "Out to Lunch" ) , i18n( "Out To &Lunch" ) , 0 , Kopete::OnlineStatusManager::HasAwayMessage ), -- FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString::null, i18n( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline,Kopete::OnlineStatusManager::DisabledIfOffline ), -- HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "contact_invisible_overlay", i18n( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ), -- IDL( Kopete::OnlineStatus::Away, 10, this, 9, "contact_away_overlay", i18n( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Idle , Kopete::OnlineStatusManager::HideFromMenu ), -- UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown", i18n( "Status not available" ) ), -- CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting", i18n( "Connecting" ) ), -+ NLN( Kopete::OnlineStatus::Online, 25, this, 1, TQString::null, ( "Online" ) , i18n( "O&nline" ), Kopete::OnlineStatusManager::Online ), -+ BSY( Kopete::OnlineStatus::Away, 20, this, 2, "msn_busy", ( "Busy" ) , i18n( "&Busy" ), Kopete::OnlineStatusManager::Busy), -+ BRB( Kopete::OnlineStatus::Away, 22, this, 3, "msn_brb", ( "Be Right Back" ), i18n( "Be &Right Back" )), -+ AWY( Kopete::OnlineStatus::Away, 18, this, 4, "msn_away", ( "Away From Computer" ) , i18n( "&Away" ), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage ), -+ PHN( Kopete::OnlineStatus::Away, 12, this, 5, "msn_phone", ( "On the Phone" ) , i18n( "On The &Phone" )), -+ LUN( Kopete::OnlineStatus::Away, 15, this, 6, "msn_lunch", ( "Out to Lunch" ) , i18n( "Out To &Lunch" ) ), -+ FLN( Kopete::OnlineStatus::Offline, 0, this, 7, TQString::null, ( "Offline" ) , i18n( "&Offline" ), Kopete::OnlineStatusManager::Offline , Kopete::OnlineStatusManager::DisabledIfOffline), -+ HDN( Kopete::OnlineStatus::Invisible, 3, this, 8, "msn_invisible", ( "Invisible" ) , i18n( "&Invisible" ), Kopete::OnlineStatusManager::Invisible ), -+ IDL( Kopete::OnlineStatus::Away, 10, this, 9, "msn_away", ( "Idle" ) , i18n( "&Idle" ), Kopete::OnlineStatusManager::Invisible ), -+ UNK( Kopete::OnlineStatus::Unknown, 25, this, 0, "status_unknown",( "Status not available" ) ), -+ CNT( Kopete::OnlineStatus::Connecting, 2, this, 10,"msn_connecting",( "Connecting" ) ), - propEmail(Kopete::Global::Properties::self()->emailAddress()), - propPhoneHome(Kopete::Global::Properties::self()->privatePhone()), - propPhoneWork(Kopete::Global::Properties::self()->workPhone()), -diff -Nur kopete-0.12b1/kopete/protocols/oscar/aim/aimprotocol.cpp kopete-0.12b1f/kopete/protocols/oscar/aim/aimprotocol.cpp ---- kopete-0.12b1/kopete/protocols/oscar/aim/aimprotocol.cpp 2006-03-08 09:25:23.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/oscar/aim/aimprotocol.cpp 2006-03-14 20:03:46.000000000 +0800 -@@ -220,14 +220,14 @@ - - AIMProtocol::AIMProtocol(TQObject *parent, const char *name, const TQStringList &) - : Kopete::Protocol( AIMProtocolFactory::instance(), parent, name ), -- statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, i18n("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), -- statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, i18n("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), -- statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", i18n("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, -+ statusOnline( Kopete::OnlineStatus::Online, 2, this, 0, TQString::null, ("Online"), i18n("Online"), Kopete::OnlineStatusManager::Online ), -+ statusOffline( Kopete::OnlineStatus::Offline, 2, this, 10, TQString::null, ("Offline"), i18n("Offline"), Kopete::OnlineStatusManager::Offline ), -+ statusAway( Kopete::OnlineStatus::Away, 2, this, 20, "contact_away_overlay", ("Away"), i18n("Away"), Kopete::OnlineStatusManager::Away, - Kopete::OnlineStatusManager::HasAwayMessage ), -- statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", i18n("Mobile"), i18n("Mobile"), -+ statusWirelessOnline( Kopete::OnlineStatus::Online, 1, this, 30, "contact_phone_overlay", ("Mobile"), i18n("Mobile"), - Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HideFromMenu ), - statusWirelessAway( Kopete::OnlineStatus::Away, 1, this, 31, TQStringList::split( " ", "contact_phone_overlay contact_away_overlay"), -- i18n("Mobile Away"), i18n("Mobile Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HideFromMenu ), -+ ("Mobile Away"), i18n("Mobile Away"), Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HideFromMenu ), - statusConnecting(Kopete::OnlineStatus::Connecting, 99, this, 99, "aim_connecting", i18n("Connecting...")), - awayMessage(Kopete::Global::Properties::self()->awayMessage()), - clientFeatures("clientFeatures", i18n("Client Features"), 0, false), -diff -Nur kopete-0.12b1/kopete/protocols/oscar/icq/icqpresence.cpp kopete-0.12b1f/kopete/protocols/oscar/icq/icqpresence.cpp ---- kopete-0.12b1/kopete/protocols/oscar/icq/icqpresence.cpp 2006-03-08 09:25:23.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/oscar/icq/icqpresence.cpp 2006-03-14 20:03:46.000000000 +0800 -@@ -68,13 +68,14 @@ - */ - static const PresenceTypeData data[] = - { -- { Presence::Offline, OnlineStatus::Offline, OFFLINE, OFFLINE, i18n( "O&ffline" ), i18n("Offline"), i18n("Offline"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Offline, 0 }, -- { Presence::DoNotDisturb, OnlineStatus::Away, SET_DND, IS_DND, i18n( "&Do Not Disturb" ), i18n("Do Not Disturb"), i18n("Do Not Disturb (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage }, -- { Presence::Occupied, OnlineStatus::Away, SET_OCC, IS_OCC, i18n( "O&ccupied" ), i18n("Occupied"), i18n("Occupied (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", 0, Kopete::OnlineStatusManager::HasAwayMessage }, -- { Presence::NotAvailable, OnlineStatus::Away, SET_NA, IS_NA, i18n( "Not A&vailable" ), i18n("Not Available"), i18n("Not Available (Invisible)"), "contact_xa_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::ExtendedAway, Kopete::OnlineStatusManager::HasAwayMessage }, -- { Presence::Away, OnlineStatus::Away, SET_AWAY, IS_AWAY, i18n( "&Away" ), i18n("Away"), i18n("Away (Invisible)"), "contact_away_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage }, -- { Presence::FreeForChat, OnlineStatus::Online, SET_FFC, IS_FFC, i18n( "&Free for Chat" ), i18n("Free For Chat"), i18n("Free For Chat (Invisible)"), "icq_ffc", "contact_invisible_overlay", Kopete::OnlineStatusManager::FreeForChat, 0 }, -- { Presence::Online, OnlineStatus::Online, ONLINE, ONLINE, i18n( "O&nline" ), i18n("Online"), i18n("Online (Invisible)"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Online, 0 } -+ { Presence::Offline, OnlineStatus::Offline, OFFLINE, OFFLINE, i18n( "O&ffline" ), ("Offline"), ("Offline"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Offline, 0 }, -+ { Presence::DoNotDisturb, OnlineStatus::Away, SET_DND, IS_DND, i18n( "&Do Not Disturb" ), ("Do Not Disturb"), i18n("Do Not Disturb (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", 0, Kopete::OnlineStatusManager::HasAwayMessage }, -+ { Presence::Occupied, OnlineStatus::Away, SET_OCC, IS_OCC, i18n( "O&ccupied" ), ("Occupied"), i18n("Occupied (Invisible)"), "contact_busy_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage }, -+ { Presence::NotAvailable, OnlineStatus::Away, SET_NA, IS_NA, i18n( "Not A&vailable" ), ("Not Available"), i18n("Not Available (Invisible)"), "contact_xa_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::ExtendedAway, Kopete::OnlineStatusManager::HasAwayMessage }, -+ { Presence::Away, OnlineStatus::Away, SET_AWAY, IS_AWAY, i18n( "&Away" ), ("Away"), i18n("Away (Invisible)"), "contact_away_overlay", "contact_invisible_overlay", Kopete::OnlineStatusManager::Away, Kopete::OnlineStatusManager::HasAwayMessage }, -+ { Presence::FreeForChat, OnlineStatus::Online, SET_FFC, IS_FFC, i18n( "&Free for Chat" ), ("Free For Chat"), i18n("Free For Chat (Invisible)"), "icq_ffc", "contact_invisible_overlay", Kopete::OnlineStatusManager::FreeForChat, 0 }, -+ { Presence::Online, OnlineStatus::Online, ONLINE, ONLINE, i18n( "O&nline" ), ("Online"), i18n("Online (Invisible)"), 0, "contact_invisible_overlay", Kopete::OnlineStatusManager::Online, 0 } -+ - }; - return data; - } -diff -Nur kopete-0.12b1/kopete/protocols/yahoo/yahooprotocol.cpp kopete-0.12b1f/kopete/protocols/yahoo/yahooprotocol.cpp ---- kopete-0.12b1/kopete/protocols/yahoo/yahooprotocol.cpp 2006-03-08 09:25:14.000000000 +0800 -+++ kopete-0.12b1f/kopete/protocols/yahoo/yahooprotocol.cpp 2006-03-14 20:03:51.000000000 +0800 -@@ -39,20 +39,20 @@ - - YahooProtocol::YahooProtocol( TQObject *parent, const char *name, const TQStringList & ) - : Kopete::Protocol( YahooProtocolFactory::instance(), parent, name ), -- Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, i18n( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), -- Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, i18n( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online, Kopete::OnlineStatusManager::HasAwayMessage ), -- BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", i18n( "Be right back" ), i18n( "Be right back" ) ), -- Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", i18n( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), -- NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", i18n( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ), -- NotAtMyDesk( Kopete::OnlineStatus::Away, 18, this, 4, "contact_xa_overlay", i18n( "Not at my desk"), i18n( "Not at my desk"), Kopete::OnlineStatusManager::Away ), -- NotInTheOffice( Kopete::OnlineStatus::Away, 16, this, 5, "contact_xa_overlay", i18n( "Not in the office" ), i18n( "Not in the office" ) ), -- OnThePhone( Kopete::OnlineStatus::Away, 12, this, 6, "contact_phone_overlay", i18n( "On the phone" ), i18n( "On the phone" ) ), -- OnVacation( Kopete::OnlineStatus::Away, 3, this, 7, "contact_xa_overlay", i18n( "On vacation" ), i18n( "On vacation" ) ), -- OutToLunch( Kopete::OnlineStatus::Away, 10, this, 8, "contact_food_overlay", i18n( "Out to lunch" ), i18n( "Out to lunch" ) ), -- SteppedOut( Kopete::OnlineStatus::Away, 14, this, 9, "contact_away_overlay", i18n( "Stepped out" ), i18n( "Stepped out" ) ), -- Invisible( Kopete::OnlineStatus::Invisible, 3, this, 12, "contact_invisible_overlay", i18n( "Invisible" ), i18n( "Invisible" ), Kopete::OnlineStatusManager::Invisible ), -- Custom( Kopete::OnlineStatus::Away, 25, this, 99, "contact_busy_overlay", i18n( "Custom" ), i18n( "Custom" ), Kopete::OnlineStatusManager::HideFromMenu ), -- Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", i18n( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ), -+ Offline( Kopete::OnlineStatus::Offline, 0, this, 0x5a55aa56, TQString::null, ( "Offline" ), i18n( "Offline" ), Kopete::OnlineStatusManager::Offline ), -+ Online( Kopete::OnlineStatus::Online, 25, this, 0, TQString::null, ( "Online" ), i18n( "Online" ), Kopete::OnlineStatusManager::Online ), -+ BeRightBack( Kopete::OnlineStatus::Away, 22, this, 1, "contact_away_overlay", ( "Be right back" ), i18n( "Be right back" ) ), -+ Busy( Kopete::OnlineStatus::Away, 20, this, 2, "contact_busy_overlay", ( "Busy" ), i18n( "Busy" ), Kopete::OnlineStatusManager::Busy, Kopete::OnlineStatusManager::HasAwayMessage ), -+ NotAtHome( Kopete::OnlineStatus::Away, 17, this, 3, "contact_xa_overlay", ( "Not at home" ), i18n( "Not at home" ), Kopete::OnlineStatusManager::ExtendedAway ), -+ NotAtMyDesk( Kopete::OnlineStatus::Away, 18, this, 4, "contact_xa_overlay", ( "Not at my desk"), i18n( "Not at my desk"), Kopete::OnlineStatusManager::Away ), -+ NotInTheOffice( Kopete::OnlineStatus::Away, 16, this, 5, "contact_xa_overlay", ( "Not in the office" ), i18n( "Not in the office" ) ), -+ OnThePhone( Kopete::OnlineStatus::Away, 12, this, 6, "contact_phone_overlay", ( "On the phone" ), i18n( "On the phone" ) ), -+ OnVacation( Kopete::OnlineStatus::Away, 3, this, 7, "contact_xa_overlay", ( "On vacation" ), i18n( "On vacation" ) ), -+ OutToLunch( Kopete::OnlineStatus::Away, 10, this, 8, "contact_food_overlay", ( "Out to lunch" ), i18n( "Out to lunch" ) ), -+ SteppedOut( Kopete::OnlineStatus::Away, 14, this, 9, "contact_away_overlay", ( "Stepped out" ), i18n( "Stepped out" ) ), -+ Invisible( Kopete::OnlineStatus::Invisible, 3, this, 12, "contact_invisible_overlay", ( "Invisible" ), i18n( "Invisible" ), Kopete::OnlineStatusManager::Invisible ), -+ Custom( Kopete::OnlineStatus::Away, 25, this, 99, "contact_busy_overlay", ( "Custom" ), i18n( "Custom" ), Kopete::OnlineStatusManager::HideFromMenu ), -+ Idle( Kopete::OnlineStatus::Away, 15, this, 999, "yahoo_idle", ( "Idle" ), i18n( "Idle" ), Kopete::OnlineStatusManager::Idle ), - Connecting( Kopete::OnlineStatus::Connecting,2, this, 555, "yahoo_connecting", i18n( "Connecting" ) ), - awayMessage(Kopete::Global::Properties::self()->awayMessage()), - iconCheckSum("iconCheckSum", i18n("Buddy Icon Checksum"), TQString::null, true, false, true), diff --git a/mandriva/2010.2/kdenetwork/kdenetwork-lisa b/mandriva/2010.2/kdenetwork/kdenetwork-lisa deleted file mode 100644 index e2ab9b4e5..000000000 --- a/mandriva/2010.2/kdenetwork/kdenetwork-lisa +++ /dev/null @@ -1,132 +0,0 @@ -#!/bin/sh -# -# Startup script for LISa -# -# chkconfig: 345 92 8 -# description: Starts and stops the LAN Information Server used \ -# to provide a LAN browser. -# processname: lisa -# -# based on rclisa Version 0.1 -# 2001 by Marcus Thiesen (marcus@thiesenweb.de) for SuSE Linux 7.1 -# This is free and comes with absolutely no WARRANTY -# adapted for Mandrake 8.0 by Patrick Alberts (mandrake@alberts.org) -# Updated for Mandrake 9.0 by Buchan Milne (bgmilne@linux-mandrake.com) -# -### BEGIN INIT INFO -# Provides: lisa -# Required-Start: $network -# Required-Stop: $network -# Default-Start: 3 5 -# Short-Description: LISa LAN Information Server -# Description: Starts and stops the LAN Information Server used -# to provide a LAN browser. -### END INIT INFO - -CONFIG_FILE=/etc/lisarc - -prog="lisa" - -# 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 - -# Get config. -. /etc/sysconfig/network - -# Check that networking is up. -if [ ${NETWORKING} = "no" ] -then - exit 0 -fi - -# check how we were called -case "$1" in - start) - PID=`pidof -s lisa` - if [ -z "$PID" ]; then - if [ -e /opt/kde3/bin/lisa ]; then - - #check for config file and generate one if needed: - if [ ! -e $CONFIG_FILE ];then - gprintf "No config file, generating one, please run kcontrol as root to customise\n" - # See http://lisa-home.sourceforge.net/ for more details - # on the config file format. - # PingAddresses/AllowedAddresses should only be route - # entries that are not gateways,loopback or multicast: - IPNMS_ALL=`/sbin/route -n |awk 'BEGIN {ORS=";"};$4=="U"&&$8!="lo"&&$1!~/224.0.0.0/ {print $1"/"$3}'` - # BroadcastNetwork should be only the internal subnet, - # take first route from above: - IPNMS=`/sbin/route -n |awk ' $4=="U"&&$8!="lo"&&$1!~/224.0.0.0/&&$8!~/ppp.*/ {print $1"/"$3}'|head -n1` - echo "SecondWait=-1"> $CONFIG_FILE - echo "SearchUsingNmblookup=1">> $CONFIG_FILE - echo "DeliverUnnamedHosts=0" >>$CONFIG_FILE - echo "FirstWait=30" >> $CONFIG_FILE - echo "MaxPingsAtOnce=256" >>$CONFIG_FILE - echo "UpdatePeriod=300" >> $CONFIG_FILE - #echo "PingAddresses=$IPNMS_ALL">> $CONFIG_FILE - echo "AllowedAddresses=$IPNMS_ALL" >> $CONFIG_FILE - echo "BroadcastNetwork=$IPNMS" >>$CONFIG_FILE - #echo "PingNames=" >> $CONFIG_FILE - fi - - if [ -e $CONFIG_FILE ]; then - action "Starting %s: " "$prog" /bin/true - /opt/kde3/bin/lisa -c $CONFIG_FILE >/dev/null 2>&1 - else - action "No configuration available, not starting LISa" /bin/false - fi - - else - action "Starting %s: binaries not found " "$prog" /bin/false - fi - else - action "Starting %s: already running (%s) " "$PID" "$prog" /bin/false - fi - touch /var/lock/subsys/lisa - ;; - - stop) - PID=`pidof -s lisa` - if [ "$PID" ]; then - action "Stopping %s: " "$prog" kill -3 $PID - fi - rm -f /var/lock/subsys/lisa - ;; - - status) - PID=`pidof -s lisa` - if [ "$PID" ]; then - gprintf "%s is running! ($PID)\n" "$prog" - /usr/bin/kill -s SIGUSR1 $PID - sleep 3 - else - gprintf "%s is not running!\n" "$prog" ; - fi - ;; - - restart) - $0 stop && $0 start - ;; - - refresh) - PID=`pidof -s lisa` - if [ "$PID" ]; then - gprintf "Sending %s a SIGHUP ($PID)\n" "$prog" - kill -SIGHUP $PID; - else - gprintf "%s is not running!\n" "$prog" ; - fi - ;; - - *) - gprintf "usage: %s {start|stop|status|refresh|restart}\n" $0 - ;; -esac - -exit 0 diff --git a/mandriva/2010.2/kdenetwork/kdenetwork3-kppp.pamd b/mandriva/2010.2/kdenetwork/kdenetwork3-kppp.pamd deleted file mode 100644 index e89ccb340..000000000 --- a/mandriva/2010.2/kdenetwork/kdenetwork3-kppp.pamd +++ /dev/null @@ -1,5 +0,0 @@ -#%PAM-1.0 -auth sufficient pam_rootok.so -auth include system-auth -session optional pam_xauth.so -account required pam_permit.so |