packages: kde4-kdelibs/kde4-kdelibs-aboutPLD.patch, kde4-kdelibs/kde4-kdeli...
arekm
arekm at pld-linux.org
Sat Jun 11 23:39:13 CEST 2011
Author: arekm Date: Sat Jun 11 21:39:13 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 4.6.4
---- Files affected:
packages/kde4-kdelibs:
kde4-kdelibs-aboutPLD.patch (1.20 -> 1.21) , kde4-kdelibs.spec (1.248 -> 1.249) , kde4-kdelibs-bug-187066.patch (1.1 -> NONE) (REMOVED)
---- Diffs:
================================================================
Index: packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch
diff -u packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.20 packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.21
--- packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch:1.20 Wed May 4 12:16:23 2011
+++ packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch Sat Jun 11 23:39:07 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.3)")
+ set (KDE_VERSION_STRING "${KDE_VERSION} (4.6.4)")
+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.spec
diff -u packages/kde4-kdelibs/kde4-kdelibs.spec:1.248 packages/kde4-kdelibs/kde4-kdelibs.spec:1.249
--- packages/kde4-kdelibs/kde4-kdelibs.spec:1.248 Sun May 29 09:44:28 2011
+++ packages/kde4-kdelibs/kde4-kdelibs.spec Sat Jun 11 23:39:08 2011
@@ -17,12 +17,12 @@
Summary(ru.UTF-8): K Desktop Environment - Библиотеки
Summary(uk.UTF-8): K Desktop Environment - Бібліотеки
Name: kde4-kdelibs
-Version: 4.6.3
-Release: 3
+Version: 4.6.4
+Release: 1
License: LGPL
Group: X11/Libraries
Source0: ftp://ftp.kde.org/pub/kde/%{_state}/%{version}/src/%{orgname}-%{version}.tar.bz2
-# Source0-md5: 923a7e8f89aa504647e14472b24b8c0a
+# Source0-md5: d38a8bf5b2002f9014727cec4395ba2a
Source1: %{name}-pld_box.png
Patch100: %{name}-branch.diff
Patch0: %{name}-branding.patch
@@ -30,7 +30,6 @@
Patch2: %{name}-findlzmafix.patch
Patch3: %{name}-aboutPLD.patch
Patch4: %{name}-trunk.patch
-Patch5: %{name}-bug-187066.patch
URL: http://www.kde.org/
BuildRequires: OpenEXR-devel >= 1.2.2
BuildRequires: Qt3Support-devel >= %{qtver}
@@ -238,7 +237,6 @@
%patch2 -p0
%patch3 -p1
%patch4 -p1
-%patch5 -p1
%if "%{pld_release}" == "ti"
sed -i -e 's#PLDLINUX_VERSION#PLD/Titanium#g' kio/kio/kprotocolmanager.cpp
@@ -1113,6 +1111,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.249 2011/06/11 21:39:08 arekm
+- up to 4.6.4
+
Revision 1.248 2011/05/29 07:44:28 arekm
- rel 3; unofficial workaround for bug 187066 (file dialog crashes sometimes)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs-aboutPLD.patch?r1=1.20&r2=1.21&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kde4-kdelibs/kde4-kdelibs.spec?r1=1.248&r2=1.249&f=u
More information about the pld-cvs-commit
mailing list