rpms/psi/devel .cvsignore, 1.17, 1.18 psi-0.12-qca.patch, 1.1, 1.2 psi.spec, 1.36, 1.37 sources, 1.20, 1.21

[Sven Lankes]

Author: slankes

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

Modified Files:
	.cvsignore psi-0.12-qca.patch psi.spec sources 
Log Message:
* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.1.rc3
- 0.14 rc3



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	29 Jul 2009 06:09:34 -0000	1.17
+++ .cvsignore	29 Nov 2009 20:25:09 -0000	1.18
@@ -1,4 +1,4 @@
-psi-0.13.tar.bz2
 emoticons-0.10.tar.gz
 psi-lang-packs-0.13-1.tar.gz
 rostericons-0.10.tar.gz
+psi-0.14-rc3.tar.bz2

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/devel/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	29 Nov 2009 20:25:09 -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())


Index: psi.spec
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/psi.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -p -r1.36 -r1.37
--- psi.spec	29 Jul 2009 06:09:36 -0000	1.36
+++ psi.spec	29 Nov 2009 20:25:09 -0000	1.37
@@ -1,18 +1,18 @@
 Name:       psi
-Version:    0.13
-Release:    1%{?dist}
+Version:    0.14
+Release:    0.1.rc3%{?dist}
 Summary:    Jabber client based on Qt
 License:    GPLv2+
 Group:      Applications/Internet
 URL:        http://psi-im.org
-Source0:    http://dl.sf.net/psi/psi-%{version}.tar.bz2
+Source0:    http://dl.sf.net/psi/psi-%{version}-rc3.tar.bz2
 Patch0:     psi-0.12-qca.patch
 
 BuildRoot:  %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  qt4-devel, zlib-devel, desktop-file-utils
 BuildRequires:  qca2-devel, glib2-devel
-BuildRequires:  aspell-devel, libXScrnSaver-devel
+BuildRequires:  enchant-devel, libXScrnSaver-devel
 
 Requires(hint): sox
 Requires(hint): gnupg
@@ -66,8 +66,8 @@ More icons can be found on http://jisp.n
 
 
 %prep
-%setup -q
-%patch0 -p0 -b .qca
+%setup -q -n psi-0.14-rc3
+%patch0 -p1 -b .qca
 
 %build
 unset QTDIR
@@ -76,7 +76,8 @@ unset QTDIR
         --bindir=%{_bindir}        \
         --libdir=%{_libdir}        \
         --datadir=%{_datadir}      \
-        --disable-bundled-qca
+        --disable-bundled-qca      \
+        --disable-aspell
 
 make %{?_smp_mflags}
 
@@ -90,6 +91,7 @@ make install
 # Install language packs
 tar -xzpf %{SOURCE10} -C $RPM_BUILD_ROOT%{_datadir}/%name/
 rm -f $RPM_BUILD_ROOT%{_datadir}/%name/getlangs.sh
+rm -f $RPM_BUILD_ROOT%{_bindir}/psi.debug
 
 ## Install iconsets
 tar -xzpf %{SOURCE11} -C $RPM_BUILD_ROOT%{_datadir}/%name/iconsets/emoticons/
@@ -145,6 +147,9 @@ fi
 
 
 %changelog
+* Sun Nov 29 2009 Sven Lankes <sven at lank.es> 0.14-0.1.rc3
+- 0.14 rc3
+
 * Tue Jul 28 2009 Aurelien Bompard <abompard at fedoraproject.org> - 0.13-1
 - 0.13 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/psi/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	29 Jul 2009 06:09:36 -0000	1.20
+++ sources	29 Nov 2009 20:25:09 -0000	1.21
@@ -1,4 +1,4 @@
-ddc1a2a35dc155ca46ad6ecaeccdf894  psi-0.13.tar.bz2
 1b4b3374c676c330c87e2ef0cd9109fa  emoticons-0.10.tar.gz
 749688094206e3282e466ee696998290  psi-lang-packs-0.13-1.tar.gz
 51386c12abbee7100f092455bfb88bf1  rostericons-0.10.tar.gz
+e73bc9b23ee622b625bd924c9265269a  psi-0.14-rc3.tar.bz2