Hello community, here is the log from the commit of package kdelibs4 for openSUSE:Factory checked in at 2012-12-07 14:23:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdelibs4 (Old) and /work/SRC/openSUSE:Factory/.kdelibs4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdelibs4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4-apidocs.changes 2012-11-08 07:43:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4-apidocs.changes 2012-12-07 14:23:18.000000000 +0100 @@ -1,0 +2,36 @@ +Sat Dec 1 19:57:40 UTC 2012 - [email protected] + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sun Nov 25 11:39:38 UTC 2012 - [email protected] + +- Drop patch 4_7_branch.diff as it is not used at all + +------------------------------------------------------------------- +Tue Nov 24 14:08:11 UTC 2012 - [email protected] + +- Fix the SLES build + * Replace 'BuildRequires:pkgconfig(bzip2)' + * Disable the polkit backend (polkit is not available in SLES) + * Add kdelibs4-rpmlintrc to silence the percent-in-dependency and percent-in-provides errors + (rpmlint complains about 'Requires: %{name}-branding = %{brandingversion}' and + 'Provides: %{name}-branding = %{brandingversion}') +- Remove obsolete conditions + +------------------------------------------------------------------- +Sat Nov 24 12:46:55 UTC 2012 - [email protected] + +- Update to 4.9.80 + * see http://www.kde.org/announcements/announce-4.10-beta1.php +- Remove the patches enable-solid-udisks2-backend.diff and + kdelibs4-fix-python3-install.diff as it is now included upstream + +------------------------------------------------------------------- +Sun Nov 18 16:52:05 UTC 2012 - [email protected] + +- Explicitly require pkgconfig(bzip2) for 12.3 +- Recommend media-player-info for kde#269447, kde#269451 + +------------------------------------------------------------------- @@ -11 +47 @@ - * see http://kde.org/announcements/4.9.3/ for details + * see http://kde.org/announcements/announce-4.9.3.php for details @@ -30 +66 @@ - * see http://kde.org/announcements/4.9.2/ for details + * see http://kde.org/announcements/announce-4.9.2.php for details --- /work/SRC/openSUSE:Factory/kdelibs4/kdelibs4.changes 2012-11-18 20:30:07.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdelibs4.new/kdelibs4.changes 2012-12-07 14:23:18.000000000 +0100 @@ -1,0 +2,30 @@ +Sat Dec 1 19:57:40 UTC 2012 - [email protected] + +- Update to 4.9.90 + * This is the second Beta release for 4.10. Contains bugfixes + +------------------------------------------------------------------- +Sun Nov 25 11:39:38 UTC 2012 - [email protected] + +- Drop patch 4_7_branch.diff as it is not used at all + +------------------------------------------------------------------- +Tue Nov 24 14:08:11 UTC 2012 - [email protected] + +- Fix the SLES build + * Replace 'BuildRequires:pkgconfig(bzip2)' + * Disable the polkit backend (polkit is not available in SLES) + * Add kdelibs4-rpmlintrc to silence the percent-in-dependency and percent-in-provides errors + (rpmlint complains about 'Requires: %{name}-branding = %{brandingversion}' and + 'Provides: %{name}-branding = %{brandingversion}') +- Remove obsolete conditions + +------------------------------------------------------------------- +Sat Nov 24 12:46:55 UTC 2012 - [email protected] + +- Update to 4.9.80 + * see http://www.kde.org/announcements/announce-4.10-beta1.php +- Remove the patches enable-solid-udisks2-backend.diff and + kdelibs4-fix-python3-install.diff as it is now included upstream + +------------------------------------------------------------------- @@ -17 +47 @@ - * see http://kde.org/announcements/4.9.3/ for details + * see http://kde.org/announcements/announce-4.9.3.php for details @@ -36 +66 @@ - * see http://kde.org/announcements/4.9.2/ for details + * see http://kde.org/announcements/announce-4.9.2.php for details Old: ---- 4_7_BRANCH.diff enable-solid-udisks2-backend.diff kdelibs-4.9.3.tar.xz kdelibs4-fix-python3-install.diff New: ---- kdelibs-4.9.90.tar.xz kdelibs4-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdelibs4-apidocs.spec ++++++ --- /var/tmp/diff_new_pack.2GC0f8/_old 2012-12-07 14:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.2GC0f8/_new 2012-12-07 14:23:20.000000000 +0100 @@ -17,7 +17,7 @@ Name: kdelibs4-apidocs -Version: 4.9.3 +Version: 4.9.90 Release: 0 Summary: KDE 4 API documentation License: LGPL-2.1+ ++++++ kdelibs4.spec ++++++ --- /var/tmp/diff_new_pack.2GC0f8/_old 2012-12-07 14:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.2GC0f8/_new 2012-12-07 14:23:20.000000000 +0100 @@ -24,7 +24,7 @@ %define kderev 0 Name: kdelibs4 -Version: 4.9.3 +Version: 4.9.90 Release: 0 %define default_branding 4.8 BuildRequires: OpenEXR-devel @@ -53,7 +53,7 @@ BuildRequires: libdbusmenu-qt-devel BuildRequires: libgssglue-devel BuildRequires: libjasper-devel -%if %{?suse_version} > 1120 +%if !0%{?sles_version} BuildRequires: libpolkit-qt-1-devel %endif BuildRequires: libqca2-devel @@ -68,26 +68,24 @@ BuildRequires: strigi-devel BuildRequires: unzip BuildRequires: update-desktop-files -BuildRequires: pkgconfig(bzip2) -%if 0%{?suse_version} > 1130 +%if !0%{?sles_version} BuildRequires: utempter-devel %else BuildRequires: utempter %endif BuildRequires: xz BuildRequires: xz-devel +%if !0%{?sles_version} +BuildRequires: pkgconfig(bzip2) +%else +BuildRequires: libbz2-devel +%endif %if %suse_version > 1140 %define brandingversion %{default_branding} %endif -%if %suse_version == 1130 -%define brandingversion 11.3 -%endif %if %suse_version == 1140 %define brandingversion 11.4 %endif -%if %suse_version < 1130 -%define brandingversion 11.1 -%endif Summary: KDE Base Libraries License: LGPL-2.1+ Group: System/GUI/KDE @@ -97,7 +95,9 @@ Source2: hidden.desktop Source3: ycp.xml Source4: kde4rc -Patch0: 4_7_BRANCH.diff +%if 0%{?sles_version} +Source99: kdelibs4-rpmlintrc +%endif Patch1: kde3-applications.diff Patch2: default-useragent.diff Patch3: add-suse-translations.diff @@ -113,12 +113,6 @@ Patch20: ignore-inline-menu.diff Patch24: ksuseinstall.diff Patch26: fix_kdeclarative_install_location.diff -%if %{suse_version} > 1220 -# PATCH-FIX-UPSTREAM Build a udisks2 backend for solid (KDE 4.10) -Patch100: enable-solid-udisks2-backend.diff -# PATCH-FIX-UPSTREAM Enable support for installing Python 3 modules -Patch101: kdelibs4-fix-python3-install.diff -%endif PreReq: permissions Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`) Recommends: strigi >= %( echo `rpm -q --queryformat '%{VERSION}' strigi-devel`) @@ -172,7 +166,6 @@ %prep %setup -q -n kdelibs-%{version} -%patch0 -p1 %patch1 %patch2 %patch3 @@ -188,10 +181,6 @@ %patch20 %patch24 %patch26 -p1 -%if %{suse_version} > 1220 -%patch100 -p1 -%patch101 -p1 -%endif # # define KDE version exactly @@ -209,9 +198,6 @@ -DDATA_INSTALL_DIR=%{_kde4_appsdir} \ -DKCFG_INSTALL_DIR=%{_kde4_configkcfgdir} \ -DMIME_INSTALL_DIR=/nogo \ -%if 0 - -DKDE4_ENABLE_FINAL=1 \ -%endif -DKDE4_ENABLE_FPIE=1 -DTEMPLATES_INSTALL_DIR=%{_kde4_sharedir}/templates \ -DHTML_INSTALL_DIR=%{_kde4_htmldir} \ @@ -231,7 +217,7 @@ %install cd build - %make_install + %kde4_makeinstall chmod +x %{buildroot}%{_kde4_appsdir}/kconf_update/ksslcertificatemanager.upd.sh %create_subdir_filelist -d kdecore -v kdecore.devel %create_subdir_filelist -d kpty -f kdecore -v kdecore.devel @@ -332,7 +318,7 @@ Group: System/GUI/KDE Requires: kde4-filesystem >= %{_kde_platform_version} Requires: libkdecore4 = %{version} -%if %{?suse_version} > 1120 +%if !0%{?sles_version} %requires_ge libpolkit-qt-1-1 %endif @@ -474,7 +460,7 @@ Requires: libidn-devel Requires: libkde4 = %{version} Requires: libkdecore4-devel = %{version} -%if %{?suse_version} > 1120 +%if !0%{?sles_version} Requires: libpolkit-qt-1-devel %endif Requires: libsoprano-devel @@ -484,7 +470,11 @@ Requires: shared-desktop-ontologies-devel >= 0.10 Requires: strigi-devel Requires: update-desktop-files +%if !0%{?sles_version} Requires: pkgconfig(libxml-2.0) +%else +Requires: libxml2-devel +%endif Provides: libknotificationitem-devel = 4.3.66svn1016707 Obsoletes: libknotificationitem-devel < 4.3.66svn1016707 Provides: kde4-webkitpart-devel = 4.3.73svn1042829 @@ -512,12 +502,11 @@ %files -f filelists/exclude %defattr(-,root,root) # not all rpm versions handle "caps" -%if %suse_version > 1120 -%verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit +%if !0%{?sles_version} + %verify(not mode caps) %attr(4755,root,root) %{_kde4_libexecdir}/start_kdeinit %else %verify(not mode) %attr(755,root,root) %{_kde4_libexecdir}/start_kdeinit %endif - %{_kde4_configdir}/* %config %{_kde4_sysconfdir}/xdg/menus/applications.menu.kde4 ++++++ kdelibs4-rpmlintrc ++++++ addFilter("percent-in-dependency" ) addFilter("percent-in-provides" ) ++++++ plasma-libs.diff ++++++ --- /var/tmp/diff_new_pack.2GC0f8/_old 2012-12-07 14:23:20.000000000 +0100 +++ /var/tmp/diff_new_pack.2GC0f8/_new 2012-12-07 14:23:20.000000000 +0100 @@ -1,8 +1,6 @@ -Index: plasma/containment.cpp -=================================================================== ---- plasma/containment.cpp.orig -+++ plasma/containment.cpp -@@ -143,6 +143,18 @@ Containment::Containment(const QString & +--- plasma/containment.cpp 2012-10-12 14:26:42.586367366 +0200 ++++ plasma/containment.cpp 2012-10-12 20:54:32.890230374 +0200 +@@ -143,6 +143,18 @@ setHasConfigurationInterface(false); } @@ -20,12 +18,10 @@ + Containment::~Containment() { - delete d; -Index: plasma/containment.h -=================================================================== ---- plasma/containment.h.orig -+++ plasma/containment.h -@@ -128,6 +128,8 @@ class PLASMA_EXPORT Containment : public + // Applet touches our dptr if we are a containment and is the superclass (think of dtors) +--- plasma/containment.h 2012-10-12 14:26:42.587367367 +0200 ++++ plasma/containment.h 2012-10-12 20:54:32.890230374 +0200 +@@ -128,6 +128,8 @@ */ Containment(QObject *parent, const QVariantList &args); @@ -34,11 +30,9 @@ ~Containment(); /** -Index: plasma/private/containment_p.h -=================================================================== ---- plasma/private/containment_p.h.orig -+++ plasma/private/containment_p.h -@@ -60,6 +60,7 @@ public: +--- plasma/private/containment_p.h 2012-10-12 14:26:42.704367433 +0200 ++++ plasma/private/containment_p.h 2012-10-12 20:54:32.891230388 +0200 +@@ -60,6 +60,7 @@ type(Containment::NoContainmentType), showDropZoneDelayTimer(0), drawWallpaper(true), @@ -46,7 +40,7 @@ dropZoneStarted(false), containmentActionsSource(Global) { -@@ -187,6 +188,7 @@ public: +@@ -187,6 +188,7 @@ QHash<KJob*, KMenu*> dropMenus; QTimer *showDropZoneDelayTimer; bool drawWallpaper : 1; @@ -54,11 +48,9 @@ bool dropZoneStarted : 1; enum ContainmentActionsSource { -Index: plasma/theme.cpp -=================================================================== ---- plasma/theme.cpp.orig -+++ plasma/theme.cpp -@@ -80,7 +80,6 @@ public: +--- plasma/theme.cpp 2012-10-12 14:26:42.887367524 +0200 ++++ plasma/theme.cpp 2012-10-12 20:54:32.892230398 +0200 +@@ -80,7 +80,6 @@ colorScheme(QPalette::Active, KColorScheme::Window, KSharedConfigPtr(0)), buttonColorScheme(QPalette::Active, KColorScheme::Button, KSharedConfigPtr(0)), viewColorScheme(QPalette::Active, KColorScheme::View, KSharedConfigPtr(0)), @@ -66,18 +58,18 @@ defaultWallpaperSuffix(DEFAULT_WALLPAPER_SUFFIX), defaultWallpaperWidth(DEFAULT_WALLPAPER_WIDTH), defaultWallpaperHeight(DEFAULT_WALLPAPER_HEIGHT), -@@ -108,6 +107,10 @@ public: +@@ -108,6 +107,10 @@ updateNotificationTimer->setInterval(500); QObject::connect(updateNotificationTimer, SIGNAL(timeout()), q, SLOT(notifyOfChanged())); -+ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); -+ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); -+ defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); ++ KSharedConfigPtr defaultconfig = KSharedConfig::openConfig("plasma-desktoprc"); ++ KConfigGroup group = KConfigGroup(defaultconfig, "Defaults"); ++ defaultWallpaperTheme = group.readEntry("wallpaper", DEFAULT_WALLPAPER_THEME); + if (QPixmap::defaultDepth() > 8) { QObject::connect(KWindowSystem::self(), SIGNAL(compositingChanged(bool)), q, SLOT(compositingChanged(bool))); #ifdef Q_WS_X11 -@@ -564,7 +567,10 @@ void ThemePrivate::processWallpaperSetti +@@ -564,7 +567,10 @@ cg = config(); } @@ -89,7 +81,7 @@ defaultWallpaperSuffix = cg.readEntry("defaultFileSuffix", DEFAULT_WALLPAPER_SUFFIX); defaultWallpaperWidth = cg.readEntry("defaultWidth", DEFAULT_WALLPAPER_WIDTH); defaultWallpaperHeight = cg.readEntry("defaultHeight", DEFAULT_WALLPAPER_HEIGHT); -@@ -814,6 +820,10 @@ QString Theme::wallpaperPath(const QSize +@@ -814,6 +820,10 @@ } } -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
