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.16 by elmer, Wed Jun 27 12:50:44 2007 UTC

# Line 1 | Line 1
1 < ### RPM external qt 3.3.6
1 > ### RPM external qt 3.3.6-CMS3
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  
43   %build
# Line 50 | Line 55 | esac
55   echo yes | ./configure -prefix %i -thread -stl $CONFIG_ARGS
56   # install_framework is hosed
57   perl -p -i -e 's/^install_framework:/install_framework:\ninstall_framework_no:/' src/Makefile
58 + # The following is a kludge around the fact that the fact that the
59 + # /usr/lib/libfontconfig.so soft link (for 32-bit lib) is missing
60 + # on the 64-bit machines
61 + %if "%cmsplatf" == "slc4_ia32_gcc345"
62 +  mkdir -p %{_builddir}/lib
63 +  ln -s /usr/lib/libfontconfig.so.1 %{_builddir}/%n-%type-free-%{qtversion}/lib/libfontconfig.so
64 + %endif
65 +
66   make %makeprocesses
67 < #
67 > %post
68 > %{relocateConfig}lib/libqt-mt.la
69 >

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines