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.36 by muzaffar, Thu Jun 18 16:07:44 2009 UTC vs.
Revision 1.40 by eulisse, Mon Nov 2 14:08:38 2009 UTC

# Line 1 | Line 1
1 < ### RPM external qt 4.5.0
1 > ### RPM external qt 4.5.2
2   ## INITENV UNSET QMAKESPEC
3   ## INITENV SET QTDIR %i
4  
5 < # Requires: zlib, ...
5 > Requires: libjpg
6   Source0: ftp://ftp.trolltech.com/qt/source/%n-all-opensource-src-%{realversion}.tar.bz2
7  
8   %prep
# Line 24 | Line 24 | case %cmsplatf in
24    ;;
25   esac
26  
27 < echo yes | ./configure -prefix %i -stl -no-openssl -no-glib -no-libtiff -no-libpng -no-separate-debug-info -no-sql-odbc -no-sql-mysql $CONFIG_ARGS
27 > echo yes | ./configure -prefix %i -opensource -stl -no-openssl -L$LIBJPG_ROOT/lib -no-glib -no-libtiff -no-libpng -no-libmng -no-separate-debug-info -no-sql-odbc -no-sql-mysql $CONFIG_ARGS
28  
29   # The following is a kludge around the fact that the fact that the
30   # /usr/lib/libfontconfig.so soft link (for 32-bit lib) is missing
# Line 41 | Line 41 | make %makeprocesses
41   %install
42   make install
43  
44 + # Qt itself has some paths that can only be overwritten by
45 + # using an appropriate `qt.conf`.
46 + # Without this qmake will complain whenever used in
47 + # a directory different than the build one.
48 + mkdir -p %i/bin
49 + cat << \EOF_QT_CONF >%i/bin/qt.conf
50 + [Paths]
51 + Prefix = %{i}
52 + EOF_QT_CONF
53 +
54   # SCRAM ToolBox toolfile
55   mkdir -p %i/etc/scram.d
56   cat << \EOF_TOOLFILE >%i/etc/scram.d/qtbase
# Line 143 | Line 153 | EOF_TOOLFILE
153   %{relocateConfig}etc/scram.d/qtdesigner
154   %{relocateConfig}etc/scram.d/qtextra
155   %{relocateConfig}etc/scram.d/qt3support
156 + %{relocateConfig}bin/qt.conf

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines