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.16 by elmer, Wed Jun 27 12:50:44 2007 UTC vs.
Revision 1.22 by elmer, Thu Dec 27 20:28:33 2007 UTC

# Line 1 | Line 1
1 < ### RPM external qt 3.3.6-CMS3
1 > ### RPM external qt 3.3.8-CMS19
2   ## INITENV UNSET QMAKESPEC
3   ## INITENV SET QTDIR %i
4   %define qttype %(echo %realversion | sed 's/[-0-9.]*//')
# Line 27 | Line 27 | Patch1: qt-mkspecs-qplatformdefs.h
27   Patch2: qt-src-kernel-qaccessible_mac.cpp
28   Patch3: qt-src-qt_install.pri
29   Patch4: qt-mkspecs-qmake.conf_2
30 + Patch5: qt3-leopard
31  
32   %prep
33   %setup -T -b %sourcepkg -n %n-%type-free-%{qtversion}
# Line 35 | Line 36 | Patch4: qt-mkspecs-qmake.conf_2
36   #%patch2 -p0
37   #%patch3 -p0
38   #%endif
39 < # The kludge supports the libfontconfig kludge described below
40 < %if "%cmsplatf" == "slc4_ia32_gcc345"
39 >
40 > case %cmsplatf in
41 >    slc4_ia32* )
42 >        # The kludge supports the libfontconfig kludge described below
43   %patch4 -p1
44 < %endif
44 >    ;;
45 >    osx105* )
46 > %patch5 -p1
47 >    ;;
48 > esac
49  
50   %build
51   unset QMAKESPEC || true
# Line 58 | Line 65 | perl -p -i -e 's/^install_framework:/ins
65   # The following is a kludge around the fact that the fact that the
66   # /usr/lib/libfontconfig.so soft link (for 32-bit lib) is missing
67   # on the 64-bit machines
68 < %if "%cmsplatf" == "slc4_ia32_gcc345"
68 > %if (("%cmsplatf" == "slc4_ia32_gcc345")||("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422"))
69    mkdir -p %{_builddir}/lib
70    ln -s /usr/lib/libfontconfig.so.1 %{_builddir}/%n-%type-free-%{qtversion}/lib/libfontconfig.so
71   %endif
72  
73   make %makeprocesses
74 +
75 + %install
76 + make install
77 +
78 + # SCRAM ToolBox toolfile
79 + mkdir -p %i/etc/scram.d
80 + cat << \EOF_TOOLFILE >%i/etc/scram.d/%n
81 + <doc type=BuildSystem::ToolDoc version=1.0>
82 + <Tool name=%n version=%v>
83 + <info url="http://www.trolltech.com/products/qt.html"></info>
84 + <LIB name=qt-mt>
85 + <Client>
86 + <Environment name=QT_BASE default="%i"></Environment>
87 + <Environment name=LIBDIR default="$QT_BASE/lib"></Environment>
88 + <Environment name=INCLUDE default="$QT_BASE/include"></Environment>
89 + </Client>
90 + <Flags CPPDEFINES="QT_ALTERNATE_QTSMANIP QT_CLEAN_NAMESPACE QT_THREAD_SUPPORT">
91 + <Runtime name=PATH value="$QT_BASE/bin" type=path>
92 + <use name=X11>
93 + <use name=opengl>
94 + <use name=zlib>
95 + </Tool>
96 + EOF_TOOLFILE
97 +
98   %post
99   %{relocateConfig}lib/libqt-mt.la
100 + %{relocateConfig}etc/scram.d/%n
101  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines