SPECS (AC-branch): psi.spec - merged from HEAD

[shadzik]

Author: shadzik                      Date: Thu Oct 18 20:10:35 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- merged from HEAD

---- Files affected:
SPECS:
   psi.spec (1.140.2.2 -> 1.140.2.3) 

---- Diffs:

================================================================
Index: SPECS/psi.spec
diff -u SPECS/psi.spec:1.140.2.2 SPECS/psi.spec:1.140.2.3
--- SPECS/psi.spec:1.140.2.2	Thu Oct 18 14:13:56 2007
+++ SPECS/psi.spec	Thu Oct 18 22:10:30 2007
@@ -1,17 +1,15 @@
 # $Revision$, $Date$
-# TODO:
-# - fix configure so it works nicely with pdksh
-#
 Summary:	PSI - Jabber client
 Summary(de.UTF-8):	PSI - ein Instant Messaging Client-Programm für Jabber
 Summary(pl.UTF-8):	PSI - klient Jabbera
 Name:		psi
 Version:	0.11
-Release:	0.1
+Release:	1
 License:	GPL v2
 Group:		Applications/Communications
 Source0:	http://dl.sourceforge.net/psi/%{name}-%{version}.tar.bz2
 # Source0-md5:	6ccc81783eece7959140951289cf5310
+Patch0:		%{name}-configure_fix.patch
 URL:		http://psi-im.org/
 BuildRequires:	Qt3Support-devel
 BuildRequires:	QtCore-devel
@@ -46,22 +44,15 @@
 
 %prep
 %setup -q
+%patch0 -p1
 rm -rf third-party
 
 %build
-export QTDIR=%{_libdir}/qt4
-
-bash ./configure \
+./configure \
 	--prefix=%{_prefix} \
-		--datadir=%{_datadir}
-
-
-%{_libdir}/qt4/bin/qmake psi.pro \
-	QMAKE_CXX="%{__cxx}" \
-	QMAKE_LINK="%{__cxx}" \
-	QMAKE_CXXFLAGS_RELEASE="%{rpmcflags}" \
-	QMAKE_RPATH=
+	--datadir=%{_datadir}
 
+qt4-qmake
 %{__make}
 
 %install
@@ -92,11 +83,22 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.140.2.2  2007/10/18 12:13:56  shadzik
-- one more german fix
+Revision 1.140.2.3  2007/10/18 20:10:30  shadzik
+- merged from HEAD
 
-Revision 1.140.2.1  2007/10/18 11:50:57  shadzik
-- AC-branched
+Revision 1.144  2007/10/18 18:13:10  shadzik
+- add patch0 which clears TODO
+- rel 1
+
+Revision 1.143  2007/10/18 17:42:46  shadzik
+- better
+
+Revision 1.142  2007/10/18 17:30:15  shadzik
+- no need to export QTDIR when using qt4-qmake
+
+Revision 1.141  2007/10/18 12:15:08  shadzik
+- one more german fix
+- adapterized
 
 Revision 1.140  2007/10/18 11:48:00  shadzik
 - german summary fix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/psi.spec?r1=1.140.2.2&r2=1.140.2.3&f=u