ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/cvsroot/COMP/CMSDIST/qt.spec
(Generate patch)

Comparing COMP/CMSDIST/qt.spec (file contents):
Revision 1.1 by eulisse, Fri Feb 24 08:01:52 2006 UTC vs.
Revision 1.12 by elmer, Fri Apr 6 12:25:10 2007 UTC

# Line 1 | Line 1
1 < ### RPM external qt 3.3.4
1 > ### RPM external qt 3.3.6
2   ## INITENV UNSET QMAKESPEC
3   ## INITENV SET QTDIR %i
4   %define qttype %(echo %v | sed 's/[-0-9.]*//')
# Line 22 | Line 22
22   # Requires: zlib, ...
23   Source0: ftp://ftp.trolltech.com/qt/source/%n-mac-free-%{qtversion}.tar.bz2
24   Source1: ftp://ftp.trolltech.com/qt/source/%n-x11-free-%{qtversion}.tar.bz2
25 + Patch0: qt-mkspecs-qmake.conf
26 + Patch1: qt-mkspecs-qplatformdefs.h
27 + Patch2: qt-src-kernel-qaccessible_mac.cpp
28 + Patch3: qt-src-qt_install.pri
29  
30   %prep
31   %setup -T -b %sourcepkg -n %n-%type-free-%{qtversion}
32 + #%ifos darwin
33 + #%patch1 -p0
34 + #%patch2 -p0
35 + #%patch3 -p0
36 + #%endif
37  
38   %build
39   unset QMAKESPEC || true
# Line 32 | Line 41 | export QTDIR=$PWD
41   export PATH=$QTDIR/bin:$PATH
42   export LD_LIBRARY_PATH=$QTDIR/lib:$LD_LIBRARY_PATH
43   export DYLD_LIBRARY_PATH=$QTDIR/lib:$DYLD_LIBRARY_PATH
44 < echo yes | ./configure -prefix %i -thread -stl
44 >
45 > case $(uname -m) in
46 >  x86_64)
47 >    export CONFIG_ARGS="-platform linux-g++-64"
48 > esac
49 >
50 > echo yes | ./configure -prefix %i -thread -stl $CONFIG_ARGS
51   # install_framework is hosed
52   perl -p -i -e 's/^install_framework:/install_framework:\ninstall_framework_no:/' src/Makefile
53 < make
53 > make %makeprocesses
54 > %post
55 > %{relocateConfig}lib/libqt-mt.la
56 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines