SPECS: doxygen.spec - fix build on gcc4 (doxygen-gcc4.patch) - dro...

adamg adamg at pld-linux.org
Sun Dec 11 22:05:52 CET 2005


Author: adamg                        Date: Sun Dec 11 21:05:52 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- fix build on gcc4 (doxygen-gcc4.patch)
- dropped BR:tetex-plain-misc (obsoleted by tetex-3.0)
- pass CC, CXX

---- Files affected:
SPECS:
   doxygen.spec (1.78 -> 1.79) 

---- Diffs:

================================================================
Index: SPECS/doxygen.spec
diff -u SPECS/doxygen.spec:1.78 SPECS/doxygen.spec:1.79
--- SPECS/doxygen.spec:1.78	Tue Oct  4 23:58:03 2005
+++ SPECS/doxygen.spec	Sun Dec 11 22:05:44 2005
@@ -20,6 +20,7 @@
 Patch0:		%{name}-system-libpng.patch
 Patch1:		%{name}-qt-dirs.patch
 Patch2:		%{name}-lib64.patch
+Patch3:		%{name}-gcc4.patch
 URL:		http://www.doxygen.org/
 BuildRequires:	flex
 BuildRequires:	ghostscript
@@ -28,9 +29,8 @@
 BuildRequires:	libstdc++-devel
 BuildRequires:	python
 %{?with_qt:BuildRequires:	qt-devel >= 2.1.0}
-BuildRequires:	tetex-format-latex
-BuildRequires:	tetex-format-pdflatex
-BuildRequires:	tetex-plain-misc
+BuildRequires:	tetex-format-latex >= 1:3.0-2
+BuildRequires:	tetex-format-pdflatex >= 1.3.0-2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # because of qt
@@ -135,6 +135,7 @@
 %if "%{_lib}" == "lib64"
 %patch2 -p1
 %endif
+%patch3 -p1
 
 rm -rf libpng src/unistd.h
 
@@ -147,7 +148,10 @@
 	--install %{_bindir}/install \
 	%{?with_qt:--with-doxywizard}
 
-%{__make} QTDIR=%{_prefix} \
+%{__make} \
+	CC="%{__cc}" \
+	CXX="%{__cxx}" \
+	QTDIR=%{_prefix} \
 	CFLAGS="%{rpmcflags}" \
 	CXXFLAGS="%{rpmcflags} \
 	-DQT_NO_CODECS -DQT_LITE_UNICODE -fno-rtti -fno-exceptions"
@@ -182,6 +186,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.79  2005/12/11 21:05:44  adamg
+- fix build on gcc4 (doxygen-gcc4.patch)
+- dropped BR:tetex-plain-misc (obsoleted by tetex-3.0)
+- pass CC, CXX
+
 Revision 1.78  2005/10/04 21:58:03  paszczus
 - updated to 1.4.5 ; STBR
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/doxygen.spec?r1=1.78&r2=1.79&f=u




More information about the pld-cvs-commit mailing list