X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=doxygen.spec;h=e31cc6b58932606f205dc52609389b083222d0b7;hb=9e8b7d3850f352ec1345a2425a9f00827d94dfe2;hp=9a4122c8943da5030178215aca68209af79545b1;hpb=09e46ca261ae58e51a4dc3cb029c6cb0daa82c1b;p=packages%2Fdoxygen.git

diff --git a/doxygen.spec b/doxygen.spec
index 9a4122c..e31cc6b 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -9,28 +9,28 @@ Summary(pt_BR.UTF-8):	Um sistema de documentação para C/C++
 Summary(ru.UTF-8):	Система документирования для C та C++
 Summary(uk.UTF-8):	Система документування для C та C++
 Name:		doxygen
-Version:	1.5.1
-Release:	5
+Version:	1.6.2
+Release:	0.001
 Epoch:		1
 License:	GPL
 Group:		Development/Tools
 Source0:	ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-# Source0-md5:	43b8e58e5ca70cb8f1285c35a171014e
-Patch0:		%{name}-system-libpng.patch
-Patch1:		%{name}-qt-dirs.patch
-Patch2:		%{name}-lib64.patch
-Patch3:		%{name}-qt-thread.patch
-Patch4:		%{name}-64bit.patch
+# Source0-md5:	70260101ef60952cb99484700241c99e
+Patch0:		%{name}-qt-dirs.patch
 URL:		http://www.doxygen.org/
+%{?with_qt:BuildRequires:	QtGui-devel >= 4.3}
+%{?with_qt:BuildRequires:	QtXml-devel >= 4.3}
+BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	ghostscript
 BuildRequires:	ghostscript-fonts-std
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
-BuildRequires:	python
-%{?with_qt:BuildRequires:	qt-devel >= 2.1.0}
-BuildRequires:	tetex-format-latex >= 1:3.0-2
-BuildRequires:	tetex-format-pdflatex >= 1:3.0-2
+BuildRequires:	perl-base
+%{?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)
 
 # because of qt
@@ -111,7 +111,6 @@ Summary(pl.UTF-8):	GUI do tworzenia i edycji plików konfiguracyjnych
 Summary(pt_BR.UTF-8):	Wizard gráfico para o Doxygen
 Group:		X11/Applications
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	qt >= 2.1.0
 
 %description doxywizard
 Doxywizard is a GUI front-end for creating and editing configuration
@@ -131,16 +130,10 @@ Wizard gráfico para o Doxygen.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%if "%{_lib}" == "lib64"
-%patch2 -p1
-%endif
-%patch3 -p1
 
-rm -rf libpng src/unistd.h
+rm -rf libpng src/unistd.h addon/doxywizard/Makefile.doxywizard
 
 %build
-export QTDIR=%{_prefix}
 # don't change it to %%configure, not autoconf-generated!
 ./configure \
 	--prefix %{_prefix} \
@@ -151,18 +144,18 @@ export QTDIR=%{_prefix}
 %{__make} \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
+	LINK="%{__cxx}" \
 	QTDIR="%{_prefix}" \
 	CFLAGS="%{rpmcflags}" \
-	CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -fno-rtti -fno-exceptions"
+	CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -DNODEBUG -fno-rtti -fno-exceptions" \
+	LFLAGS="%{rpmldflags}"
 
 %{__make} docs
 #%%{__make} pdf
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_bindir}
-
-install bin/doxy* $RPM_BUILD_ROOT%{_bindir}
+%{__make} install DESTDIR=$RPM_BUILD_ROOT
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -172,9 +165,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc html examples README
 %attr(755,root,root) %{_bindir}/doxygen
 %attr(755,root,root) %{_bindir}/doxytag
+%{_mandir}/man1/doxygen.1*
+%{_mandir}/man1/doxytag.1*
 
 %if %{with qt}
 %files doxywizard
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/doxywizard
+%{_mandir}/man1/doxywizard.1*
 %endif