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.33 by dlange, Tue May 26 17:40:21 2009 UTC vs.
Revision 1.41 by elmer, Sat Nov 7 19:16:06 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 $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 + # Remove the doc, as it is large and we don't need that in
45 + # our rpms (it is all available on the web in any case)
46 + rm -fR %i/doc
47 +
48 + # Qt itself has some paths that can only be overwritten by
49 + # using an appropriate `qt.conf`.
50 + # Without this qmake will complain whenever used in
51 + # a directory different than the build one.
52 + mkdir -p %i/bin
53 + cat << \EOF_QT_CONF >%i/bin/qt.conf
54 + [Paths]
55 + Prefix = %{i}
56 + EOF_QT_CONF
57 +
58   # SCRAM ToolBox toolfile
59   mkdir -p %i/etc/scram.d
60   cat << \EOF_TOOLFILE >%i/etc/scram.d/qtbase
# Line 143 | Line 157 | EOF_TOOLFILE
157   %{relocateConfig}etc/scram.d/qtdesigner
158   %{relocateConfig}etc/scram.d/qtextra
159   %{relocateConfig}etc/scram.d/qt3support
160 + %{relocateConfig}bin/qt.conf

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines