Author: gb
Date: Tue Feb 13 23:35:34 2007
New Revision: 120646
Modified:
packages/cooker/doxygen/current/SPECS/doxygen.spec
Log:
- fix build on lib{32,64} arches
Modified: packages/cooker/doxygen/current/SPECS/doxygen.spec
==============================================================================
--- packages/cooker/doxygen/current/SPECS/doxygen.spec (original)
+++ packages/cooker/doxygen/current/SPECS/doxygen.spec Tue Feb 13 23:35:34 2007
@@ -3,7 +3,7 @@
Name: doxygen
Version: 1.5.1
-Release: %mkrel 1
+Release: %mkrel 2
Summary: Doxygen is THE documentation system for C/C++
Group: Development/Other
License: GPL
@@ -43,17 +43,14 @@
%{__rm} src/unistd.h
%patch0 -p1
%{__perl} -pi -e "s|^TMAKE_CFLAGS_RELEASE.*|TMAKE_CFLAGS_RELEASE =
%{optflags}|" tmake/lib/linux-g++/tmake.conf
-%ifarch x86_64 sparc64 ppc64 s390x
-%{__perl} -pi -e "s|(QTDIR/)lib|\1%{_lib}|" configure
-%{__perl} -pi -e 's/^f_thread=NO/f_thread=YES/' configure
%{__perl} -pi -e "s|/lib$|/%{_lib}|" tmake/lib/linux-g++/tmake.conf
-%endif
+# always use threaded version of qt
+%{__perl} -pi -e 's/^f_thread=NO/f_thread=YES/' configure
+# XXX configure is going to fail if both 32-bit and 64-bit qt3-devel
+# are installed
find -type d -exec %{__chmod} 0755 {} \;
%build
-%ifarch x86_64
-QTDIR=%{_prefix}/lib/qt3 \
-%endif
./configure --with-doxywizard
%make
%if %builddoc
