rpms/qca-ossl/devel qca-ossl-2.0.0-no-whirlpool.patch, NONE, 1.1 qca-ossl.spec, 1.6, 1.7

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/qca-ossl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv897

Modified Files:
	qca-ossl.spec 
Added Files:
	qca-ossl-2.0.0-no-whirlpool.patch 
Log Message:
* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
- rebuild with new openssl
- fix the test for whirlpool support


qca-ossl-2.0.0-no-whirlpool.patch:

--- NEW FILE qca-ossl-2.0.0-no-whirlpool.patch ---
diff -up qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool qca-ossl-2.0.0-beta3/qca-ossl.cpp
--- qca-ossl-2.0.0-beta3/qca-ossl.cpp.no-whirlpool	2007-12-11 07:34:57.000000000 +0100
+++ qca-ossl-2.0.0-beta3/qca-ossl.cpp	2009-01-26 14:59:42.000000000 +0100
@@ -6597,7 +6597,7 @@ static QStringList all_hash_types()
 #ifdef SHA512_DIGEST_LENGTH
 	list += "sha512";
 #endif
-#ifdef OBJ_whirlpool
+#ifdef WHIRLPOOL_DIGEST_LENGTH
 	list += "whirlpool";
 #endif
 	return list;
@@ -6810,7 +6810,7 @@ public:
 		else if ( type == "sha512" )
 			return new opensslHashContext( EVP_sha512(), this, type);
 #endif
-#ifdef OBJ_whirlpool
+#ifdef WHIRLPOOL_DIGEST_LENGTH
 		else if ( type == "whirlpool" )
 			return new opensslHashContext( EVP_whirlpool(), this, type);
 #endif


Index: qca-ossl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/qca-ossl/devel/qca-ossl.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- qca-ossl.spec	17 Jan 2009 20:17:31 -0000	1.6
+++ qca-ossl.spec	26 Jan 2009 14:02:26 -0000	1.7
@@ -9,6 +9,7 @@
 Group:      System Environment/Libraries
 URL:        http://delta.affinix.com/qca/
 Source0:    http://delta.affinix.com/download/qca/2.0/plugins/qca-ossl-%{version}-beta%{beta}.tar.bz2
+Patch1:     qca-ossl-2.0.0-no-whirlpool.patch
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: qt4-devel, qca2-devel >= 2.0.0-1
@@ -23,7 +24,7 @@
 
 %prep
 %setup -q -n %{name}-%{version}-beta%{beta}
-
+%patch1 -p1 -b .no-whirlpool
 
 %build
 unset QTDIR
@@ -51,8 +52,9 @@
 
 
 %changelog
-* Sat Jan 17 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
+* Mon Jan 26 2009 Tomas Mraz <tmraz at redhat.com> - 2.0.0-0.5.beta3
 - rebuild with new openssl
+- fix the test for whirlpool support
 
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.0.0-0.4.beta3
 - Autorebuild for GCC 4.3