Hello community,
here is the log from the commit of package kdelibs4 for openSUSE:Factory
checked in at Tue Aug 23 14:41:04 CEST 2011.
--------
--- KDE/kdelibs4/kdelibs4.changes 2011-07-29 11:49:56.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdelibs4/kdelibs4.changes 2011-08-13 23:46:16.000000000 +0200
@@ -1,0 +2,23 @@
+Sat Aug 13 23:43:19 UTC 2011 - toddrme2178@gmail.com
+
+- Added herqq-devel buildrequires (adds UPnP support)
+- Added kde4_runtime_requires macros (fix for RPMLINT warning)
+- Made building position-independent (fix for RPMLINT warning)
+- Added doc macros
+- Removed redundant buildrequires and requires
+- Cleaned up spec file formatting
+
+-------------------------------------------------------------------
+Thu Aug 11 14:32:33 UTC 2011 - idonmez@novell.com
+
+- Add kdelibs-4.7-branch.patch
+ * Fix fd leaks in KIO
+ * Fix potential crash in KIO
+ * Always use platform palette and fonts
+ * Fix crash in QThreadPrivate::finish due to terminate() without
+ wait().
+ * Properly handle empty HTTP auth challenges
+- Drop kdewidgets-in-designer.patch, already fixed in branch
+- Refreshed plasma-libs.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
kdewidgets-in-designer.patch
New:
----
kdelibs-4.7-branch.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdelibs4-apidocs.spec ++++++
--- /var/tmp/diff_new_pack.nEIejz/_old 2011-08-23 14:36:35.000000000 +0200
+++ /var/tmp/diff_new_pack.nEIejz/_new 2011-08-23 14:36:35.000000000 +0200
@@ -19,7 +19,7 @@
Name: kdelibs4-apidocs
Version: 4.7.0
-Release: 2
+Release: 3
License: LGPLv2.1+
Summary: KDE 4 API documentation
Url: http://www.kde.org
++++++ kdelibs4.spec ++++++
--- /var/tmp/diff_new_pack.nEIejz/_old 2011-08-23 14:36:35.000000000 +0200
+++ /var/tmp/diff_new_pack.nEIejz/_new 2011-08-23 14:36:35.000000000 +0200
@@ -27,33 +27,28 @@
BuildRequires: cmake
BuildRequires: cups-devel
BuildRequires: docbook-xsl-stylesheets
-BuildRequires: docbook_4
BuildRequires: enchant-devel
BuildRequires: fam-devel
BuildRequires: fdupes
BuildRequires: flex
BuildRequires: giflib-devel
BuildRequires: grantlee-devel
+BuildRequires: herqq-devel
BuildRequires: hicolor-icon-theme
BuildRequires: kde4-filesystem
BuildRequires: libQtWebKit-devel
BuildRequires: libacl-devel
BuildRequires: libattica-devel
-BuildRequires: libattr-devel
BuildRequires: libdbusmenu-qt-devel
BuildRequires: libgssglue-devel
BuildRequires: libjasper-devel
-BuildRequires: libpng-devel
BuildRequires: libpolkit-qt-1-devel
BuildRequires: libqca2-devel
-BuildRequires: libqt4-devel
BuildRequires: libsoprano-devel
-BuildRequires: libtiff-devel
BuildRequires: libudev-devel
BuildRequires: libxslt-devel
BuildRequires: pcre-devel
BuildRequires: phonon-devel
-BuildRequires: pkg-config
BuildRequires: shared-desktop-ontologies-devel
BuildRequires: shared-mime-info
BuildRequires: strigi
@@ -67,7 +62,7 @@
%endif
BuildRequires: xz-devel
Version: 4.7.0
-Release: 3
+Release: 5
License: LGPLv2.1+
Summary: KDE Base Libraries
Url: http://www.kde.org
@@ -77,6 +72,7 @@
Source2: hidden.desktop
Source3: ycp.xml
Source4: kde4rc
+Patch0: kdelibs-4.7-branch.patch
Patch1: kde3-applications.diff
Patch2: default-useragent.diff
Patch3: add-suse-translations.diff
@@ -90,7 +86,6 @@
Patch17: flash-player-non-oss.diff
Patch18: plasma-libs.diff
Patch20: ignore-inline-menu.diff
-Patch21: kdewidgets-in-designer.patch
Patch24: ksuseinstall.diff
PreReq: permissions
Requires: soprano >= %( echo `rpm -q --queryformat '%{VERSION}' libsoprano-devel`)
@@ -102,11 +97,12 @@
Requires(post): shared-mime-info
Requires(postun): shared-mime-info
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%requires_ge libstrigi0
%requires_ge shared-mime-info
%requires_ge shared-desktop-ontologies
%requires_ge libqt4-x11
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%kde4_runtime_requires
%if 0%{?opensuse_bs}
%define debug_package_requires %{name} = %{version}-%{release} libqt4-debuginfo
@@ -152,6 +148,7 @@
%prep
%setup -q -n kdelibs-%{version}
+%patch0 -p1
%patch1
%patch2
%patch3
@@ -163,9 +160,8 @@
%patch12
%patch13
%patch17
-%patch18
+%patch18 -p1
%patch20
-%patch21 -p1
%patch24
#
# define KDE version exactly
@@ -186,9 +182,10 @@
%if 0
-DKDE4_ENABLE_FINAL=1 \
%endif
+ -DKDE4_ENABLE_FPIE=1
-DTEMPLATES_INSTALL_DIR=%{_kde4_sharedir}/templates \
-DHTML_INSTALL_DIR=%{_kde4_htmldir} \
- -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=/etc"
+ -DKDE_DEFAULT_HOME=.kde4 -DSYSCONF_INSTALL_DIR=%{_sysconfdir}"
%cmake_kde4 -d build -- -DKDE_DISTRIBUTION_TEXT="%distribution" $EXTRA_FLAGS
%make_jobs
@@ -222,7 +219,7 @@
/sbin/ldconfig
%{_kde4_bindir}/update-mime-database %{_datadir}/mime &> /dev/null || :
-%if 0%{suse_version} > 1130
+%if 0%{?suse_version} > 1130
%set_permissions %{_kde4_libexecdir}/start_kdeinit
%endif
@@ -249,6 +246,7 @@
PreReq: grep
PreReq: sed
Requires: sgml-skel
+%kde4_runtime_requires
%description doc
This package contains the core environment and templates for the KDE
@@ -290,6 +288,7 @@
Requires: kde4-filesystem >= %{_kde_platform_version}
Requires: libkdecore4 = %{version}
%requires_ge libpolkit-qt-1-1
+%kde4_runtime_requires
%description -n kdelibs4-core
This package contains the basic packages of the K Desktop Environment.
@@ -408,33 +407,28 @@
Requires: avahi-compat-mDNSResponder-devel
Requires: cups-devel
Requires: docbook-xsl-stylesheets
-Requires: docbook_4
-Requires: enchant-devel
Requires: enchant-devel
Requires: fam-devel
Requires: giflib-devel
+Requires: herqq-devel
Requires: kdelibs4 = %{version}
Requires: kdelibs4-doc = %{version}
Requires: libQtWebKit-devel
Requires: libacl-devel
Requires: libattica-devel
-Requires: libattr-devel
Requires: libbz2-devel
Requires: libidn-devel
-Requires: libjpeg-devel
Requires: libkde4 = %{version}
Requires: libkdecore4-devel = %{version}
Requires: libpolkit-qt-1-devel
-Requires: libqt4-devel
Requires: libsoprano-devel
-Requires: libtiff-devel
Requires: libxslt-devel
Requires: pcre-devel
Requires: phonon-devel
-Requires: pkgconfig(libxml-2.0)
Requires: shared-desktop-ontologies-devel
Requires: strigi-devel
Requires: update-desktop-files
+Requires: pkgconfig(libxml-2.0)
Provides: libknotificationitem-devel = 4.3.66svn1016707
Obsoletes: libknotificationitem-devel < 4.3.66svn1016707
Provides: kde4-webkitpart-devel = 4.3.73svn1042829
@@ -465,9 +459,9 @@
%dir %{_datadir}/autostart
%dir %{_datadir}/doc/kde
-%dir %{_kde4_docdir}/HTML
-%dir %{_kde4_htmldir}/en
-%dir %{_kde4_htmldir}/en/common
+%doc %dir %{_kde4_docdir}/HTML
+%doc %dir %{_kde4_htmldir}/en
+%doc %dir %{_kde4_htmldir}/en/common
%dir %{_kde4_libdir}/kconf_update_bin
%dir %{_kde4_libdir}/kde4
%dir %{_kde4_sharedir}/servicetypes
@@ -492,13 +486,13 @@
%{_kde4_applicationsdir}/ktelnetservice.desktop
%{_kde4_appsdir}/*
%{_kde4_bindir}/*
-%{_kde4_htmldir}/en/common/*
+%doc %{_kde4_htmldir}/en/common/*
%{_kde4_iconsdir}/hicolor/*/actions/presence_away.*
%{_kde4_iconsdir}/hicolor/*/actions/presence_offline.*
%{_kde4_iconsdir}/hicolor/*/actions/presence_online.*
%{_kde4_iconsdir}/hicolor/*/actions/presence_unknown.*
%{_kde4_libdir}/libkdeinit4_*.so
-%{_kde4_mandir}/man*/*
+%doc %{_kde4_mandir}/man*/*
%{_kde4_modulesdir}/*
%{_kde4_servicesdir}/*
%{_kde4_servicetypesdir}/*
@@ -511,7 +505,6 @@
License: X11
Summary: On-demand installation of packages
Group: Development/Libraries/KDE
-# see ksuseinstall_11.2.diff
Requires: yast2-packager >= 2.19.7
Requires: zypper
Recommends: ptools
++++++ kdelibs-4.7-branch.patch ++++++
++++ 7827 lines (skipped)
++++++ plasma-libs.diff ++++++
--- /var/tmp/diff_new_pack.nEIejz/_old 2011-08-23 14:36:35.000000000 +0200
+++ /var/tmp/diff_new_pack.nEIejz/_new 2011-08-23 14:36:35.000000000 +0200
@@ -1,8 +1,8 @@
-Index: plasma/containment.cpp
-===================================================================
---- plasma/containment.cpp.orig
-+++ plasma/containment.cpp
-@@ -144,6 +144,18 @@ Containment::Containment(const QString &
+diff --git a/plasma/containment.cpp b/plasma/containment.cpp
+index c3c688f..2837882 100644
+--- a/plasma/containment.cpp
++++ b/plasma/containment.cpp
+@@ -143,6 +143,18 @@ Containment::Containment(const QString &packagePath, uint appletId, const QVaria
setHasConfigurationInterface(false);
}
@@ -21,11 +21,11 @@
Containment::~Containment()
{
delete d;
-Index: plasma/containment.h
-===================================================================
---- plasma/containment.h.orig
-+++ plasma/containment.h
-@@ -128,6 +128,8 @@ class PLASMA_EXPORT Containment : public
+diff --git a/plasma/containment.h b/plasma/containment.h
+index a6ebcdd..810b05f 100644
+--- a/plasma/containment.h
++++ b/plasma/containment.h
+@@ -128,6 +128,8 @@ class PLASMA_EXPORT Containment : public Applet
*/
Containment(QObject *parent, const QVariantList &args);
@@ -34,10 +34,10 @@
~Containment();
/**
-Index: plasma/private/containment_p.h
-===================================================================
---- plasma/private/containment_p.h.orig
-+++ plasma/private/containment_p.h
+diff --git a/plasma/private/containment_p.h b/plasma/private/containment_p.h
+index 4025bf4..3eff519 100644
+--- a/plasma/private/containment_p.h
++++ b/plasma/private/containment_p.h
@@ -60,6 +60,7 @@ public:
type(Containment::NoContainmentType),
showDropZoneDelayTimer(0),
@@ -46,7 +46,7 @@
dropZoneStarted(false),
containmentActionsSource(Global)
{
-@@ -185,6 +186,7 @@ public:
+@@ -183,6 +184,7 @@ public:
QHash