rpms/MyPasswordSafe/devel MyPasswordSafe-20090425-gcc44.patch, NONE, 1.1 MyPasswordSafe.spec, 1.8, 1.9

[Miloš Jakubíček]

Author: mjakubicek

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

Modified Files:
	MyPasswordSafe.spec 
Added Files:
	MyPasswordSafe-20090425-gcc44.patch 
Log Message:
- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch



MyPasswordSafe-20090425-gcc44.patch:

--- NEW FILE MyPasswordSafe-20090425-gcc44.patch ---
--- src/pwsafe/Util.h.orig	2009-04-25 13:35:52.000000000 +0200
+++ src/pwsafe/Util.h	2009-04-25 13:46:50.000000000 +0200
@@ -173,7 +173,7 @@
 
 inline char * strFind( const char *str, const char *fstr )
 {
-	return strstr( str, fstr );
+	return (char *) strstr( str, fstr );
 }
 
 #if defined(UNICODE)


Index: MyPasswordSafe.spec
===================================================================
RCS file: /cvs/pkgs/rpms/MyPasswordSafe/devel/MyPasswordSafe.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MyPasswordSafe.spec	23 Feb 2009 22:03:48 -0000	1.8
+++ MyPasswordSafe.spec	25 Apr 2009 12:10:57 -0000	1.9
@@ -2,7 +2,7 @@
 
 Name:           MyPasswordSafe
 Version:        0.6.7
-Release:        7.%{datever}%{?dist}
+Release:        8.%{datever}%{?dist}
 Summary:        A graphical password management tool
 
 Group:          Applications/Databases
@@ -11,7 +11,9 @@
 Source0:        http://www.semanticgap.com/myps/release/MyPasswordSafe-%{datever}.src.tgz
 Source1:        MyPasswordSafe.desktop
 Patch0:         MyPasswordSafe-20061216-use-system-uuid.patch
+# Both patches have been sent to support [AT]Â semanticgap [DOT] com on 2009/04/25
 Patch1:         MyPasswordSafe-20061216-gcc43.patch
+Patch2:         MyPasswordSafe-20090425-gcc44.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  boost-devel, qt3-devel, uuid-devel, libXScrnSaver-devel
@@ -43,6 +45,9 @@
 # Fix regressions due to stricter GCC 4.3 checking
 %patch1 -p1 -b .gcc43
 
+# GCC 4.4 patch
+%patch2 -b .gcc44
+
 %build
 
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -74,6 +79,9 @@
 %{_datadir}/applications/fedora-MyPasswordSafe.desktop
 
 %changelog
+* Sat Apr 25 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 0.6.7-8.20061216
+- Fix FTBFS: added MyPasswordSafe-20090425-gcc44.patch
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.7-7.20061216
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild