rpms/psi/F-11 psi-0.12-qca.patch,1.1,1.2

[Aurelien Bompard]

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7678/F-11

Modified Files:
	psi-0.12-qca.patch 
Log Message:
Adapt patches in old branches

psi-0.12-qca.patch:
 configure |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: psi-0.12-qca.patch
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-11/psi-0.12-qca.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- psi-0.12-qca.patch	13 Aug 2008 20:46:11 -0000	1.1
+++ psi-0.12-qca.patch	4 Dec 2009 20:15:03 -0000	1.2
@@ -1,19 +1,22 @@
---- configure.qca	2008-08-13 19:00:52.000000000 +0200
-+++ configure	2008-08-13 21:49:20.000000000 +0200
-@@ -497,10 +497,11 @@
- 
- 		QString proextra =
- 		"CONFIG += qt crypto\n"
-+		"INCLUDEPATH += /usr/include/QtCrypto\n"
- 		"QT -= gui\n";
+diff --git a/configure b/configure
+index a5bdd58..9c89ed4 100755
+--- a/configure
++++ b/configure
+@@ -741,11 +741,12 @@ public:
+ 		} else {
+ 			proextra =
+ 			"CONFIG += qt crypto\n"
++            "INCLUDEPATH += /usr/include/QtCrypto\n"
+ 			"QT -= gui\n";
+ 		}
  
  		QString str =
 -		"#include <QtCrypto>\n"
-+		"#include <QtCrypto/QtCrypto>\n"
++        "#include <QtCrypto/QtCrypto>\n"
  		"\n"
  		"int main()\n"
  		"{\n"
-@@ -2107,9 +2108,10 @@
+@@ -2634,9 +2635,10 @@ int main()
  		if(!conf->INCLUDEPATH.isEmpty())
  			str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
  		if(!conf->LIBS.isEmpty())