rpms/psi/F-9 psi-0.12-qca.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 psi.spec, 1.21, 1.22 sources, 1.11, 1.12

[Aurelien Bompard (abompard)]

Author: abompard

Update of /cvs/pkgs/rpms/psi/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11937/F-9

Modified Files:
	.cvsignore psi.spec sources 
Added Files:
	psi-0.12-qca.patch 
Log Message:
* Wed Aug 13 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.12-1
- version 0.12


psi-0.12-qca.patch:

--- NEW FILE psi-0.12-qca.patch ---
--- 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";
 
 		QString str =
-		"#include <QtCrypto>\n"
+		"#include <QtCrypto/QtCrypto>\n"
 		"\n"
 		"int main()\n"
 		"{\n"
@@ -2107,9 +2108,10 @@
 		if(!conf->INCLUDEPATH.isEmpty())
 			str += "INCLUDEPATH += " + conf->INCLUDEPATH + '\n';
 		if(!conf->LIBS.isEmpty())
-			str += "LIBS += " + conf->LIBS + '\n';
+			str += "LIBS += " + conf->LIBS + " -lqca" + '\n';
 		if(!conf->extra.isEmpty())
 			str += conf->extra;
+		str += "INCLUDEPATH += " + conf->INCLUDEPATH + "/usr/include/QtCrypto" + '\n';
 		str += '\n';
 
 		QByteArray cs = str.toLatin1();


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-9/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	29 Oct 2007 20:39:01 -0000	1.9
+++ .cvsignore	13 Aug 2008 20:46:11 -0000	1.10
@@ -1,4 +1,4 @@
+psi-0.12.tar.bz2
 emoticons-0.10.tar.gz
-psi-0.11.tar.bz2
-psi-lang-packs-0.10.tar.gz
+psi-lang-packs-0.12.tar.gz
 rostericons-0.10.tar.gz


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-9/psi.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- psi.spec	18 Feb 2008 18:25:54 -0000	1.21
+++ psi.spec	13 Aug 2008 20:46:11 -0000	1.22
@@ -1,11 +1,12 @@
 Name:       psi
-Version:    0.11
-Release:    4%{?dist}
+Version:    0.12
+Release:    1%{?dist}
 Summary:    Jabber client based on Qt
-License:    GPL
+License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
 Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
+Patch0:     psi-0.12-qca.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -66,6 +67,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .qca
 
 
 %build
@@ -139,6 +141,12 @@
 
 
 %changelog
+* Wed Aug 13 2008 Aurelien Bompard <abompard at fedoraproject.org> 0.12-1
+- version 0.12
+
+* Wed May 21 2008 Tom "spot" Callaway <tcallawa at redhat.com> 0.11-5
+- fix license tag
+
 * Mon Feb 18 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.11-4
 - Autorebuild for GCC 4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/F-9/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	29 Oct 2007 20:39:01 -0000	1.11
+++ sources	13 Aug 2008 20:46:11 -0000	1.12
@@ -1,4 +1,4 @@
+47b654c944ef8766b860fe0645615d18  psi-0.12.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
-6ccc81783eece7959140951289cf5310  psi-0.11.tar.bz2
-621a521ccd90a1e0272081e1a5ec7620  psi-lang-packs-0.10.tar.gz
+054311487f6bad8e749b6034461bb293  psi-lang-packs-0.12.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz