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.31 by elmer, Wed Feb 25 12:21:39 2009 UTC vs.
Revision 1.37 by elmer, Fri Sep 18 19:34:51 2009 UTC

# Line 1 | Line 1
1 < ### RPM external qt 4.4.3
1 > ### RPM external qt 4.5.2
2   ## INITENV UNSET QMAKESPEC
3   ## INITENV SET QTDIR %i
4  
# 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 -no-glib -no-libtiff -no-libpng -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 63 | Line 63 | cat << \EOF_TOOLFILE >%i/etc/scram.d/qtb
63   </Tool>
64   EOF_TOOLFILE
65  
66 + cat << \EOF_TOOLFILE >%i/etc/scram.d/qt3support
67 + <doc type=BuildSystem::ToolDoc version=1.0>
68 + <Tool name=qt3support version=%v>
69 + <info url="http://www.trolltech.com/products/qt.html"></info>
70 + <LIB name=Qt3Support>
71 + <Client>
72 + <Environment name=QT_BASE default="%i"></Environment>
73 + <Environment name=INCLUDE default="$QT_BASE/include/Qt3Support"></Environment>
74 + </Client>
75 + <Flags CPPDEFINES="QT3_SUPPORT">
76 + <use name=qtbase>
77 + </Tool>
78 + EOF_TOOLFILE
79 +
80 +
81   cat << \EOF_TOOLFILE >%i/etc/scram.d/qt
82   <doc type=BuildSystem::ToolDoc version=1.0>
83   <Tool name=qt version=%v>
# Line 75 | Line 90 | cat << \EOF_TOOLFILE >%i/etc/scram.d/qt
90   <Environment name=INCLUDE default="$QT_BASE/include/QtGui"></Environment>
91   </Client>
92   <use name=qtbase>
93 + <use name=qt3support>
94   <use name=X11>
95   <use name=opengl>
96   </Tool>
# Line 126 | Line 142 | EOF_TOOLFILE
142   %{relocateConfig}etc/scram.d/qt
143   %{relocateConfig}etc/scram.d/qtdesigner
144   %{relocateConfig}etc/scram.d/qtextra
145 + %{relocateConfig}etc/scram.d/qt3support

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines