From 9e8b7d3850f352ec1345a2425a9f00827d94dfe2 Mon Sep 17 00:00:00 2001
From: Kacper Kornet <draenog@pld-linux.org>
Date: Tue, 9 Feb 2010 19:24:15 +0000
Subject: [PATCH] - use PLD ldflags - remove 64bit.patch (was not used) -
 adapterized

Changed files:
    doxygen-64bit.patch -> 1.2
    doxygen.spec -> 1.110
---
 doxygen-64bit.patch | 11 -----------
 doxygen.spec        | 11 +++++------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 doxygen-64bit.patch

diff --git a/doxygen-64bit.patch b/doxygen-64bit.patch
deleted file mode 100644
index 0639441..0000000
--- a/doxygen-64bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- doxygen-1.5.1/libmd5/md5_loc.h.orig	2003-11-05 21:39:05.000000000 +0100
-+++ doxygen-1.5.1/libmd5/md5_loc.h	2006-12-11 21:05:00.135077500 +0100
-@@ -14,7 +14,7 @@
- typedef unsigned short int UINT2;
- 
- /* UINT4 defines a four byte word */
--typedef unsigned long int UINT4;
-+typedef unsigned int UINT4;
- 
- #ifndef NULL_PTR
- #define NULL_PTR ((POINTER)0)
diff --git a/doxygen.spec b/doxygen.spec
index 99d999e..e31cc6b 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -16,9 +16,7 @@ License:	GPL
 Group:		Development/Tools
 Source0:	ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 # Source0-md5:	70260101ef60952cb99484700241c99e
-Patch1:		%{name}-qt-dirs.patch
-Patch2:		%{name}-lib64.patch
-Patch4:		%{name}-64bit.patch
+Patch0:		%{name}-qt-dirs.patch
 URL:		http://www.doxygen.org/
 %{?with_qt:BuildRequires:	QtGui-devel >= 4.3}
 %{?with_qt:BuildRequires:	QtXml-devel >= 4.3}
@@ -29,8 +27,8 @@ BuildRequires:	ghostscript-fonts-std
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	perl-base
-%{?with_qt:BuildRequires:	qt4-qmake >= 4.3}
 %{?with_qt:BuildRequires:	qt4-build >= 4.3}
+%{?with_qt:BuildRequires:	qt4-qmake >= 4.3}
 BuildRequires:	texlive-latex
 BuildRequires:	texlive-pdftex
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -131,7 +129,7 @@ Wizard gráfico para o Doxygen.
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
 
 rm -rf libpng src/unistd.h addon/doxywizard/Makefile.doxywizard
 
@@ -149,7 +147,8 @@ rm -rf libpng src/unistd.h addon/doxywizard/Makefile.doxywizard
 	LINK="%{__cxx}" \
 	QTDIR="%{_prefix}" \
 	CFLAGS="%{rpmcflags}" \
-	CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -DNODEBUG -fno-rtti -fno-exceptions"
+	CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -DNODEBUG -fno-rtti -fno-exceptions" \
+	LFLAGS="%{rpmldflags}"
 
 %{__make} docs
 #%%{__make} pdf
-- 
2.43.0