rpms/kdesdk/F-10 kdesdk-4.3.2-kompare-regression.patch, NONE, 1.1 kdesdk.spec, 1.135, 1.136
Kevin Kofler
kkofler at fedoraproject.org
Sun Oct 11 17:03:15 UTC 2009
- Previous message (by thread): rpms/etoys/devel .cvsignore, 1.9, 1.10 etoys.spec, 1.10, 1.11 sources, 1.9, 1.10
- Next message (by thread): rpms/kdesdk/F-11 kdesdk-4.3.2-kompare-regression.patch, NONE, 1.1 kdesdk.spec, 1.150, 1.151
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: kkofler
Update of /cvs/pkgs/rpms/kdesdk/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31712/F-10
Modified Files:
kdesdk.spec
Added Files:
kdesdk-4.3.2-kompare-regression.patch
Log Message:
* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
- Fix Kompare diff parsing regression (due to a typo in a bugfix)
kdesdk-4.3.2-kompare-regression.patch:
parserbase.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- NEW FILE kdesdk-4.3.2-kompare-regression.patch ---
Index: kompare/libdiff2/parserbase.cpp
===================================================================
--- kompare/libdiff2/parserbase.cpp (Revision 1033954)
+++ kompare/libdiff2/parserbase.cpp (Revision 1033955)
@@ -546,7 +546,7 @@
}
linenoB = m_unifiedHunkHeader.cap( 4 ).toInt();
if( !m_unifiedHunkHeader.cap( 6 ).isEmpty() ) {
- lineCountA = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
+ lineCountB = m_unifiedHunkHeader.cap( 6 ).toInt(&wasNum);
if( !wasNum )
return false;
Index: kdesdk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdesdk/F-10/kdesdk.spec,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -p -r1.135 -r1.136
--- kdesdk.spec 7 Oct 2009 12:10:41 -0000 1.135
+++ kdesdk.spec 11 Oct 2009 17:03:15 -0000 1.136
@@ -1,6 +1,6 @@
Name: kdesdk
Version: 4.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: The KDE Software Development Kit (SDK)
Group: User Interface/Desktops
@@ -8,6 +8,9 @@ Group: User Interface/Desktops
License: GPLv2
URL: http://www.kde.org/
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
+# Kompare regression due to a typo in the patch for kde#139209
+# fix from upstream 4.3 branch, will be fixed upstream in 4.3.3
+Patch100: kdesdk-4.3.2-kompare-regression.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# upstream patches
@@ -77,6 +80,7 @@ xml2pot
%prep
%setup -q
+%patch100 -p0 -b .kompare-regression
%build
@@ -225,6 +229,9 @@ fi
%changelog
+* Sun Oct 11 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.3.2-2
+- Fix Kompare diff parsing regression (due to a typo in a bugfix)
+
* Mon Oct 05 2009 Than Ngo <than at redhat.com> - 4.3.2-1
- 4.3.2
- Previous message (by thread): rpms/etoys/devel .cvsignore, 1.9, 1.10 etoys.spec, 1.10, 1.11 sources, 1.9, 1.10
- Next message (by thread): rpms/kdesdk/F-11 kdesdk-4.3.2-kompare-regression.patch, NONE, 1.1 kdesdk.spec, 1.150, 1.151
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list