From e84c303cc15898843c22118f46ef331f354d14dc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Nov 19 2005 03:35:52 +0000 Subject: Fix it so X11R6 is properly removed --- diff --git a/doxygen-1.2.18-libdir.patch b/doxygen-1.2.18-libdir.patch index da049ea..ff1f21b 100644 --- a/doxygen-1.2.18-libdir.patch +++ b/doxygen-1.2.18-libdir.patch @@ -7,13 +7,13 @@ -TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib +TMAKE_INCDIR_X11 = /usr/include -+TMAKE_LIBDIR_X11 = /usr/lib64 ++TMAKE_LIBDIR_X11 = /usr/lib TMAKE_INCDIR_QT = $(QTDIR)/include TMAKE_LIBDIR_QT = $(QTDIR)/lib -TMAKE_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib +TMAKE_INCDIR_OPENGL = /usr/include -+TMAKE_LIBDIR_OPENGL = /usr/lib64 ++TMAKE_LIBDIR_OPENGL = /usr/lib TMAKE_LINK = g++ TMAKE_LINK_SHLIB = g++ diff --git a/doxygen-1.2.18-libdir64.patch b/doxygen-1.2.18-libdir64.patch new file mode 100644 index 0000000..da049ea --- /dev/null +++ b/doxygen-1.2.18-libdir64.patch @@ -0,0 +1,19 @@ +--- doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf.libdir 2005-11-18 22:12:21.000000000 -0500 ++++ doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf 2005-11-18 22:12:46.000000000 -0500 +@@ -27,12 +27,12 @@ + + TMAKE_INCDIR = + TMAKE_LIBDIR = +-TMAKE_INCDIR_X11 = /usr/X11R6/include +-TMAKE_LIBDIR_X11 = /usr/X11R6/lib ++TMAKE_INCDIR_X11 = /usr/include ++TMAKE_LIBDIR_X11 = /usr/lib64 + TMAKE_INCDIR_QT = $(QTDIR)/include + TMAKE_LIBDIR_QT = $(QTDIR)/lib +-TMAKE_INCDIR_OPENGL = /usr/X11R6/include +-TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib ++TMAKE_INCDIR_OPENGL = /usr/include ++TMAKE_LIBDIR_OPENGL = /usr/lib64 + + TMAKE_LINK = g++ + TMAKE_LINK_SHLIB = g++ diff --git a/doxygen.spec b/doxygen.spec index 4a730ff..e9c3719 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -10,6 +10,7 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Patch0: doxygen-1.4.3-config.patch Patch2: doxygen-1.2.18-libdir.patch +Patch3: doxygen-1.2.18-libdir64.patch Group: Development/Tools License: GPL @@ -46,6 +47,8 @@ are used by doxygen. %patch0 -p1 -b .redhat %if "%{_lib}" != "lib" +%patch3 -p1 -b .libdir +%else %patch2 -p1 -b .libdir %endif