rpms/kdenetwork/F-10 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.165, 1.166 sources, 1.70, 1.71
Lukas Tinkl
ltinkl at fedoraproject.org
Wed May 6 12:36:30 UTC 2009
- Previous message: rpms/setroubleshoot/devel .cvsignore, 1.97, 1.98 setroubleshoot.spec, 1.130, 1.131 sources, 1.109, 1.110
- Next message: rpms/kdenetwork/F-9 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.164, 1.165 sources, 1.64, 1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: ltinkl
Update of /cvs/extras/rpms/kdenetwork/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8502/F-10
Modified Files:
kdenetwork.spec sources
Added Files:
kdenetwork-4.2.3-filesharing-crash.patch
Log Message:
KDE 4.2.3
kdenetwork-4.2.3-filesharing-crash.patch:
--- NEW FILE kdenetwork-4.2.3-filesharing-crash.patch ---
--- kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/01/06 17:13:38 906699
+++ kdenetwork/filesharing/advanced/nfs/nfsfile.cpp 2009/05/05 00:50:30 963627
@@ -71,7 +71,7 @@
return 0L;
QString testPath = path.trimmed();
- if ( testPath[testPath.length()-1] != '/' )
+ if ( !testPath.endsWith('/') )
testPath += '/';
for (NFSEntry* entry = _entries.first(); entry; entry = _entries.next())
@@ -129,7 +129,7 @@
completeLine = currentLine;
// is the line continued in the next line ?
- if ( completeLine[completeLine.length()-1] == '\\' )
+ if ( completeLine.endsWith('\\') )
{
continuedLine = true;
// remove the ending backslash
@@ -144,7 +144,7 @@
}
// comments
- if ('#' == completeLine[0]) {
+ if (completeLine.startsWith('#') ) {
_lines.append(new NFSComment(completeLine));
continue;
}
@@ -153,7 +153,7 @@
QString hosts;
// Handle quotation marks
- if ( completeLine[0] == '"' ) {
+ if ( completeLine.startsWith('"') ) {
int i = completeLine.indexOf('"',1);
if (i == -1) {
kError() << "NFSFile: Parse error: Missing quotation mark: "
@@ -177,7 +177,7 @@
}
// normalize path
- if ( path[path.length()-1] != '/' )
+ if ( !path.endsWith('/') )
path += '/';
kDebug(5009) << "KNFSShare: Found path: '" << path << "'";
Index: kdenetwork.spec
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/kdenetwork.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -p -r1.165 -r1.166
--- kdenetwork.spec 2 Apr 2009 15:07:22 -0000 1.165
+++ kdenetwork.spec 6 May 2009 12:36:00 -0000 1.166
@@ -1,7 +1,7 @@
Summary: K Desktop Environment - Network Applications
Name: kdenetwork
Epoch: 7
-Version: 4.2.2
+Version: 4.2.3
Release: 1%{?dist}
License: GPLv2
@@ -10,11 +10,15 @@ URL: http://www.kde.org
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
Patch0: kdenetwork-4.2.0-handle-enc-message.patch
Patch1: kdenetwork-4.2.0-libv4l.patch
+
+# 4.2 upstream patches
+Patch100: kdenetwork-4.2.3-filesharing-crash.patch
+
# build Kopete against the system libgadu (backported from 4.3)
# http://websvn.kde.org/?view=rev&revision=909144
# http://websvn.kde.org/?view=rev&revision=909145
-Patch100: kdenetwork-4.1.96-system-libgadu.patch
-Patch104: kdenetwork-4.2.0-kopete-view-history.patch
+Patch200: kdenetwork-4.1.96-system-libgadu.patch
+Patch201: kdenetwork-4.2.0-kopete-view-history.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -91,9 +95,12 @@ Requires: kdelibs4-devel
%setup -q
%patch0 -p1 -b .handle-enc-message
%patch1 -p1 -b .libv4l
-%patch100 -p0 -b .system-libgadu
+# 4.2 upstream patches
+%patch100 -p1 -b .filesharing-crash
+# 4.3 upstream patches
+%patch200 -p0 -b .system-libgadu
rm -rf kopete/protocols/gadu/libgadu/
-%patch104 -p1 -b .kopete-view-history
+%patch201 -p1 -b .kopete-view-history
%build
@@ -177,6 +184,9 @@ fi
%changelog
+* Mon May 04 2009 Than Ngo <than at redhat.com> - 4.2.3-1
+- 4.2.3
+
* Wed Apr 01 2009 Rex Dieter <rdieter at fedoraproject.org> - 4.2.2-2
- optimize scriptlets
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdenetwork/F-10/sources,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -p -r1.70 -r1.71
--- sources 2 Apr 2009 15:07:23 -0000 1.70
+++ sources 6 May 2009 12:36:00 -0000 1.71
@@ -1 +1 @@
-72193b5eb050ef45fad76422a15e0e1a kdenetwork-4.2.2.tar.bz2
+7d77ab0322f96251a8d3baf7e4f6990e kdenetwork-4.2.3.tar.bz2
- Previous message: rpms/setroubleshoot/devel .cvsignore, 1.97, 1.98 setroubleshoot.spec, 1.130, 1.131 sources, 1.109, 1.110
- Next message: rpms/kdenetwork/F-9 kdenetwork-4.2.3-filesharing-crash.patch, NONE, 1.1 kdenetwork.spec, 1.164, 1.165 sources, 1.64, 1.65
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list