rpms/keepassx/devel keepassx-0.3.4-rhbz489820.patch, NONE, 1.1 keepassx.spec, 1.14, 1.15

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/keepassx/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19282/devel

Modified Files:
	keepassx.spec 
Added Files:
	keepassx-0.3.4-rhbz489820.patch 
Log Message:
* Thu Mar 12 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.3.4-3
- backport fix from upstream for bug #489820


keepassx-0.3.4-rhbz489820.patch:

--- NEW FILE keepassx-0.3.4-rhbz489820.patch ---
--- trunk/src/Kdb3Database.cpp	2009/03/11 21:18:28	280
+++ trunk/src/Kdb3Database.cpp	2009/03/11 23:52:42	281
@@ -1364,14 +1364,14 @@
 
 	for(int i=0; i < UnknownMetaStreams.size(); i++){
 		FileSize
-			+=164
+			+=165
 			+UnknownMetaStreams[i].Comment.toUtf8().length()+1
 			+UnknownMetaStreams[i].Binary.length();
 	}
 
 	for(int i=0; i < MetaStreams.size(); i++){
 		FileSize
-				+=164
+				+=165
 				+MetaStreams[i].Comment.toUtf8().length()+1
 				+MetaStreams[i].Binary.length();
 	}


Index: keepassx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/keepassx/devel/keepassx.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- keepassx.spec	25 Feb 2009 11:03:39 -0000	1.14
+++ keepassx.spec	12 Mar 2009 21:56:54 -0000	1.15
@@ -1,12 +1,14 @@
 Name:           keepassx
 Version:        0.3.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform password manager
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://keepassx.sourceforge.net
 Source0:        http://download.sf.net/keepassx/KeePassX-%{version}.tar.gz
+# Fix from upstream: https://bugzilla.redhat.com/show_bug.cgi?id=489820
+Patch0:         keepassx-0.3.4-rhbz489820.patch
 Patch1:         keepassx-0.3.3-gcc43.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -34,6 +36,7 @@
 
 %prep
 %setup -q
+%patch0 -p1 -b .rhbz489820
 %patch1 -p0 -b .gcc43
 
 
@@ -107,6 +110,9 @@
 
 
 %changelog
+* Thu Mar 12 2009 Aurelien Bompard <abompard at fedoraproject.org> 0.3.4-3
+- backport fix from upstream for bug #489820
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild