Hello community, here is the log from the commit of package kdebase4-runtime for openSUSE:Factory checked in at 2013-07-08 07:34:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdebase4-runtime (Old) and /work/SRC/openSUSE:Factory/.kdebase4-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdebase4-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdebase4-runtime/kdebase4-runtime.changes 2013-06-11 09:31:12.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kdebase4-runtime.changes 2013-07-08 07:34:24.000000000 +0200 @@ -1,0 +2,26 @@ +Tue Jul 2 12:14:50 UTC 2013 - tittiatc...@gmail.com + +- Use the new variable _kde_branding_version for the branding + packages + +------------------------------------------------------------------- +Sun Jun 30 14:21:20 UTC 2013 - hrvoje.sen...@gmail.com + +- Enable webp support + +------------------------------------------------------------------- +Thu Jun 27 18:09:07 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.90 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta2.php + +------------------------------------------------------------------- +Thu Jun 13 19:10:17 UTC 2013 - tittiatc...@gmail.com + +- Update to 4.10.80 + * KDE 4.11 Beta 1 release + * See http://www.kde.org/announcements/announce-4.11-beta1.php +- Dropped desktop-files.diff, not needed anymore + +------------------------------------------------------------------- Old: ---- desktop-files.diff kde-runtime-4.10.4.tar.xz New: ---- kde-runtime-4.10.90.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdebase4-runtime.spec ++++++ --- /var/tmp/diff_new_pack.IYKFMb/_old 2013-07-08 07:34:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IYKFMb/_new 2013-07-08 07:34:25.000000000 +0200 @@ -17,7 +17,7 @@ Name: kdebase4-runtime -Version: 4.10.4 +Version: 4.10.90 Release: 0 Summary: The KDE Runtime Components License: GPL-2.0+ @@ -37,7 +37,6 @@ Patch13: ksuseinstall.diff Patch15: kdesu-symbol-lookup-workaround.diff Patch16: phonon-always-forget.diff -Patch17: desktop-files.diff BuildRequires: NetworkManager-devel BuildRequires: fdupes BuildRequires: libcanberra-devel @@ -57,6 +56,7 @@ BuildRequires: nepomuk-core-devel BuildRequires: openslp-devel BuildRequires: xz +BuildRequires: pkgconfig(libwebp) PreReq: permissions Requires: dbus-1-x11 Requires: kdelibs4 >= %{version} @@ -77,16 +77,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): shared-mime-info Requires(postun): shared-mime-info -%if 0%{?suse_version} == 1220 -Requires: %{name}-branding = 12.2 -%endif -%if 0%{?suse_version} == 1230 -Requires: %{name}-branding = 12.3 -%endif -%if 0%{?suse_version} > 1230 -# DO NOT REQUIRE DISTRIBUTIONS -Requires: %{name}-branding = 4.10 -%endif +Requires: %{name}-branding = %{_kde_branding_version} 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 @@ -102,17 +93,7 @@ %package branding-upstream Summary: The KDE Runtime Components Group: System/GUI/KDE -#BRAND: FIXME -%if 0%{?suse_version} == 1220 -Provides: %{name}-branding = 12.2 -%endif -%if 0%{?suse_version} == 1230 -Provides: %{name}-branding = 12.3 -%endif -%if 0%{?suse_version} > 1230 -# KDE branding is *not* openSUSE specific. especially the upstream branding -Provides: %{name}-branding = 4.10 -%endif +Provides: %{name}-branding = %{_kde_branding_version} Supplements: packageand(kdebase4-runtime:branding-upstream) Conflicts: otherproviders(%{name}-branding) @@ -145,10 +126,9 @@ %patch7 %patch10 %patch11 -%patch13 +#%patch13 %patch15 %patch16 -%patch17 %build %cmake_kde4 -d build -- -DKDE4_ENABLE_FPIE=1 @@ -353,6 +333,7 @@ %{_kde4_libdir}/libkwalletbackend.so %{_kde4_libdir}/libmolletnetwork.so %{_kde4_modulesdir}/imports/ +%{_kde4_modulesdir}/plugins/imageformats/kimg_webp.so %{_kde4_modulesdir}/plugins/phonon_platform %{_kde4_modulesdir}/kio_recentdocuments.so %{_kde4_modulesdir}/kded_recentdocumentsnotifier.so @@ -389,6 +370,7 @@ %{_kde4_appsdir}/kcmlocale %{_kde4_appsdir}/kcm_phonon %{_kde4_appsdir}/kconf_update/devicepreference.upd +%{_kde4_appsdir}/kconf_update/drkonqi-rename-config-section.upd %{_kde4_appsdir}/kconf_update/kuriikwsfilter.upd %{_kde4_appsdir}/kde/kde.notifyrc %{_kde4_appsdir}/kglobalaccel @@ -447,6 +429,7 @@ %{_kde4_servicesdir}/cursorthumbnail.desktop %{_kde4_servicesdir}/desktopthumbnail.desktop %{_kde4_servicesdir}/device_automounter_kcm.desktop +%{_kde4_servicesdir}/desktop-search.desktop %{_kde4_servicesdir}/directorythumbnail.desktop %{_kde4_servicesdir}/djvuthumbnail.desktop %{_kde4_servicesdir}/emoticons.desktop @@ -483,6 +466,7 @@ %{_kde4_servicesdir}/plasma-scriptengine-applet-simple-javascript.desktop %{_kde4_servicesdir}/plasma-scriptengine-dataengine-javascript.desktop %{_kde4_servicesdir}/plasma-scriptengine-runner-javascript.desktop +%{_kde4_servicesdir}/qimageioplugins/webp.desktop %{_kde4_servicesdir}/renaudiodlg.desktop %{_kde4_servicesdir}/renimagedlg.desktop %{_kde4_servicesdir}/searchproviders @@ -516,10 +500,6 @@ # --- applications --- %{_kde4_applicationsdir}/Help.desktop %{_kde4_applicationsdir}/knetattach.desktop -%{_kde4_applicationsdir}/nepomukcontroller.desktop - -# --- autostart --- -%{_kde4_datadir}/autostart/nepomukcontroller.desktop # --- libraries--- %{_kde4_libdir}/libkwalletbackend.so.* @@ -557,7 +537,6 @@ %{_kde4_bindir}/kuiserver %{_kde4_bindir}/kwalletd %{_kde4_bindir}/kwriteconfig -%{_kde4_bindir}/nepomukcontroller %{_kde4_bindir}/plasmapkg %{_kde4_bindir}/plasma-remote-helper %{_kde4_bindir}/solid-hardware @@ -586,6 +565,7 @@ %{_kde4_datadir}/desktop-directories %{_kde4_datadir}/locale/* %{_kde4_datadir}/mime/packages/network.xml +%{_kde4_datadir}/mime/packages/webp.xml %{_kde4_datadir}/polkit-1/actions/org.kde.kcontrol.kcmremotewidgets.policy %changelog ++++++ kde-runtime-4.10.4.tar.xz -> kde-runtime-4.10.90.tar.xz ++++++ /work/SRC/openSUSE:Factory/kdebase4-runtime/kde-runtime-4.10.4.tar.xz /work/SRC/openSUSE:Factory/.kdebase4-runtime.new/kde-runtime-4.10.90.tar.xz differ: char 27, line 1 ++++++ ksuseinstall.diff ++++++ --- /var/tmp/diff_new_pack.IYKFMb/_old 2013-07-08 07:34:25.000000000 +0200 +++ /var/tmp/diff_new_pack.IYKFMb/_new 2013-07-08 07:34:25.000000000 +0200 @@ -1,19 +1,19 @@ --- drkonqi/backtracewidget.cpp 2011-04-29 21:38:13.000000000 +0200 +++ drkonqi/backtracewidget.cpp 2011-04-30 08:52:05.680000631 +0200 -@@ -39,6 +39,10 @@ +@@ -30,6 +30,10 @@ #include <KToolInvocation> #include <KGlobalSettings> - + +#if 1 +#include "susedebugpackageinstaller.h" +#endif + - const char *extraDetailsLabelMargin = " margin: 5px; "; - - BacktraceWidget::BacktraceWidget(BacktraceGenerator *generator, QWidget *parent, -@@ -50,7 +54,11 @@ BacktraceWidget::BacktraceWidget(BacktraceGenerator *generator, QWidget *parent, + #include "drkonqi.h" + #include "backtraceratingwidget.h" + #include "crashedapplication.h" +@@ -50,7 +54,11 @@ BacktraceWidget::BacktraceWidget(Backtra ui.setupUi(this); - + //Debug package installer +#if 1 + m_debugPackageInstaller = new SUSEDebugPackageInstaller(this); @@ -25,11 +25,11 @@ connect(m_debugPackageInstaller, SIGNAL(canceled()), this, SLOT(debugPackageCanceled())); --- drkonqi/backtracewidget.h 2011-04-29 21:38:13.000000000 +0200 +++ drkonqi/backtracewidget.h 2011-04-30 08:52:05.681000631 +0200 -@@ -29,6 +29,10 @@ class QSyntaxHighlighter; +@@@ -29,6 +29,10 @@ class QSyntaxHighlighter; class BacktraceRatingWidget; class BacktraceGenerator; - -+#if 1 + ++#if 1 +class SUSEDebugPackageInstaller; +#endif + @@ -45,9 +45,9 @@ +#else DebugPackageInstaller * m_debugPackageInstaller; +#endif - - private Q_SLOTS: - void loadData(); + + void setAsLoading(); + --- drkonqi/CMakeLists.txt 2011-04-29 21:38:13.000000000 +0200 +++ drkonqi/CMakeLists.txt 2011-04-30 08:52:48.179000716 +0200 @@ -45,6 +45,7 @@ set(drkonqi_SRCS -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
