packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch, kde4-kdelibs/kde4-kdeli...

Sat Jul 23 21:04:34 CEST 2011

Author: arekm                        Date: Sat Jul 23 19:04:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 4.7.0

---- Files affected:
packages/kde4-kdelibs:
   kde4-kdelibs-aboutPLD.patch (1.22 -> 1.23) , kde4-kdelibs-branding.patch (1.3 -> 1.4) , kde4-kdelibs.spec (1.250 -> 1.251) , kde4-kdelibs-trunk.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.22 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.23

--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.22	Fri Jul  1 14:03:57 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch	Sat Jul 23 21:04:28 2011
@@ -4,7 +4,7 @@
 @@ -14,6 +14,7 @@
  set (KDE_VERSION_RELEASE 5)
  set (KDE_VERSION "${KDE_VERSION_MAJOR}.${KDE_VERSION_MINOR}.${KDE_VERSION_RELEASE}" )
- set (KDE_VERSION_STRING "${KDE_VERSION} (4.6.5)")
+ set (KDE_VERSION_STRING "${KDE_VERSION} (4.7.0)")
 +exec_program ("/bin/cat" ARGS "/etc/pld-release" OUTPUT_VARIABLE PLD_VERSION_STRING)
  
  set (KDE_DISTRIBUTION_TEXT "compiled sources" CACHE STRING "Indicate the distribution in bug reports" )

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-branding.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.3 packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.4
--- packages/kde4-kdelibs/kde4-kdelibs-branding.patch:1.3	Fri Jan 21 21:18:12 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-branding.patch	Sat Jul 23 21:04:28 2011
@@ -1,11 +1,10 @@
---- kio/kio/kprotocolmanager.cpp~	2011-01-19 23:09:45.000000000 +0100
-+++ kio/kio/kprotocolmanager.cpp	2011-01-21 13:37:18.484340455 +0100
-@@ -87,7 +87,7 @@
- QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \
- X % QL1S(") KHTML/") % \
- QString::number(KDE::versionMajor()) % QL1C('.') % QString::number(KDE::versionMinor()) % \
--QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko)")
-+QL1C('.') % QString::number(KDE::versionRelease()) % QL1S(" (like Gecko) PLDLINUX_VERSION")
- 
- #define PRIVATE_DATA \
- KProtocolManagerPrivate *d = kProtocolManagerPrivate
+--- kdelibs-4.7.0/kio/kio/kprotocolmanager.cpp~	2011-06-23 16:49:06.000000000 +0200
++++ kdelibs-4.7.0/kio/kio/kprotocolmanager.cpp	2011-07-23 20:34:53.446320740 +0200
+@@ -644,6 +644,7 @@
+     d->useragent += QString::number(KDE::versionMajor());
+     d->useragent += QL1C('.');
+     d->useragent += QString::number(KDE::versionMinor());
++    d->useragent += QL1S(" PLDLINUX_VERSION");
+   }
+   else
+   {

================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.250 packages/kde4-kdelibs/kde4-kdelibs.spec:1.251
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.250	Fri Jul  1 14:03:57 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec	Sat Jul 23 21:04:28 2011
@@ -17,19 +17,18 @@
 Summary(ru.UTF-8):	K Desktop Environment - Библиотеки
 Summary(uk.UTF-8):	K Desktop Environment - Бібліотеки
 Name:		kde4-kdelibs
-Version:	4.6.5
+Version:	4.7.0
 Release:	1
 License:	LGPL
 Group:		X11/Libraries
 Source0:	ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5:	8ca933c00bb5089e0793756e69bd1275
+# Source0-md5:	1d12b9c32da28b38f64718cf10527e80
 Source1:	%{name}-pld_box.png
 Patch100:	%{name}-branch.diff
 Patch0:		%{name}-branding.patch
 Patch1:		%{name}-cacert.patch
 Patch2:		%{name}-findlzmafix.patch
 Patch3:		%{name}-aboutPLD.patch
-Patch4:		%{name}-trunk.patch
 URL:		http://www.kde.org/
 BuildRequires:	OpenEXR-devel >= 1.2.2
 BuildRequires:	Qt3Support-devel >= %{qtver}
@@ -63,6 +62,7 @@
 BuildRequires:	giflib-devel
 BuildRequires:	grantlee-devel >= 0.1.1
 BuildRequires:	heimdal-devel
+BuildRequires:	herqq-devel >= 1.0.0-2
 BuildRequires:	hspell-devel
 BuildRequires:	issue
 BuildRequires:	jasper-devel >= 1.600
@@ -92,7 +92,7 @@
 BuildRequires:	qt4-build >= %{qtver}
 BuildRequires:	qt4-qmake >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.600
-BuildRequires:	shared-desktop-ontologies-devel >= 0.5
+BuildRequires:	shared-desktop-ontologies-devel >= 0.7.1
 BuildRequires:	shared-mime-info >= 0.18
 BuildRequires:	soprano-devel >= %{sopranover}
 BuildRequires:	strigi-devel >= 0.7.0
@@ -232,11 +232,10 @@
 %prep
 %setup -q -n %{orgname}-%{version}
 # %%patch100 -p0
-%patch0 -p0
+%patch0 -p1
 %patch1 -p0
 %patch2 -p0
 %patch3 -p1
-%patch4 -p1
 
 %if "%{pld_release}" == "ti"
 sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
@@ -307,6 +306,7 @@
 %attr(755,root,root) %{_bindir}/kdeinit4
 %attr(755,root,root) %{_bindir}/kdeinit4_shutdown
 %attr(755,root,root) %{_bindir}/kdeinit4_wrapper
+%attr(755,root,root) %{_bindir}/kfilemetadatareader
 %attr(755,root,root) %{_bindir}/kjscmd
 %attr(755,root,root) %{_bindir}/kross
 %attr(755,root,root) %{_bindir}/kshell4
@@ -345,11 +345,6 @@
 %{_datadir}/apps/khtml/kpartplugins
 %{_datadir}/apps/kjava/kjava.policy
 %{_datadir}/apps/kjava/pluginsinfo
-%{_datadir}/apps/ktexteditor_insertfile
-%{_datadir}/apps/ktexteditor_kdatatool
-%{_datadir}/apps/ktexteditor_exporter
-%{_datadir}/apps/ktexteditor_iconinserter
-%{_datadir}/apps/ktexteditor_insanehtml_le
 %{_datadir}/apps/proxyscout
 %{_datadir}/apps/kcharselect
 %{_datadir}/apps/knewstuff
@@ -365,8 +360,6 @@
 %{_datadir}/config/colors
 %{_datadir}/config/ksslcalist
 %{_datadir}/config/magic
-%{_datadir}/config/katemoderc
-%{_datadir}/config/katepartpluginsrc
 %{_datadir}/mime/packages/*
 %{_datadir}/kde4/servicetypes
 %{_datadir}/kde4/services/*.desktop
@@ -393,7 +386,6 @@
 %{_datadir}/apps/plasma/services/plasmoidservice.operations
 %{_datadir}/apps/plasma/services/storage.operations
 
-%{_datadir}/apps/katepart
 %{_datadir}/apps/kcm_componentchooser
 %{_datadir}/apps/kdeui
 %{_datadir}/apps/kdewidgets
@@ -418,8 +410,8 @@
 %lang(en) %{_kdedocdir}/en/common
 %lang(en) %{_kdedocdir}/en/kioslave
 
-%attr(755,root,root) %ghost %{_libdir}/libkatepartinterfaces.so.?
-%attr(755,root,root) %{_libdir}/libkatepartinterfaces.so.*.*.*
+%attr(755,root,root) %{_libdir}/libkactivities.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkactivities.so.?
 %attr(755,root,root) %ghost %{_libdir}/libkcmutils.so.?
 %attr(755,root,root) %{_libdir}/libkcmutils.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkemoticons.so.?
@@ -430,6 +422,8 @@
 %attr(755,root,root) %{_libdir}/libkprintutils.so.*.*.*
 %attr(755,root,root) %{_libdir}/libkde3support.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkde3support.so.?
+%attr(755,root,root) %{_libdir}/libkdeclarative.so.*.*
+%attr(755,root,root) %ghost %{_libdir}/libkdeclarative.so.?
 %attr(755,root,root) %{_libdir}/libkdecore.so.*.*
 %attr(755,root,root) %ghost %{_libdir}/libkdecore.so.?
 %attr(755,root,root) %{_libdir}/libkdefakes.so.*.*
@@ -525,7 +519,9 @@
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kconfig_compiler
+%attr(755,root,root) %{_libdir}/libkactivities.so
 %attr(755,root,root) %{_libdir}/libkde3support.so
+%attr(755,root,root) %{_libdir}/libkdeclarative.so
 %attr(755,root,root) %{_libdir}/libkdecore.so
 %attr(755,root,root) %{_libdir}/libkdefakes.so
 %attr(755,root,root) %{_libdir}/libkdesu.so
@@ -558,7 +554,6 @@
 %attr(755,root,root) %{_libdir}/libsolid.so
 %attr(755,root,root) %{_libdir}/libthreadweaver.so
 %attr(755,root,root) %{_libdir}/libkdewebkit.so
-%attr(755,root,root) %{_libdir}/libkatepartinterfaces.so
 %attr(755,root,root) %{_libdir}/libkcmutils.so
 %attr(755,root,root) %{_libdir}/libkemoticons.so
 %attr(755,root,root) %{_libdir}/libkidletime.so
@@ -719,9 +714,11 @@
 %{_includedir}/KDE/KDataTool
 %{_includedir}/KDE/KDataToolAction
 %{_includedir}/KDE/KDataToolInfo
+%{_includedir}/KDE/KDateComboBox
 %{_includedir}/KDE/KDatePicker
 %{_includedir}/KDE/KDateTable
 %{_includedir}/KDE/KDateTime
+%{_includedir}/KDE/KDateTimeEdit
 %{_includedir}/KDE/KDateTimeWidget
 %{_includedir}/KDE/KDateValidator
 %{_includedir}/KDE/KDateWidget
@@ -758,6 +755,7 @@
 %{_includedir}/KDE/KFileItem
 %{_includedir}/KDE/KFileItemDelegate
 %{_includedir}/KDE/KFileItemList
+%{_includedir}/KDE/KFileMetaDataWidget
 %{_includedir}/KDE/KFileMetaInfo
 %{_includedir}/KDE/KFileMetaInfoGroup
 %{_includedir}/KDE/KFileMetaInfoItem
@@ -781,6 +779,7 @@
 %{_includedir}/KDE/KFontDialog
 %{_includedir}/KDE/KFontRequester
 %{_includedir}/KDE/KFontSizeAction
+%{_includedir}/KDE/KFontUtils
 %{_includedir}/KDE/KGenericFactory
 %{_includedir}/KDE/KGenericFactoryBase
 %{_includedir}/KDE/KGlobal
@@ -842,6 +841,7 @@
 %{_includedir}/KDE/KMessageBox
 %{_includedir}/KDE/KMessageBoxMessageHandler
 %{_includedir}/KDE/KMessageHandler
+%{_includedir}/KDE/KMessageWidget
 %{_includedir}/KDE/KMimeType
 %{_includedir}/KDE/KMimeTypeChooser
 %{_includedir}/KDE/KMimeTypeChooserDialog
@@ -862,6 +862,7 @@
 %{_includedir}/KDE/KNSBookmarkImporterImpl
 %{_includedir}/KDE/KNTLM
 %{_includedir}/KDE/KNetwork
+%{_includedir}/KDE/KNewFileMenu
 %{_includedir}/KDE/KNotification
 %{_includedir}/KDE/KNotificationRestrictions
 %{_includedir}/KDE/KNotifyConfigWidget
@@ -911,6 +912,7 @@
 %{_includedir}/KDE/KPushButton
 %{_includedir}/KDE/KRandom
 %{_includedir}/KDE/KRandomSequence
+%{_includedir}/KDE/KRatingWidget
 %{_includedir}/KDE/KRecentDocument
 %{_includedir}/KDE/KRecentFilesAction
 %{_includedir}/KDE/KRemoteEncoding
@@ -922,6 +924,7 @@
 %{_includedir}/KDE/KRuler
 %{_includedir}/KDE/KRun
 %{_includedir}/KDE/KSambaShare
+%{_includedir}/KDE/KSambaShareData
 %{_includedir}/KDE/KSaveFile
 %{_includedir}/KDE/KScanDialog
 %{_includedir}/KDE/KSelectAction
@@ -944,6 +947,7 @@
 %{_includedir}/KDE/KShell
 %{_includedir}/KDE/KShellCompletion
 %{_includedir}/KDE/KShortcut
+%{_includedir}/KDE/KShortcutWidget
 %{_includedir}/KDE/KShortcutsDialog
 %{_includedir}/KDE/KShortcutsEditor
 %{_includedir}/KDE/KSocks
@@ -981,6 +985,7 @@
 %{_includedir}/KDE/KTextBrowser
 %{_includedir}/KDE/KTextEdit
 %{_includedir}/KDE/KTextEditor
+%{_includedir}/KDE/KTimeComboBox
 %{_includedir}/KDE/KTimeZone
 %{_includedir}/KDE/KTimeZoneData
 %{_includedir}/KDE/KTimeZoneSource
@@ -1111,6 +1116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.251  2011/07/23 19:04:28  arekm
+- up to 4.7.0
+
 Revision 1.250  2011/07/01 12:03:57  arekm
 - up to 4.6.5
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.22&r2=1.23&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-branding.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.250&r2=1.251&f=u

