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.10 by eulisse, Tue Jul 25 15:38:45 2006 UTC vs.
Revision 1.18 by elmer, Sun Oct 21 08:12:24 2007 UTC

# Line 1 | Line 1
1 < ### RPM external qt 3.3.6
1 > ### RPM external qt 3.3.6-CMS8
2   ## INITENV UNSET QMAKESPEC
3   ## INITENV SET QTDIR %i
4 < %define qttype %(echo %v | sed 's/[-0-9.]*//')
5 < %define qtversion %(echo %v | sed 's/-.*//')
4 > %define qttype %(echo %realversion | sed 's/[-0-9.]*//')
5 > %define qtversion %(echo %realversion | sed 's/-.*//')
6   %if "%qttype" == ""
7   %ifos darwin
8    %define type  mac
# Line 26 | Line 26 | Patch0: qt-mkspecs-qmake.conf
26   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  
31   %prep
32   %setup -T -b %sourcepkg -n %n-%type-free-%{qtversion}
33 < %ifos darwin
34 < %patch1 -p0
35 < %patch2 -p0
36 < %patch3 -p0
33 > #%ifos darwin
34 > #%patch1 -p0
35 > #%patch2 -p0
36 > #%patch3 -p0
37 > #%endif
38 > # The kludge supports the libfontconfig kludge described below
39 > %if "%cmsplatf" == "slc4_ia32_gcc345"
40 > %patch4 -p1
41 > %endif
42 > %if "%cmsplatf" == "slc4_ia32_gcc412"
43 > %patch4 -p1
44   %endif
45  
46   %build
# Line 50 | Line 58 | esac
58   echo yes | ./configure -prefix %i -thread -stl $CONFIG_ARGS
59   # install_framework is hosed
60   perl -p -i -e 's/^install_framework:/install_framework:\ninstall_framework_no:/' src/Makefile
61 + # The following is a kludge around the fact that the fact that the
62 + # /usr/lib/libfontconfig.so soft link (for 32-bit lib) is missing
63 + # on the 64-bit machines
64 + %if "%cmsplatf" == "slc4_ia32_gcc345"
65 +  mkdir -p %{_builddir}/lib
66 +  ln -s /usr/lib/libfontconfig.so.1 %{_builddir}/%n-%type-free-%{qtversion}/lib/libfontconfig.so
67 + %endif
68 + %if "%cmsplatf" == "slc4_ia32_gcc412"
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 < #
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