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.26 by eulisse, Tue Jan 27 13:21:14 2009 UTC vs.
Revision 1.32 by dlange, Thu Apr 9 19:58:18 2009 UTC

# Line 1 | Line 1
1 < ### RPM external qt 4.4.3
1 > ### RPM external qt 4.5.0
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 $CONFIG_ARGS
27 > echo yes | ./configure -prefix %i -stl -no-openssl -no-glib -no-libtiff $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 48 | Line 48 | cat << \EOF_TOOLFILE >%i/etc/scram.d/qtb
48   <Tool name=qtbase version=%v>
49   <info url="http://www.trolltech.com/products/qt.html"></info>
50   <LIB name=QtCore>
51 < <LIB name=QtXML>
51 > <LIB name=QtXml>
52   <Client>
53   <Environment name=QT_BASE default="%i"></Environment>
54   <Environment name=LIBDIR default="$QT_BASE/lib"></Environment>
55   <Environment name=INCLUDE default="$QT_BASE/include"></Environment>
56 + <Environment name=INCLUDE default="$QT_BASE/include/Qt"></Environment>
57 + <Environment name=INCLUDE default="$QT_BASE/include/QtCore"></Environment>
58 + <Environment name=INCLUDE default="$QT_BASE/include/QtXml"></Environment>
59   </Client>
60   <Flags CPPDEFINES="QT_ALTERNATE_QTSMANIP QT_CLEAN_NAMESPACE QT_THREAD_SUPPORT">
61   <Runtime name=PATH value="$QT_BASE/bin" type=path>
# Line 60 | 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>
84   <info url="http://www.trolltech.com/products/qt.html"></info>
85   <LIB name=QtOpenGL>
86   <LIB name=QtGui>
87 + <Client>
88 + <Environment name=QT_BASE default="%i"></Environment>
89 + <Environment name=INCLUDE default="$QT_BASE/include/QtOpenGL"></Environment>
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 77 | Line 101 | cat << \EOF_TOOLFILE >%i/etc/scram.d/qtd
101   <Tool name=qtdesigner version=%v>
102   <info url="http://www.trolltech.com/products/qt.html"></info>
103   <LIB name=QtDesigner>
104 < <use name=qtinteractive>
104 > <Client>
105 > <Environment name=QT_BASE default="%i"></Environment>
106 > <Environment name=INCLUDE default="$QT_BASE/include/QtDesigner"></Environment>
107 > </Client>
108 > <use name=qtbase>
109 > <use name=qt>
110 > </Tool>
111 > EOF_TOOLFILE
112 >
113 > cat << \EOF_TOOLFILE >%i/etc/scram.d/qtextra
114 > <doc type=BuildSystem::ToolDoc version=1.0>
115 > <Tool name=qtextra version=%v>
116 > <info url="http://www.trolltech.com/products/qt.html"></info>
117 > <LIB name=QtScript>
118 > <Client>
119 > <Environment name=QT_BASE default="%i"></Environment>
120 > <Environment name=INCLUDE default="$QT_BASE/include/QtScript"></Environment>
121 > </Client>
122 > <use name=qtbase>
123   </Tool>
124   EOF_TOOLFILE
125  
126   %post
127 < %{relocateConfig}lib/libqt-mt.la
128 < %{relocateConfig}etc/scram.d/%n
127 > %{relocateConfig}lib/libQt3Support.la    
128 > %{relocateConfig}lib/libQtSql.la
129 > %{relocateConfig}lib/libQtCLucene.la      
130 > %{relocateConfig}lib/libQtSvg.la
131 > %{relocateConfig}lib/libQtCore.la    
132 > %{relocateConfig}lib/libQtTest.la
133 > %{relocateConfig}lib/libQtGui.la      
134 > %{relocateConfig}lib/libQtWebKit.la
135 > %{relocateConfig}lib/libQtHelp.la    
136 > %{relocateConfig}lib/libQtXml.la
137 > %{relocateConfig}lib/libQtNetwork.la      
138 > %{relocateConfig}lib/libQtXmlPatterns.la
139 > %{relocateConfig}lib/libQtOpenGL.la    
140 > %{relocateConfig}lib/libQtScript.la    
141 > %{relocateConfig}etc/scram.d/qtbase
142 > %{relocateConfig}etc/scram.d/qt
143 > %{relocateConfig}etc/scram.d/qtdesigner
144 > %{relocateConfig}etc/scram.d/qtextra

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines