From 833fb5bf5a049497c43db2e6e2c5f87b2439c449 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Nov 19 2005 03:30:21 +0000 Subject: Remove references to obsolete /usr/X11R6 path --- diff --git a/doxygen-1.2.18-libdir.patch b/doxygen-1.2.18-libdir.patch index f498ff3..da049ea 100644 --- a/doxygen-1.2.18-libdir.patch +++ b/doxygen-1.2.18-libdir.patch @@ -1,16 +1,19 @@ ---- doxygen-1.2.18/tmake/lib/linux-g++/tmake.conf.libdir 2002-11-09 12:35:59.000000000 -0500 -+++ doxygen-1.2.18/tmake/lib/linux-g++/tmake.conf 2002-11-09 12:37:44.000000000 -0500 -@@ -28,11 +28,11 @@ +--- 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_INCDIR_X11 = /usr/X11R6/include -TMAKE_LIBDIR_X11 = /usr/X11R6/lib -+TMAKE_LIBDIR_X11 = /usr/X11R6/lib64 ++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_INCDIR_OPENGL = /usr/X11R6/include -TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib64 ++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 662307a..4a730ff 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -4,7 +4,7 @@ Summary: A documentation system for C/C++. Name: doxygen Version: 1.4.5 -Release: 1 +Release: 2 Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz @@ -97,6 +97,9 @@ rm -rf ${RPM_BUILD_ROOT} %endif %changelog +* Fri Nov 18 2005 Bill Nottingham +- fix references to /usr/X11R6 + * Sat Oct 15 2005 Florian La Roche - 1.4.5