Hello community,
here is the log from the commit of package kdenetwork4
checked in at Fri Nov 2 01:26:32 CET 2007.
--------
--- KDE/kdenetwork4/kdenetwork4.changes 2007-10-23 10:45:55.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdenetwork4/kdenetwork4.changes 2007-11-01 12:21:23.000000000 +0100
@@ -1,0 +2,10 @@
+Thu Nov 1 12:21:23 CET 2007 - dmueller@suse.de
+
+- update to 3.95.1
+
+-------------------------------------------------------------------
+Fri Oct 26 13:34:38 CEST 2007 - dmueller@suse.de
+
+- update to KDE 4.0 beta4
+
+-------------------------------------------------------------------
Old:
----
disable-kopete.diff
kdenetwork-3.94.1.tar.bz2
New:
----
FIXME.diff
kdenetwork-3.95.1.tar.bz2
r731747.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdenetwork4.spec ++++++
--- /var/tmp/diff_new_pack.r19948/_old 2007-11-02 01:24:20.000000000 +0100
+++ /var/tmp/diff_new_pack.r19948/_new 2007-11-02 01:24:20.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdenetwork4 (Version 3.94.1)
+# spec file for package kdenetwork4 (Version 3.95.1)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -10,22 +10,23 @@
Name: kdenetwork4
-BuildRequires: LibVNCServer-devel gpgme-devel kdebase4-workspace-devel
+BuildRequires: LibVNCServer-devel gpgme-devel kdebase4-workspace-devel libqimageblitz-devel
BuildRequires: libqca2-devel meanwhile-devel openslp-devel sqlite-devel wireless-tools
License: GPL v2 or later
Group: Productivity/Networking/Other
Summary: KDE Network Base Package
Url: http://www.kde.org
-Version: 3.94.1
-Release: 2
-%define rversion 3.94.1
+Version: 3.95.1
+Release: 1
+%define rversion 3.95.1
Source0: kdenetwork-%rversion.tar.bz2
Source1: _upstream
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: kdebase4-runtime
-Patch1: disable-kopete.diff
Patch2: desktop-files.diff
-%define with_kopete 0
+Patch3: r731747.diff
+Patch4: FIXME.diff
+%define with_kopete 1
Suggests: kde4-kget
%if %with_kopete
Suggests: kde4-kopete
@@ -50,8 +51,9 @@
%prep
%setup -q -n kdenetwork-%rversion
-%patch1
%patch2
+%patch3
+%patch4
%build
%cmake_kde4 -d build
@@ -73,10 +75,6 @@
%suse_update_desktop_file -r kget System TrayIcon
%suse_update_desktop_file -r krfb System RemoteAccess
%kde_post_install
- # Hack for by default installed KDE4 on 10.3
- install -d $RPM_BUILD_ROOT/usr/share/pixmaps
- ln -s ../icons/oxygen/48x48/apps/krfb.png $RPM_BUILD_ROOT/usr/share/pixmaps/
- ln -s ../icons/oxygen/48x48/apps/krdc.png $RPM_BUILD_ROOT/usr/share/pixmaps/
%post -p /sbin/ldconfig
@@ -197,6 +195,35 @@
/usr/share/icons/oxygen/*/actions/delete_user.*
/usr/share/icons/oxygen/*/actions/edit_user.*
/usr/share/icons/oxygen/*/actions/emoticon.*
+/usr/%_lib/libgadu_kopete.so.1
+/usr/%_lib/libgadu_kopete.so.1.0.0
+/usr/%_lib/libiris_kopete.so.1
+/usr/%_lib/libiris_kopete.so.1.0.0
+/usr/%_lib/libkopete.so.4
+/usr/%_lib/libkopete.so.4.0.0
+/usr/%_lib/libkopete_msn_shared.so.4
+/usr/%_lib/libkopete_msn_shared.so.4.0.0
+/usr/%_lib/libkopete_oscar.so.4
+/usr/%_lib/libkopete_oscar.so.4.0.0
+/usr/%_lib/libkopete_videodevice.so.4
+/usr/%_lib/libkopete_videodevice.so.4.0.0
+/usr/%_lib/libkopeteaddaccountwizard.so.1
+/usr/%_lib/libkopeteaddaccountwizard.so.1.0.0
+/usr/%_lib/libkopetechatwindow_shared.so.1
+/usr/%_lib/libkopetechatwindow_shared.so.1.0.0
+/usr/%_lib/libkopeteidentity.so.1
+/usr/%_lib/libkopeteidentity.so.1.0.0
+/usr/%_lib/libkopeteprivacy.so.1
+/usr/%_lib/libkopeteprivacy.so.1.0.0
+/usr/%_lib/libkyahoo.so.1
+/usr/%_lib/libkyahoo.so.1.0.0
+/usr/%_lib/liboscar.so.1
+/usr/%_lib/liboscar.so.1.0.0
+/usr/%_lib/libpapillon_kopete.so.1
+/usr/%_lib/libpapillon_kopete.so.1.0.0
+/usr/share/dbus-1/interfaces/org.kde.Kopete.xml
+/usr/share/dbus-1/interfaces/org.kde.kopete.Statistics.xml
+/usr/share/kde4/apps/kopete_statistics/statisticsui.rc
%endif
%package -n kde4-kppp
@@ -257,7 +284,6 @@
%doc COPYING COPYING-DOCS README
/usr/bin/krdc
/usr/share/applications/kde4/krdc.desktop
-/usr/share/pixmaps/krdc.png
/usr/share/kde4/config.kcfg/krdc.kcfg
%_kde_share_dir/apps/krdc
%doc %lang(en) /usr/share/doc/kde/HTML/en/krdc
@@ -292,7 +318,6 @@
/usr/bin/krfb
%_kde_share_dir/apps/krfb
/usr/share/applications/kde4/krfb.desktop
-/usr/share/pixmaps/krfb.png
#/usr/share/dbus-1/interfaces/org.kde.krfb.xml
%doc %lang(en) /usr/share/doc/kde/HTML/en/krfb
#%_kde_share_dir/services/kinetd_krfb.desktop
@@ -320,14 +345,8 @@
%files -n kde4-knewsticker
%defattr(-,root,root)
%doc COPYING COPYING-DOCS README
-/usr/bin/knewstickerstub
-/usr/%_lib/kde4/knewsticker_panelapplet.so
-/usr/share/applications/kde4/knewsticker-standalone.desktop
-/usr/share/applications/kde4/knewstickerstub.desktop
-%_kde_share_dir/apps/kconf_update/knewsticker.upd
-%_kde_share_dir/apps/kconf_update/knt-0.1-0.2.pl
-%_kde_share_dir/apps/kicker/applets/knewsticker.desktop
-%_kde_share_dir/apps/knewsticker
+/usr/%_lib/kde4/plasma_applet_knewsticker.so
+/usr/share/kde4/services/plasma-knewsticker-default.desktop
/usr/share/icons/hicolor/*/apps/knewsticker.*
%lang(en) /usr/share/doc/kde/HTML/en/knewsticker
@@ -514,7 +533,27 @@
%files devel
%defattr(-,root,root)
%_libdir/libkgetcore.so
+%if %with_kopete
+/usr/include/kopete
+/usr/%_lib/libgadu_kopete.so
+/usr/%_lib/libiris_kopete.so
+/usr/%_lib/libkopete.so
+/usr/%_lib/libkopete_msn_shared.so
+/usr/%_lib/libkopete_oscar.so
+/usr/%_lib/libkopete_videodevice.so
+/usr/%_lib/libkopeteaddaccountwizard.so
+/usr/%_lib/libkopetechatwindow_shared.so
+/usr/%_lib/libkopeteidentity.so
+/usr/%_lib/libkopeteprivacy.so
+/usr/%_lib/libkyahoo.so
+/usr/%_lib/liboscar.so
+/usr/%_lib/libpapillon_kopete.so
+%endif
%changelog
+* Thu Nov 01 2007 - dmueller@suse.de
+- update to 3.95.1
+* Fri Oct 26 2007 - dmueller@suse.de
+- update to KDE 4.0 beta4
* Tue Oct 23 2007 - dmueller@suse.de
- remove reference to uninstalled icon file
* Thu Oct 18 2007 - dmueller@suse.de
++++++ FIXME.diff ++++++
--- kopete/plugins/motionautoaway/motionawayplugin.cpp
+++ kopete/plugins/motionautoaway/motionawayplugin.cpp
@@ -46,32 +46,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