Hello community,
here is the log from the commit of package kdebase4-runtime for openSUSE:Factory
checked in at Wed Dec 16 10:14:00 CET 2009.
--------
--- KDE/kdebase4-runtime/kdebase4-runtime.changes 2009-11-03 20:19:07.000000000 +0100
+++ /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase4-runtime.changes 2009-12-08 14:43:41.000000000 +0100
@@ -1,0 +2,21 @@
+Tue Dec 8 11:40:02 UTC 2009 - llunak@novell.com
+
+- provide explicit provides of older versions of kdebase4-runtime
+ for older packages that had a too strict requirement there
+
+-------------------------------------------------------------------
+Mon Dec 7 10:43:16 UTC 2009 - llunak@novell.com
+
+- split out xine subpackage (bnc#561098)
+
+-------------------------------------------------------------------
+Fri Dec 4 18:57:24 CET 2009 - dmueller@suse.de
+
+- update to 4.3.80
+
+-------------------------------------------------------------------
+Fri Dec 4 10:59:06 UTC 2009 - mseben@novell.com
+
+- added htdig as recommends dependency (bnc#480490)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
4_3_BRANCH.diff
kdebase-runtime-4.3.3.tar.bz2
kio_sftp_rewrite.patch
oxygen-no-dynamic-cast-bnc529640.diff
New:
----
4_4_BRANCH.diff
kdebase-runtime-4.3.80.tar.bz2
soprano-optional-backend.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebase4-runtime.spec ++++++
--- /var/tmp/diff_new_pack.jjx4WD/_old 2009-12-16 10:13:16.000000000 +0100
+++ /var/tmp/diff_new_pack.jjx4WD/_new 2009-12-16 10:13:16.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kdebase4-runtime (Version 4.3.3)
+# spec file for package kdebase4-runtime (Version 4.3.80)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -25,7 +25,7 @@
%else
BuildRequires: libusb
%endif
-BuildRequires: libknotificationitem-devel
+BuildRequires: libexiv2-devel libknotificationitem-devel
BuildRequires: soprano-backend-redland
%if %suse_version > 1030
BuildRequires: libpulse-devel
@@ -33,27 +33,30 @@
BuildRequires: pulseaudio-devel
%endif
BuildRequires: libssh-devel
-License: GPL v2 or later
+%if %suse_version > 1110
+BuildRequires: xz-devel
+BuildRequires: lzma-devel
+%endif
+License: GPLv2+
Group: System/GUI/KDE
Summary: The KDE Runtime Components
Url: http://www.kde.org/
-Version: 4.3.3
+Version: 4.3.80
Release: 1
Source0: kdebase-runtime-%version.tar.bz2
Source1: kde4-essential.menu
Source2: kde-settings.menu
Source3: kde-settings.directory
-Patch0: 4_3_BRANCH.diff
+Patch0: 4_4_BRANCH.diff
Patch2: phonon-wakeups.diff
Patch3: hotplug-kde3.diff
Patch4: kde4-wrapper.diff
Patch5: kdesu-remember-keep-password.diff
Patch7: simple-ccsm-kde.diff
Patch8: knetattach-show.diff
-Patch9: kio_sftp_rewrite.patch
Patch10: khelpcenter-gnome-support.patch
Patch11: khelpcenter-use-susehelp.patch
-Patch12: oxygen-no-dynamic-cast-bnc529640.diff
+Patch12: soprano-optional-backend.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: oxygen-icon-theme >= %version
Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`)
@@ -62,6 +65,8 @@
Recommends: kdialog
Provides: suse_help_viewer
Recommends: ispell, enscript
+#htdig is needed by khelpcenter for indexing help files
+Recommends: htdig
%define debug_package_requires %name = %version-%release kdelibs4-debuginfo
Obsoletes: kdebase3 <= 3.5.1
%if %suse_version == 1110
@@ -72,6 +77,11 @@
%endif
Provides: plasma-theme-air = 4.2.90
Obsoletes: plasma-theme-air <= 4.2.90
+# packages older than 4.4.x had too strict kdebase4-runtime requirement
+Provides: kdebase4-runtime = 4.0.10
+Provides: kdebase4-runtime = 4.1.10
+Provides: kdebase4-runtime = 4.2.10
+Provides: kdebase4-runtime = 4.3.10
%description
This package contains all run-time dependencies of KDE applications.
@@ -84,7 +94,7 @@
%package branding-upstream
Summary: The KDE Runtime Components
-License: GPL v2 or later
+License: GPLv2+
Group: System/GUI/KDE
%if %suse_version > 1030
#BRAND: FIXME
@@ -107,6 +117,22 @@
--------
The KDE Team
+%package xine
+Summary: The KDE Runtime Components
+License: GPLv2+
+Group: System/GUI/KDE
+Supplements: packageand(kdebase4-runtime:phonon-backend-xine)
+
+%description xine
+This package contains run-time dependencies of KDE applications
+when using the Xine Phonon backend.
+
+
+
+Authors:
+--------
+ The KDE Team
+
%prep
%setup -q -n kdebase-runtime-%version
%patch0
@@ -117,7 +143,6 @@
%patch5
%patch7
%patch8
-%patch9 -p1
%patch10
%patch11
%patch12
@@ -133,7 +158,7 @@
rm -rf $RPM_BUILD_ROOT/usr/share/icons/oxygen
rm -rf $RPM_BUILD_ROOT/usr/share/wallpapers
mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus
- mv $RPM_BUILD_ROOT/usr/etc/xdg/menus/kde-information.menu $RPM_BUILD_ROOT/etc/xdg/menus/kde4-information.menu
+ mv $RPM_BUILD_ROOT/etc/xdg/menus/kde-information.menu $RPM_BUILD_ROOT/etc/xdg/menus/kde4-information.menu
mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged
install -m 644 %{SOURCE1} $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged/kde4-essential.menu
install -m 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/xdg/menus/kde4-settings.menu
@@ -166,6 +191,11 @@
%doc COPYING
%_kde4_appsdir/desktoptheme/default/widgets/branding.svgz
+%files xine
+%defattr(-,root,root)
+%_kde4_modulesdir/kcm_phononxine.so
+%_kde4_servicesdir/kcm_phononxine.desktop
+
%files
%defattr(-,root,root)
%doc COPYING COPYING.LIB
@@ -188,6 +218,7 @@
%doc %lang(en) %_kde4_htmldir/en/kioslave
%doc %lang(en) %_kde4_htmldir/en/knetattach
%doc %lang(en) %_kde4_htmldir/en/network
+%_kde4_libdir/attica_kde.so
%_kde4_sysconfdir/xdg/menus/applications-merged/kde4-essential.menu
%_kde4_sysconfdir/xdg/menus/kde4-information.menu
%_kde4_sysconfdir/xdg/menus/kde4-settings.menu
@@ -209,7 +240,6 @@
%_kde4_modulesdir/kcm_locale.so
%_kde4_modulesdir/kcm_nepomuk.so
%_kde4_modulesdir/kcm_phonon.so
-%_kde4_modulesdir/kcm_phononxine.so
%_kde4_modulesdir/kcmspellchecking.so
%_kde4_modulesdir/kcm_trash.so
%_kde4_modulesdir/kded_desktopnotifier.so
@@ -240,11 +270,15 @@
%_kde4_modulesdir/kio_thumbnail.so
%_kde4_modulesdir/kio_trash.so
%_kde4_modulesdir/kio_network.so
+%_kde4_modulesdir/comicbookthumbnail.so
%_kde4_modulesdir/kded_networkwatcher.so
%_kde4_modulesdir/kshorturifilter.so
%_kde4_modulesdir/kstyle_oxygen_config.so
%_kde4_modulesdir/kuriikwsfilter.so
+%_kde4_modulesdir/kio_nepomuk.so
%_kde4_modulesdir/kurisearchfilter.so
+%_kde4_modulesdir/windowsexethumbnail.so
+%_kde4_modulesdir/windowsimagethumbnail.so
%_kde4_modulesdir/libexec/drkonqi
%_kde4_modulesdir/libexec/kdeeject
%_kde4_modulesdir/libexec/kdesu
@@ -270,8 +304,14 @@
%_kde4_modulesdir/plugins/styles/oxygen.so
%_kde4_modulesdir/svgthumbnail.so
%_kde4_modulesdir/textthumbnail.so
+%_kde4_modulesdir/kio_timeline.so
+%_kde4_modulesdir/kcm_attica.so
+%_kde4_modulesdir/kcm_device_automounter.so
+%_kde4_modulesdir/kded_device_automounter.so
+%_kde4_modulesdir/nepomukremovablestorageservice.so
%_kde_config_dir/emoticons.knsrc
%_kde_config_dir/icons.knsrc
+%_kde_config_dir/khotnewstuff_upload.knsrc
%_kde4_appsdir/cmake
%exclude %_kde4_appsdir/desktoptheme/default/widgets/branding.svgz
%_kde4_appsdir/desktoptheme
@@ -282,13 +322,13 @@
%_kde4_appsdir/kconf_update/devicepreference.upd
%_kde4_appsdir/kconf_update/kuriikwsfilter.upd
%_kde4_appsdir/kde/kde.notifyrc
+%_kde4_appsdir/nepomukstrigiservice/nepomukstrigiservice.notifyrc
%_kde4_appsdir/khelpcenter
%_kde4_appsdir/kio_bookmarks
%_kde4_appsdir/kio_desktop
%_kde4_appsdir/kio_docfilter
%_kde4_appsdir/kio_finger
%_kde4_appsdir/kio_info
-%_kde4_appsdir/kio_thumbnail
%_kde4_appsdir/konqueror/dirtree/remote/smb-network.desktop
%_kde4_appsdir/ksmserver
%_kde4_appsdir/kstyle/themes/*.themerc
@@ -296,13 +336,14 @@
%_kde4_appsdir/libphonon
%_kde4_appsdir/nepomuk/ontologies
%_kde4_appsdir/nepomukstorage
-%_kde4_appsdir/nepomukstrigiservice/nepomukstrigiservice.notifyrc
%_kde4_appsdir/phonon
%_kde4_appsdir/remoteview
%_kde4_appsdir/konqsidebartng
%_kde_share_dir/config.kcfg/khelpcenter.kcfg
%_kde_share_dir/man
%_kde4_servicesdir/about.protocol
+%_kde4_servicesdir/nepomuk.protocol
+%_kde4_servicesdir/nepomukstrigiservice.desktop
%_kde4_servicesdir/applications.protocol
%_kde4_servicesdir/ar.protocol
%_kde4_servicesdir/bookmarks.protocol
@@ -321,6 +362,7 @@
%_kde4_servicesdir/fish.protocol
%_kde4_servicesdir/fixhosturifilter.desktop
%_kde4_servicesdir/floppy.protocol
+%_kde4_servicesdir/comicbookthumbnail.desktop
%_kde4_servicesdir/gzip.protocol
%_kde4_servicesdir/htmlthumbnail.desktop
%_kde4_servicesdir/icons.desktop
@@ -333,7 +375,6 @@
%_kde4_servicesdir/kcm_nepomuk.desktop
%_kde4_servicesdir/kcmnotify.desktop
%_kde4_servicesdir/kcm_phonon.desktop
-%_kde4_servicesdir/kcm_phononxine.desktop
%_kde4_servicesdir/kcmtrash.desktop
%_kde4_servicesdir/kded/desktopnotifier.desktop
%_kde4_servicesdir/kded/kpasswdserver.desktop
@@ -361,7 +402,6 @@
%_kde4_servicesdir/nepomukqueryservice.desktop
%_kde4_servicesdir/nepomuksearch.protocol
%_kde4_servicesdir/nepomukstorage.desktop
-%_kde4_servicesdir/nepomukstrigiservice.desktop
%_kde4_servicesdir/nfs.protocol
%_kde4_servicesdir/programs.protocol
%_kde4_servicesdir/remote.protocol
@@ -369,8 +409,8 @@
%_kde4_servicesdir/renimagedlg.desktop
%_kde4_servicesdir/searchproviders
%_kde4_servicesdir/settings.protocol
-%_kde4_servicesdir/sftp.protocol
%_kde4_servicesdir/smb.protocol
+%_kde4_servicesdir/sftp.protocol
%_kde4_servicesdir/spellchecking.desktop
%_kde4_servicesdir/svgthumbnail.desktop
%_kde4_servicesdir/tar.protocol
@@ -379,10 +419,17 @@
%_kde4_servicesdir/trash.protocol
%_kde4_servicesdir/zip.protocol
%_kde4_servicesdir/network.protocol
-%_kde4_servicetypesdir/nepomukservice.desktop
-%_kde4_servicetypesdir/phononbackend.desktop
-%_kde4_servicetypesdir/searchprovider.desktop
-%_kde4_servicetypesdir/thumbcreator.desktop
+%_kde4_servicesdir/windowsimagethumbnail.desktop
+%_kde4_servicesdir/windowsexethumbnail.desktop
+%_kde4_servicesdir/timeline.protocol
+%_kde4_servicesdir/attica.desktop
+%_kde4_servicesdir/device_automounter_kcm.desktop
+%_kde4_servicesdir/kded/device_automounter.desktop
+%_kde4_servicesdir/nepomukremovablestorageservice.desktop
+%_kde4_servicetypes/nepomukservice.desktop
+%_kde4_servicetypes/phononbackend.desktop
+%_kde4_servicetypes/searchprovider.desktop
+%_kde4_servicetypes/thumbcreator.desktop
%_kde4_libdir/kconf_update_bin/phonon_devicepreference_update
%_kde4_libdir/kconf_update_bin/phonon_deviceuids_update
%_kde4_libdir/libkdeinit4_kcmshell4.so
@@ -409,6 +456,7 @@
%_kde4_bindir/kglobalaccel
%_kde4_bindir/khelpcenter
%_kde4_bindir/khotnewstuff4
+%_kde4_bindir/khotnewstuff-upload
%_kde4_bindir/kiconfinder
%_kde4_bindir/kioclient
%_kde4_bindir/kmimetypefinder
@@ -448,7 +496,6 @@
%exclude %dir /usr/share/locale/en_US
%endif
/usr/share/locale/*
-/usr/share/locale/en_US/entry.desktop
/usr/share/sounds/*.ogg
%_kde4_servicesdir/desktopthumbnail.desktop
%_kde4_mandir/man8/nepomukserver.8.gz
@@ -460,5 +507,12 @@
%_kde4_modulesdir/plasma_runnerscript_javascript.so
%_kde4_servicesdir/plasma-scriptengine-applet-simple-javascript.desktop
%_kde4_servicesdir/plasma-scriptengine-runner-javascript.desktop
+%_kde4_modulesdir/plasma_dataenginescript_javascript.so
+%_kde4_servicesdir/plasma-scriptengine-dataengine-javascript.desktop
+%_kde4_appsdir/kglobalaccel
+%if %suse_version > 1110
+%_kde4_servicesdir/lzma.protocol
+%_kde4_servicesdir/xz.protocol
+%endif
%changelog
++++++ 4_3_BRANCH.diff -> 4_4_BRANCH.diff ++++++
++++++ kdebase-runtime-4.3.3.tar.bz2 -> kdebase-runtime-4.3.80.tar.bz2 ++++++
KDE/kdebase4-runtime/kdebase-runtime-4.3.3.tar.bz2 /mounts/work_src_done/STABLE/kdebase4-runtime/kdebase-runtime-4.3.80.tar.bz2 differ: byte 11, line 1
++++++ kdesu-remember-keep-password.diff ++++++
--- /var/tmp/diff_new_pack.jjx4WD/_old 2009-12-16 10:13:17.000000000 +0100
+++ /var/tmp/diff_new_pack.jjx4WD/_new 2009-12-16 10:13:17.000000000 +0100
@@ -6,9 +6,9 @@
Index: kdesu/kdesu/kdesu.cpp
===================================================================
---- kdesu/kdesu/kdesu.cpp (revision 810350)
-+++ kdesu/kdesu/kdesu.cpp (working copy)
-@@ -333,6 +333,9 @@
+--- kdesu/kdesu/kdesu.cpp.orig
++++ kdesu/kdesu/kdesu.cpp
+@@ -353,6 +353,9 @@ static int startApp()
// Read configuration
KConfigGroup config(KGlobal::config(), "Passwords");
int timeout = config.readEntry("Timeout", defTimeout);
@@ -18,7 +18,7 @@
// Check if we need a password
SuProcess proc;
-@@ -364,8 +367,7 @@
+@@ -384,8 +387,7 @@ static int startApp()
KDEsuDialog dlg(user, auth_user, keep && !terminal, icon, withIgnoreButton);
if (prompt)
dlg.addCommentLine(i18n("Command:"), command);
@@ -28,7 +28,7 @@
if ((priority != 50) || (scheduler != SuProcess::SchedNormal))
{
-@@ -388,6 +390,7 @@
+@@ -414,6 +416,7 @@ static int startApp()
change_uid = false;
password = dlg.password();
keep = dlg.keepPassword();
++++++ knetattach-show.diff ++++++
--- /var/tmp/diff_new_pack.jjx4WD/_old 2009-12-16 10:13:17.000000000 +0100
+++ /var/tmp/diff_new_pack.jjx4WD/_new 2009-12-16 10:13:17.000000000 +0100
@@ -2,7 +2,7 @@
===================================================================
--- knetattach/knetattach.desktop.orig
+++ knetattach/knetattach.desktop
-@@ -171,3 +171,4 @@ Terminal=false
+@@ -173,3 +173,4 @@ Terminal=false
X-KDE-StartupNotify=true
Categories=Qt;KDE;Network;RemoteAccess;
X-DocPath=knetattach/index.html
++++++ simple-ccsm-kde.diff ++++++
--- /var/tmp/diff_new_pack.jjx4WD/_old 2009-12-16 10:13:17.000000000 +0100
+++ /var/tmp/diff_new_pack.jjx4WD/_new 2009-12-16 10:13:17.000000000 +0100
@@ -7,7 +7,7 @@
===================================================================
--- kcontrol/componentchooser/windowmanagers/compiz.desktop.orig
+++ kcontrol/componentchooser/windowmanagers/compiz.desktop
-@@ -74,5 +74,6 @@ Name[zh_CN]=Compiz
+@@ -75,5 +75,6 @@ Name[zh_CN]=Compiz
Name[zh_TW]=Compiz
Exec=compiz ccp
TryExec=compiz
++++++ soprano-optional-backend.diff ++++++
------------------------------------------------------------------------
r1051854 | trueg | 2009-11-20 10:53:00 +0100 (Fri, 20 Nov 2009) | 1 line
We need a recent kdelibs
------------------------------------------------------------------------
--- CMakeLists.txt
+++ CMakeLists.txt
@@ -21,9 +21,11 @@ macro_optional_find_package(Soprano)
macro_optional_find_package(Nepomuk)
macro_log_feature(Soprano_FOUND "Soprano" "Soprano Libraries" "kdesupport" FALSE "" "Required to build Nepomuk.")
macro_log_feature(Nepomuk_FOUND "Nepomuk" "Nepomuk Libraries" "kdelibs" FALSE "" "Required to build Nepomuk.")
-macro_log_feature(SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND "Soprano Virtuoso Backend" "Virtuoso storage backend for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano Virtuoso backend is required to run the Nepomuk semantic desktop system.")
-macro_log_feature(SOPRANO_PLUGIN_RAPTORPARSER_FOUND "Soprano Raptor Parser" "RDF parser plugin for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano raptor parser plugin is required to build the Nepomuk semantic desktop system.")
-macro_log_feature(SOPRANO_PLUGIN_REDLANDBACKEND_FOUND "Soprano Redland Backend" "Redland storage backend for Soprano" "http://soprano.sourceforge.net" FALSE "" "The Soprano redland backend is required to build the Nepomuk semantic desktop system.")
+if(SOPRANO_PLUGIN_SESAME2BACKEND_FOUND OR SOPRANO_PLUGIN_REDLANDBACKEND_FOUND OR SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND)
+ set(SOPRANO_BACKEND_FOUND true)
+endif(SOPRANO_PLUGIN_SESAME2BACKEND_FOUND OR SOPRANO_PLUGIN_REDLANDBACKEND_FOUND OR SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND)
+macro_log_feature(SOPRANO_BACKEND_FOUND "Soprano Storage Backend" "Soprano Libraries" "kdesupport" FALSE "" "No Soprano storage backend found. Nepomuk will not be compiled without it. (It is highly recommended to use the Sesame2 backend for performance.)")
+macro_log_feature(SOPRANO_PLUGIN_RAPTORPARSER_FOUND "Soprano raptor parser plugin" "Soprano Libraries" "kdesupport" FALSE "" "Required to run Nepomuk.")
macro_optional_find_package(SLP)
macro_log_feature( SLP_FOUND
@@ -62,9 +64,9 @@ if ( UNIX )
add_subdirectory(solidautoeject)
add_subdirectory(solid-device-automounter)
endif ( UNIX )
-if(Soprano_FOUND AND Nepomuk_FOUND AND STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND)
+if(Soprano_FOUND AND Nepomuk_FOUND AND STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_BACKEND_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND)
macro_optional_add_subdirectory(nepomuk)
-endif(Soprano_FOUND AND Nepomuk_FOUND AND STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_PLUGIN_REDLANDBACKEND_FOUND AND SOPRANO_PLUGIN_VIRTUOSOBACKEND_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND)
+endif(Soprano_FOUND AND Nepomuk_FOUND AND STRIGI_STRIGIQTDBUSCLIENT_LIBRARY AND SOPRANO_BACKEND_FOUND AND SOPRANO_PLUGIN_RAPTORPARSER_FOUND)
# Plugins/components required for basic utility
add_subdirectory(kcontrol)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org