Hello community, here is the log from the commit of package kdelibs4 checked in at Wed Nov 28 23:24:06 CET 2007. -------- --- KDE/kdelibs4/kdelibs4.changes 2007-11-14 17:36:00.000000000 +0100 +++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2007-11-21 18:57:22.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Nov 21 18:57:22 CET 2007 - dmueller@suse.de + +- update to 3.96.1 + +------------------------------------------------------------------- Old: ---- kdelibs-3.96.0.tar.bz2 kdelibs-fix-version.diff New: ---- kde3-applications.diff kdelibs-3.96.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.uh8817/_old 2007-11-28 23:23:42.000000000 +0100 +++ /var/tmp/diff_new_pack.uh8817/_new 2007-11-28 23:23:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kdelibs4 (Version 3.96.0) +# spec file for package kdelibs4 (Version 3.96.1) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -21,15 +21,17 @@ Group: System/GUI/KDE Summary: KDE Base Libraries Url: http://www.kde.org -Version: 3.96.0 +Version: 3.96.1 Release: 1 -%define rversion 3.96.0 +%define rversion 3.96.1 Requires: libqt4-x11 >= %( echo `rpm -q --queryformat '%{VERSION}' libqt4-x11`) -Requires: kdelibs4-core dbus-1-x11 shared-mime-info +Requires: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi`) +Requires: kdelibs4-core >= %version +Requires: dbus-1-x11 shared-mime-info Source0: kdelibs-%rversion.tar.bz2 Source1: _upstream Patch0: dotkde4.diff -Patch1: kdelibs-fix-version.diff +Patch1: kde3-applications.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,6 +71,10 @@ %install cd build %makeinstall + %create_subdir_filelist -d kdecore -n kdelibs-%rversion -o devel + %create_subdir_filelist -d kpty -n kdelibs-%rversion -o devel -f kdecore + cd .. + cat filelists/* | while read line; do echo "%exclude $line";done >filelists/exclude mkdir -p $RPM_BUILD_ROOT/etc/xdg/menus/applications-merged mv $RPM_BUILD_ROOT/usr/etc/xdg/menus/applications.menu \ $RPM_BUILD_ROOT/etc/xdg/menus/applications.menu.kde4 @@ -88,6 +94,7 @@ %clean rm -rf $RPM_BUILD_ROOT + rm -rf filelists %package doc Group: System/GUI/KDE @@ -107,7 +114,6 @@ -------- The KDE Team <kde@kde.org> - %files doc %defattr(-,root,root) /usr/bin/meinproc4 @@ -159,19 +165,17 @@ -------- The KDE Team <kde@kde.org> - -%files -n kdelibs4-core +%files -n kdelibs4-core -f filelists/kdecore %defattr(-,root,root) %doc COPYING COPYING-DOCS COPYING.LIB README -/usr/bin/kde4-config -%_libdir/kde4/ktranscript.so -%_libdir/kde4/libexec/kgrantpty +%exclude %_libdir/libkdecore.so.* +%exclude %_libdir/libkdefakes.so.* +%exclude %_libdir/libkpty.so.* +%exclude /usr/bin/kconfig_compiler +%dir /usr/%_lib/kde4 +%dir /usr/share/kde4/servicetypes %config %_kde_config_dir/kdebug.areas %config %_kde_config_dir/kdebugrc -%dir %_kde_share_dir -%_kde_share_dir/servicetypes/kplugininfo.desktop -%_kde_share_dir/servicetypes/sonnetspeller.desktop -/usr/share/locale/all_languages %package -n libkdecore4-devel Group: System/GUI/KDE @@ -189,106 +193,10 @@ -------- The KDE Team <kde@kde.org> - -%files -n libkdecore4-devel +%files -n libkdecore4-devel -f filelists/kdecore.devel %defattr(-,root,root) %doc COPYING COPYING-DOCS COPYING.LIB README /usr/bin/kconfig_compiler -/usr/include/conversion_check.h -/usr/include/k3bufferedsocket.h -/usr/include/k3clientsocketbase.h -/usr/include/k3datagramsocket.h -/usr/include/k3httpproxysocketdevice.h -/usr/include/k3processcontroller.h -/usr/include/k3process.h -/usr/include/k3procio.h -/usr/include/k3resolver.h -/usr/include/k3reverseresolver.h -/usr/include/k3serversocket.h -/usr/include/k3socketaddress.h -/usr/include/k3socketbase.h -/usr/include/k3socketdevice.h -/usr/include/k3socks.h -/usr/include/k3sockssocketdevice.h -/usr/include/k3streamsocket.h -/usr/include/k3staticdeleter.h -/usr/include/kaboutdata.h -/usr/include/kallocator.h -/usr/include/kascii.h -/usr/include/kauthorized.h -/usr/include/kautosavefile.h -/usr/include/kautostart.h -/usr/include/kcalendarsystem.h -/usr/include/kcharsets.h -/usr/include/kcmdlineargs.h -/usr/include/kcodecs.h -/usr/include/kcomponentdata.h -/usr/include/kcompositejob.h -/usr/include/kconfigbase.h -/usr/include/kconfiggroup.h -/usr/include/kconfig.h -/usr/include/kdatetime.h -/usr/include/kdebug.h -/usr/include/kdecore_export.h -/usr/include/kdedmodule.h -/usr/include/kdefakes.h -/usr/include/kde_file.h -/usr/include/kdesktopfile.h -/usr/include/kdeversion.h -/usr/include/kencodingdetector.h -/usr/include/kfilterbase.h -/usr/include/kfilterdev.h -/usr/include/kgenericfactory.h -/usr/include/kgenericfactory.tcc -/usr/include/kglobal.h -/usr/include/kjob.h -/usr/include/kjobtrackerinterface.h -/usr/include/kjobuidelegate.h -/usr/include/klauncher_iface.h -/usr/include/klibloader.h -/usr/include/klocale.h -/usr/include/klocalizedstring.h -/usr/include/klocalsocket.h -/usr/include/klockfile.h -/usr/include/kmacroexpander.h -/usr/include/kmessage.h -/usr/include/kmimetype.h -/usr/include/kmimetypetrader.h -/usr/include/kmountpoint.h -/usr/include/kplugininfo.h -/usr/include/kprotocolinfo.h -/usr/include/kpty.h -/usr/include/krandom.h -/usr/include/krandomsequence.h -/usr/include/ksavefile.h -/usr/include/kservice.h -/usr/include/kservicetype.h -/usr/include/kservicetypeprofile.h -/usr/include/kservicetypetrader.h -/usr/include/ksharedconfig.h -/usr/include/ksharedptr.h -/usr/include/kshell.h -/usr/include/ksocketfactory.h -/usr/include/ksortablelist.h -/usr/include/kstandarddirs.h -/usr/include/kstringhandler.h -/usr/include/ksycocaentry.h -/usr/include/ksycoca.h -/usr/include/ksycocatype.h -/usr/include/ksystemtimezone.h -/usr/include/ktempdir.h -/usr/include/ktemporaryfile.h -/usr/include/ktoolinvocation.h -/usr/include/ktypelist.h -/usr/include/ktzfiletimezone.h -/usr/include/kurl.h -/usr/include/kuser.h -/usr/include/qtest_kde.h -/usr/include/sonnet/backgroundchecker.h -/usr/include/sonnet/speller.h -%_libdir/libkdecore.so -%_libdir/libkpty.so -%_libdir/libkdefakes.so %package -n libkde4 Group: System/GUI/KDE @@ -365,169 +273,48 @@ -------- The KDE Team <kde@kde.org> - -%files -n libkde4-devel +%files -n libkde4-devel -f filelists/exclude %defattr(-,root,root) -%exclude /usr/include/conversion_check.h -%exclude /usr/include/k3bufferedsocket.h -%exclude /usr/include/k3clientsocketbase.h -%exclude /usr/include/k3datagramsocket.h -%exclude /usr/include/k3httpproxysocketdevice.h -%exclude /usr/include/k3processcontroller.h -%exclude /usr/include/k3process.h -%exclude /usr/include/k3procio.h -%exclude /usr/include/k3resolver.h -%exclude /usr/include/k3reverseresolver.h -%exclude /usr/include/k3serversocket.h -%exclude /usr/include/k3socketaddress.h -%exclude /usr/include/k3socketbase.h -%exclude /usr/include/k3socketdevice.h -%exclude /usr/include/k3socks.h -%exclude /usr/include/k3sockssocketdevice.h -%exclude /usr/include/k3streamsocket.h -%exclude /usr/include/k3staticdeleter.h -%exclude /usr/include/kaboutdata.h -%exclude /usr/include/kallocator.h -%exclude /usr/include/kascii.h -%exclude /usr/include/kauthorized.h -%exclude /usr/include/kautosavefile.h -%exclude /usr/include/kautostart.h -%exclude /usr/include/kcalendarsystem.h -%exclude /usr/include/kcharsets.h -%exclude /usr/include/kcmdlineargs.h -%exclude /usr/include/kcodecs.h -%exclude /usr/include/kcomponentdata.h -%exclude /usr/include/kcompositejob.h -%exclude /usr/include/kconfigbase.h -%exclude /usr/include/kconfiggroup.h -%exclude /usr/include/kconfig.h -%exclude /usr/include/kdatetime.h -%exclude /usr/include/kdebug.h -%exclude /usr/include/kdecore_export.h -%exclude /usr/include/kdedmodule.h -%exclude /usr/include/kdefakes.h -%exclude /usr/include/kde_file.h -%exclude /usr/include/kdesktopfile.h -%exclude /usr/include/kdeversion.h -%exclude /usr/include/kencodingdetector.h -%exclude /usr/include/kfilterbase.h -%exclude /usr/include/kfilterdev.h -%exclude /usr/include/kgenericfactory.h -%exclude /usr/include/kgenericfactory.tcc -%exclude /usr/include/kglobal.h -%exclude /usr/include/kjob.h -%exclude /usr/include/kjobtrackerinterface.h -%exclude /usr/include/kjobuidelegate.h -%exclude /usr/include/klauncher_iface.h -%exclude /usr/include/klibloader.h -%exclude /usr/include/klocale.h -%exclude /usr/include/klocalizedstring.h -%exclude /usr/include/klocalsocket.h -%exclude /usr/include/klockfile.h -%exclude /usr/include/kmacroexpander.h -%exclude /usr/include/kmessage.h -%exclude /usr/include/kmimetype.h -%exclude /usr/include/kmimetypetrader.h -%exclude /usr/include/kmountpoint.h -%exclude /usr/include/kplugininfo.h -%exclude /usr/include/kprotocolinfo.h -%exclude /usr/include/kpty.h -%exclude /usr/include/krandom.h -%exclude /usr/include/krandomsequence.h -%exclude /usr/include/ksavefile.h -%exclude /usr/include/kservice.h -%exclude /usr/include/kservicetype.h -%exclude /usr/include/kservicetypeprofile.h -%exclude /usr/include/kservicetypetrader.h -%exclude /usr/include/ksharedconfig.h -%exclude /usr/include/ksharedptr.h -%exclude /usr/include/kshell.h -%exclude /usr/include/ksocketfactory.h -%exclude /usr/include/ksortablelist.h -%exclude /usr/include/kstandarddirs.h -%exclude /usr/include/kstringhandler.h -%exclude /usr/include/ksycocaentry.h -%exclude /usr/include/ksycoca.h -%exclude /usr/include/ksycocatype.h -%exclude /usr/include/ksystemtimezone.h -%exclude /usr/include/ktempdir.h -%exclude /usr/include/ktemporaryfile.h -%exclude /usr/include/ktoolinvocation.h -%exclude /usr/include/ktypelist.h -%exclude /usr/include/ktzfiletimezone.h -%exclude /usr/include/kurl.h -%exclude /usr/include/kuser.h -%exclude /usr/include/qtest_kde.h -%exclude /usr/include/sonnet/backgroundchecker.h -%exclude /usr/include/sonnet/speller.h /usr/bin/kde4automoc /usr/include/* %_kde_share_dir/apps/cmake -%_libdir/libkaudiodevicelist.so -%_libdir/libkde3support.so -%_libdir/libkdesu.so -%_libdir/libkdeui.so -%_libdir/libkdnssd.so -%_libdir/libkhtml.so -%_libdir/libkimproxy.so -%_libdir/libkio.so -%_libdir/libkjs.so -%_libdir/libkjsembed.so -%_libdir/libkmediaplayer.so -%_libdir/libknotifyconfig.so -%_libdir/libkntlm.so -%_libdir/libkparts.so -%_libdir/libkrosscore.so -%_libdir/libktexteditor.so -%_libdir/libkunittest.so -%_libdir/libkutils.so -%_libdir/libkrossui.so -%_libdir/libkwalletbackend.so -%_libdir/libsolid.so -%_libdir/libthreadweaver.so -%_libdir/libphononexperimental.so -%_libdir/libkfile.so -%_libdir/libknewstuff2.so -%_libdir/libphonon.so -%_libdir/libnepomuk.so +%exclude %_libdir/libkdeinit4_*.so +%_libdir/*.so -%files +%files -f filelists/exclude %defattr(-,root,root) %exclude /usr/bin/meinproc4 -%exclude /usr/bin/kde4automoc %exclude %_kde_share_dir/apps/ksgmltools2 %exclude %_kde_share_dir/apps/cmake -%exclude /usr/bin/kde4-config -%exclude /usr/%_lib/kde4/ktranscript.so -%exclude /usr/%_lib/kde4/libexec/kgrantpty -%exclude %_kde_config_dir/kdebug.areas -%exclude %_kde_config_dir/kdebugrc -%exclude %_kde_share_dir/servicetypes/kplugininfo.desktop -%exclude %_kde_share_dir/servicetypes/sonnetspeller.desktop -%exclude /usr/share/locale/all_languages -%exclude /usr/bin/kconfig_compiler +%exclude /usr/bin/kde4automoc /usr/bin/* -%_libdir/kde4 -%_libdir/libkdeinit4_kconf_update.so -%_libdir/libkdeinit4_kded4.so -%_libdir/libkdeinit4_kio_http_cache_cleaner.so -%_libdir/libkdeinit4_klauncher.so -%_libdir/libkdeinit4_kbuildsycoca4.so +%_libdir/kde4/* +%_libdir/libkdeinit4_*.so %_kde_share_dir/apps/* %config %_kde_config_dir/* -/usr/share/dbus-1 -/usr/share/doc/* -/usr/share/locale/* -%_kde_share_dir/services -%_kde_share_dir/servicetypes -/etc/xdg/menus +/usr/share/dbus-1/interfaces/* +/usr/share/doc/kde/HTML/en/common/* +%_kde_share_dir/services/* +%_kde_share_dir/servicetypes/* +/etc/xdg/menus/applications.menu.kde4 /usr/share/mime/packages/kde.xml /usr/share/icons/hicolor/*/actions/presence_away.* /usr/share/icons/hicolor/*/actions/presence_offline.* /usr/share/icons/hicolor/*/actions/presence_online.* /usr/share/icons/hicolor/*/actions/presence_unknown.* /usr/share/man/man*/* +%doc %lang(en) /usr/share/doc/kde/HTML/en/sonnet +%dir /etc/xdg/menus +%dir /usr/%_lib/kde4 +%dir /usr/share/doc/kde +%dir /usr/share/doc/kde/HTML +%dir /usr/share/doc/kde/HTML/en +%dir /usr/share/doc/kde/HTML/en/common +%dir /usr/share/kde4/servicetypes + %changelog +* Wed Nov 21 2007 - dmueller@suse.de +- update to 3.96.1 * Wed Nov 14 2007 - dmueller@suse.de - update to 3.96.0 * Tue Nov 06 2007 - dmueller@suse.de ++++++ kde3-applications.diff ++++++ Index: kdecore/services/kservice.cpp =================================================================== --- kdecore/services/kservice.cpp (revision 741745) +++ kdecore/services/kservice.cpp (working copy) @@ -46,6 +46,7 @@ { const QString entryPath = q->entryPath(); bool absPath = !QDir::isRelativePath(entryPath); + bool kde3application = config->fileName().startsWith("/opt/kde3/share/applications/kde/"); // TODO: it makes sense to have a KConstConfigGroup I guess const KConfigGroup desktopGroup = const_cast<KDesktopFile*>(config)->desktopGroup(); @@ -73,6 +75,8 @@ if (i != -1) m_strName = m_strName.left(i); } + if (kde3application) + m_strName += "/KDE3"; m_strType = config->readType(); entryMap.remove("Type"); @@ -96,6 +100,18 @@ // NOT readPathEntry, it is not XDG-compliant. Path entries written by // KDE4 will be still treated as such, though. m_strExec = desktopGroup.readEntry( "Exec", QString() ); + if (kde3application && !m_strExec.startsWith("/")) + m_strExec = "/opt/kde3/bin/"+m_strExec; + else if (desktopGroup.readEntry("X-KDE-SubstituteUID"), false) { + int space = m_strExec.indexOf(" "); + if (space==-1) + m_strExec = KStandardDirs::findExe(m_strExec); + else { + const QString command = m_strExec.left(space); + m_strExec.replace(command,KStandardDirs::findExe(command)); + } + } + entryMap.remove("Exec"); if ( m_strType == "Application" ) { @@ -179,7 +195,8 @@ entryMap.remove("ServiceTypes"); m_lstServiceTypes += desktopGroup.readEntry( "X-KDE-ServiceTypes", QStringList() ); entryMap.remove("X-KDE-ServiceTypes"); - m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" ); + if (!kde3application) + m_lstServiceTypes += desktopGroup.readXdgListEntry( "MimeType" ); entryMap.remove("MimeType"); if ( m_strType == "Application" && !m_lstServiceTypes.contains("Application") ) @@ -208,6 +225,8 @@ m_DBUSStartusType = KService::DBusNone; m_strDesktopEntryName = _name.toLower(); + if (kde3application) + m_strDesktopEntryName = "kde-" + m_strDesktopEntryName; m_bAllowAsDefault = desktopGroup.readEntry("AllowDefault", true); entryMap.remove("AllowDefault"); @@ -221,7 +240,9 @@ // qDebug("Path = %s", entryPath.toLatin1().constData()); QMap<QString,QString>::ConstIterator it = entryMap.begin(); for( ; it != entryMap.end();++it) { - const QString key = it.key(); + QString key = it.key(); + if (kde3application && key=="OnlyShowIn" && QVariant(*it)=="KDE;") + key = "NotShowIn"; // do not store other translations like Name[fr]; kbuildsycoca will rerun if we change languages anyway if (!key.contains('[')) { //kDebug(7012) << " Key =" << key << " Data =" << *it; ++++++ kdelibs-3.96.0.tar.bz2 -> kdelibs-3.96.1.tar.bz2 ++++++ KDE/kdelibs4/kdelibs-3.96.0.tar.bz2 /mounts/work_src_done/STABLE/kdelibs4/kdelibs-3.96.1.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de