packages: doxygen/doxygen.spec, doxygen/doxygen-64bit.patch (REMOVED) - use...

[draenog]

Author: draenog                      Date: Tue Feb  9 19:24:20 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use PLD ldflags
- remove 64bit.patch (was not used)
- adapterized

---- Files affected:
packages/doxygen:
   doxygen.spec (1.109 -> 1.110) , doxygen-64bit.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/doxygen/doxygen.spec
diff -u packages/doxygen/doxygen.spec:1.109 packages/doxygen/doxygen.spec:1.110
--- packages/doxygen/doxygen.spec:1.109	Tue Feb  9 04:22:05 2010
+++ packages/doxygen/doxygen.spec	Tue Feb  9 20:24:15 2010
@@ -17,9 +17,7 @@
 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}
@@ -30,8 +28,8 @@
 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)
@@ -132,7 +130,7 @@
 
 %prep
 %setup -q
-%patch1 -p1
+%patch0 -p1
 
 rm -rf libpng src/unistd.h addon/doxywizard/Makefile.doxywizard
 
@@ -150,7 +148,8 @@
 	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
@@ -183,6 +182,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2010/02/09 19:24:15  draenog
+- use PLD ldflags
+- remove 64bit.patch (was not used)
+- adapterized
+
 Revision 1.109  2010/02/09 03:22:05  draenog
 - check if it compiles without lib64.patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/doxygen/doxygen.spec?r1=1.109&r2=1.110&f=u