ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/cvsroot/COMP/CMSDIST/qt.spec

Comparing COMP/CMSDIST/qt.spec (file contents):
Revision 1.18 by elmer, Sun Oct 21 08:12:24 2007 UTC vs.
Revision 1.20 by elmer, Mon Nov 5 23:16:16 2007 UTC

#	Line 1 | Line 1
1	<	### RPM external qt 3.3.6-CMS8
1	>	### RPM external qt 3.3.6-CMS18
2		## INITENV UNSET QMAKESPEC
3		## INITENV SET QTDIR %i
4		%define qttype %(echo %realversion | sed 's/[-0-9.]*//')
#	Line 36 | Line 36 | Patch4: qt-mkspecs-qmake.conf_2
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"
39	>	%if (("%cmsplatf" == "slc4_ia32_gcc345")||("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422"))
40		%patch4 -p1
41		%endif
42
#	Line 61 | Line 58 | perl -p -i -e 's/^install_framework:/ins
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"
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"
61	>	%if (("%cmsplatf" == "slc4_ia32_gcc345")||("%cmsplatf" == "slc4_ia32_gcc412")||("%cmsplatf" == "slc4_ia32_gcc422"))
62		mkdir -p %{_builddir}/lib
63		ln -s /usr/lib/libfontconfig.so.1 %{_builddir}/%n-%type-free-%{qtversion}/lib/libfontconfig.so
64		%endif

Diff Legend

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