SPECS: wengophone.spec - a better way for passing our names of qt ...

[arvenil]

Author: arvenil                      Date: Sat Nov 10 00:01:13 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- a better way for passing our names of qt tools (without modifing sources)

---- Files affected:
SPECS:
   wengophone.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/wengophone.spec
diff -u SPECS/wengophone.spec:1.7 SPECS/wengophone.spec:1.8
--- SPECS/wengophone.spec:1.7	Fri Nov  9 23:36:33 2007
+++ SPECS/wengophone.spec	Sat Nov 10 01:01:07 2007
@@ -6,14 +6,13 @@
 Summary:	WengoPhone is a free software SIP compliant VoIP client developed by the OpenWengo community
 Name:		wengophone
 Version:	2.1.2
-Release:	0.5
+Release:	0.6
 License:	GPL
 Group:		X11/Applications
 Source0:	http://download.wengo.com/nightlybuilds/universal/sources/openwengo/%{version}/%{name}-%{version}-source.zip
 # Source0-md5:	5c079f8e0b0bcf7e951c1350c0739520
-Patch0:		%{name}-qt4tools.patch
-Patch1:		%{name}-avcodec.patch
-Patch2:		%{name}-desktop.patch
+Patch0:		%{name}-avcodec.patch
+Patch1:		%{name}-desktop.patch
 URL:		http://www.openwengo.com/
 BuildRequires:	QtGui-devel >= 4.1.4
 BuildRequires:	QtSvg-devel >= 4.1.4
@@ -58,13 +57,16 @@
 %setup -q -n %{name}-%{version}-source
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 cd build
 %cmake \
 	-DCMAKE_BUILD_TYPE="Release" \
+	-DCMAKE_INSTALL_PREFIX=%{_prefix} \
 	-DQT_LRELEASE_EXECUTABLE=%{_libdir}/qt4/bin/lrelease \
+	-DQT_MOC_EXECUTABLE=%{_bindir}/qt4-moc \
+	-DQT_UIC_EXECUTABLE=%{_bindir}/qt4-uic \
+	-DQT_QMAKE_EXECUTABLE=%{_bindir}/qt4-qmake \
 %if "%{_lib}" == "lib64"
 	-DLIB_SUFFIX=64 \
 %endif
@@ -101,6 +103,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2007/11/10 00:01:07  arvenil
+- a better way for passing our names of qt tools (without modifing sources)
+
 Revision 1.7  2007/11/09 22:36:33  arvenil
 - use lrelease from qt4-linguist package not from qt-linguist (this is Qt4 app)
 - added lib suffix
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/wengophone.spec?r1=1.7&r2=1.8&f=u