From 735c4af75269413ae6bec965f9517d21c96c9793 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@fedoraproject.org>
Date: Mon, 17 Mar 2008 13:14:59 +0000
Subject: [PATCH] apply patch to not break partial include paths, thanks to Tim
 Niemueller

---
 doxygen-1.5.5-brokenpaths.patch | 12 ++++++++++++
 doxygen.spec                    | 11 ++++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 doxygen-1.5.5-brokenpaths.patch

diff --git a/doxygen-1.5.5-brokenpaths.patch b/doxygen-1.5.5-brokenpaths.patch
new file mode 100644
index 0000000..f8bcc96
--- /dev/null
+++ b/doxygen-1.5.5-brokenpaths.patch
@@ -0,0 +1,12 @@
+diff -urN doxygen-1.5.5/src/util.cpp doxygen-1.5.5.brokenpaths/src/util.cpp
+--- doxygen-1.5.5/src/util.cpp	2008-01-19 16:54:27.000000000 +0100
++++ doxygen-1.5.5.brokenpaths/src/util.cpp	2008-03-14 16:45:47.000000000 +0100
+@@ -4468,7 +4468,7 @@
+       QCString pathStripped = stripFromIncludePath(path);
+       for (fni.toFirst();(fd=fni.current());++fni)
+       {
+-        QCString fdStripPath = stripFromIncludePath(fd->getPath());
++        QCString fdStripPath = stripFromIncludePath(fd->getPath().right(path.length()));
+         if (path.isEmpty() || fdStripPath==pathStripped) 
+         { 
+           count++; 
diff --git a/doxygen.spec b/doxygen.spec
index e33a58a..ff14e4f 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -4,7 +4,7 @@
 Summary: A documentation system for C/C++.
 Name: doxygen
 Version: 1.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
@@ -13,6 +13,9 @@ Patch2: doxygen-1.2.18-libdir.patch
 Patch3: doxygen-1.2.18-libdir64.patch
 Patch4: doxygen-1.5.5-system-png.patch
 
+# upstream patches
+Patch100: doxygen-1.5.5-brokenpaths.patch
+
 Group: Development/Tools
 License: GPL
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
@@ -58,6 +61,9 @@ are used by doxygen.
 %endif
 %patch4 -p1 -b .system-png
 
+# upstream patches
+%patch100 -p1 -b .brokenpaths
+
 %build
 %if %{with_qt}
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -104,6 +110,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Mon Mar 17 2008 Than Ngo <than@redhat.com> 1.5.5-2
+- apply patch to not break partial include paths, thanks to Tim Niemueller
+
 * Fri Feb 22 2008 Than Ngo <than@redhat.com> 1.5.5-1
 - 1.5.5
 - use system libpng/zlib