rpms/doxygen
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix it so X11R6 is properly removed

Browse Source
This commit is contained in:
Bill Nottingham 2005-11-19 03:35:52 +00:00
parent 833fb5bf5a
commit e84c303cc1
3 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doxygen-1.2.18-libdir.patch
View File

@ -7,13 +7,13 @@
-TMAKE_INCDIR_X11 = /usr/X11R6/include -TMAKE_INCDIR_X11 = /usr/X11R6/include
-TMAKE_LIBDIR_X11 = /usr/X11R6/lib -TMAKE_LIBDIR_X11 = /usr/X11R6/lib
+TMAKE_INCDIR_X11 = /usr/include +TMAKE_INCDIR_X11 = /usr/include
+TMAKE_LIBDIR_X11 = /usr/lib64 +TMAKE_LIBDIR_X11 = /usr/lib
TMAKE_INCDIR_QT = $(QTDIR)/include TMAKE_INCDIR_QT = $(QTDIR)/include
TMAKE_LIBDIR_QT = $(QTDIR)/lib 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/lib
+TMAKE_INCDIR_OPENGL = /usr/include +TMAKE_INCDIR_OPENGL = /usr/include
+TMAKE_LIBDIR_OPENGL = /usr/lib64 +TMAKE_LIBDIR_OPENGL = /usr/lib
TMAKE_LINK = g++ TMAKE_LINK = g++
TMAKE_LINK_SHLIB = g++ TMAKE_LINK_SHLIB = g++

19
doxygen-1.2.18-libdir64.patch Normal file
View File

@ -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++

3
doxygen.spec
View File

@ -10,6 +10,7 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
Patch0: doxygen-1.4.3-config.patch Patch0: doxygen-1.4.3-config.patch
Patch2: doxygen-1.2.18-libdir.patch Patch2: doxygen-1.2.18-libdir.patch
Patch3: doxygen-1.2.18-libdir64.patch
Group: Development/Tools Group: Development/Tools
License: GPL License: GPL
@ -46,6 +47,8 @@ are used by doxygen.
%patch0 -p1 -b .redhat %patch0 -p1 -b .redhat
%if "%{_lib}" != "lib" %if "%{_lib}" != "lib"
%patch3 -p1 -b .libdir
%else
%patch2 -p1 -b .libdir %patch2 -p1 -b .libdir
%endif %endif