From db912594ea9e5f48c59d81ffaf3f475f6dde3763 Mon Sep 17 00:00:00 2001 From: cvsdist Date: Sep 09 2004 04:24:45 +0000 Subject: auto-import changelog data from doxygen-1.3.4-1.src.rpm 1.3.4-1 - update to 1.3.4 - doxsearch was removed Tue Sep 23 2003 Florian La Roche - allow compiling without qt/doxywizard Wed Jun 04 2003 Elliot Lee - rebuilt Tue Jun 03 2003 Jeff Johnson - add explicit epoch's where needed. Tue May 06 2003 Than Ngo 1.3-1 - 1.3 --- diff --git a/.cvsignore b/.cvsignore index 5a0f2f6..dd12a0b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -doxygen-1.2.18.src.tar.bz2 +doxygen-1.3.4.src.tar.gz diff --git a/doxygen.spec b/doxygen.spec index 5b8344a..d344ebc 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,13 +1,14 @@ %define qt_version 3.1.1 +%{!?with_qt:%define with_qt 1} Summary: A documentation system for C/C++. Name: doxygen -Version: 1.2.18 -Release: 3 +Version: 1.3.4 +Release: 1 Epoch: 1 -Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.bz2 +Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz -Patch: doxygen-1.2.7-redhat.patch +Patch0: doxygen-1.2.7-redhat.patch Patch1: doxygen-1.2.12-qt2.patch Patch2: doxygen-1.2.18-libdir.patch @@ -28,38 +29,46 @@ documentation is extracted directly from the sources. Doxygen can also be configured to extract the code structure from undocumented source files. +%if %{with_qt} %package doxywizard Summary: A GUI for creating and editing configuration files. Group: User Interface/X -Requires: %{name} = %{version} +Requires: %{name} = %{epoch}:%{version} BuildPrereq: qt-devel => %{qt_version} %description doxywizard Doxywizard is a GUI for creating and editing configuration files that are used by doxygen. +%endif %prep %setup -q -%patch -p1 -b .redhat +%patch0 -p1 -b .redhat %patch1 -p1 -b .qt2 -%ifarch x86_64 s390x +%if "%{_lib}" != "lib" %patch2 -p1 -b .libdir %endif %build +%if %{with_qt} QTDIR="" && . /etc/profile.d/qt.sh +%endif export OLD_PO_FILE_INPUT=yes ./configure \ --prefix %{_prefix} \ --shared \ --release \ +%if %{with_qt} --with-doxywizard \ +%endif --install %{_bindir}/install make %{?_smp_mflags} all +%if %{with_qt} make docs +%endif %install rm -rf ${RPM_BUILD_ROOT} @@ -72,16 +81,36 @@ rm -rf ${RPM_BUILD_ROOT} %files %defattr(-,root,root) -%doc LANGUAGE.HOWTO README examples html +%doc LANGUAGE.HOWTO README examples +%if %{with_qt} +%doc html +%endif %{_bindir}/doxygen -%{_bindir}/doxysearch %{_bindir}/doxytag +%if %{with_qt} %files doxywizard %defattr(-,root,root) %{_bindir}/doxywizard +%endif %changelog +* Fri Sep 26 2003 Harald Hoyer 1:1.3.4-1 +- update to 1.3.4 +- doxsearch was removed + +* Tue Sep 23 2003 Florian La Roche +- allow compiling without qt/doxywizard + +* Wed Jun 04 2003 Elliot Lee +- rebuilt + +* Tue Jun 3 2003 Jeff Johnson +- add explicit epoch's where needed. + +* Tue May 6 2003 Than Ngo 1.3-1 +- 1.3 + * Wed Jan 22 2003 Tim Powers - rebuilt diff --git a/sources b/sources index 42c9525..c0adfb4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -721545be5ed721f5a79c0f97ec825045 doxygen-1.2.18.src.tar.bz2 +cd81c0f8a8e77dc33cc754f6f8852ca4 doxygen-1.3.4.src.tar.gz