diff --git a/.cvsignore b/.cvsignore index 8f3ee8a..3959771 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,3 +14,4 @@ doxygen-1.5.4.src.tar.gz doxygen-1.5.5.src.tar.gz doxygen-1.5.6.src.tar.gz doxygen-1.5.7.1.src.tar.gz +doxygen-1.5.8.src.tar.gz diff --git a/doxygen-1.2.18-libdir.patch b/doxygen-1.2.18-libdir.patch deleted file mode 100644 index ff1f21b..0000000 --- a/doxygen-1.2.18-libdir.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf.libdir 2005-11-18 22:12:21.000000000 -0500 -+++ doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf 2005-11-18 22:12:46.000000000 -0500 -@@ -27,12 +27,12 @@ - - TMAKE_INCDIR = - TMAKE_LIBDIR = --TMAKE_INCDIR_X11 = /usr/X11R6/include --TMAKE_LIBDIR_X11 = /usr/X11R6/lib -+TMAKE_INCDIR_X11 = /usr/include -+TMAKE_LIBDIR_X11 = /usr/lib - TMAKE_INCDIR_QT = $(QTDIR)/include - TMAKE_LIBDIR_QT = $(QTDIR)/lib --TMAKE_INCDIR_OPENGL = /usr/X11R6/include --TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_INCDIR_OPENGL = /usr/include -+TMAKE_LIBDIR_OPENGL = /usr/lib - - TMAKE_LINK = g++ - TMAKE_LINK_SHLIB = g++ diff --git a/doxygen-1.2.18-libdir64.patch b/doxygen-1.2.18-libdir64.patch deleted file mode 100644 index da049ea..0000000 --- a/doxygen-1.2.18-libdir64.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf.libdir 2005-11-18 22:12:21.000000000 -0500 -+++ doxygen-1.4.5/tmake/lib/linux-g++/tmake.conf 2005-11-18 22:12:46.000000000 -0500 -@@ -27,12 +27,12 @@ - - TMAKE_INCDIR = - TMAKE_LIBDIR = --TMAKE_INCDIR_X11 = /usr/X11R6/include --TMAKE_LIBDIR_X11 = /usr/X11R6/lib -+TMAKE_INCDIR_X11 = /usr/include -+TMAKE_LIBDIR_X11 = /usr/lib64 - TMAKE_INCDIR_QT = $(QTDIR)/include - TMAKE_LIBDIR_QT = $(QTDIR)/lib --TMAKE_INCDIR_OPENGL = /usr/X11R6/include --TMAKE_LIBDIR_OPENGL = /usr/X11R6/lib -+TMAKE_INCDIR_OPENGL = /usr/include -+TMAKE_LIBDIR_OPENGL = /usr/lib64 - - TMAKE_LINK = g++ - TMAKE_LINK_SHLIB = g++ diff --git a/doxygen-1.5.6-config.patch b/doxygen-1.5.6-config.patch deleted file mode 100644 index f66c57b..0000000 --- a/doxygen-1.5.6-config.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff -up doxygen-1.5.6/addon/doxywizard/Makefile.in.redhat doxygen-1.5.6/addon/doxywizard/Makefile.in ---- doxygen-1.5.6/addon/doxywizard/Makefile.in.redhat 2008-05-19 11:28:20.000000000 +0200 -+++ doxygen-1.5.6/addon/doxywizard/Makefile.in 2008-05-19 11:28:42.000000000 +0200 -@@ -41,7 +41,7 @@ clean: Makefile.doxywizard - distclean: clean - $(RM) Makefile.doxywizard version.cpp config.l config.h portable.h portable.cpp - --MAN1DIR = man/man1 -+MAN1DIR = share/man/man1 - - install: - $(INSTTOOL) -d $(INSTALL)/bin -diff -up doxygen-1.5.6/Makefile.in.redhat doxygen-1.5.6/Makefile.in ---- doxygen-1.5.6/Makefile.in.redhat 2008-04-20 09:59:24.000000000 +0200 -+++ doxygen-1.5.6/Makefile.in 2008-05-19 11:18:09.000000000 +0200 -@@ -50,7 +47,7 @@ distclean: clean - - DATE=$(shell date "+%B %Y") - --MAN1DIR = man/man1 -+MAN1DIR = share/man/man1 - - install: doxywizard_install - $(INSTTOOL) -d $(INSTALL)/bin -diff -up doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf.redhat doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf.redhat 2006-07-21 21:54:13.000000000 +0200 -+++ doxygen-1.5.6/tmake/lib/linux-g++/tmake.conf 2008-05-19 11:18:09.000000000 +0200 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe - TMAKE_CFLAGS_WARN_ON = -Wall -W -fno-exceptions - TMAKE_CFLAGS_WARN_OFF = --TMAKE_CFLAGS_RELEASE = -O2 -+TMAKE_CFLAGS_RELEASE = $(RPM_OPT_FLAGS) - TMAKE_CFLAGS_DEBUG = -g - TMAKE_CFLAGS_SHLIB = -fPIC - TMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses -@@ -50,7 +50,7 @@ TMAKE_LIBS_QT_MT = -lqt-mt - TMAKE_LIBS_QT_OPENGL = -lqgl - TMAKE_LIBS_OPENGL = -lMesaGL -lMesaGLU -lXmu - --TMAKE_MOC = moc -+TMAKE_MOC = $(QTDIR)/bin/moc - - TMAKE_AR = ar cqs - TMAKE_RANLIB = diff --git a/doxygen-1.5.8-qt4.patch b/doxygen-1.5.8-qt4.patch new file mode 100644 index 0000000..1fba764 --- /dev/null +++ b/doxygen-1.5.8-qt4.patch @@ -0,0 +1,51 @@ +diff -up doxygen-1.5.8/configure.qt4 doxygen-1.5.8/configure +--- doxygen-1.5.8/configure.qt4 2008-12-26 20:22:39.000000000 +0100 ++++ doxygen-1.5.8/configure 2009-02-06 11:00:44.000000000 +0100 +@@ -268,7 +268,7 @@ if test "$f_wizard" = YES; then + if test -z "$QTDIR"; then + echo " QTDIR environment variable not set!" + echo -n " Checking for Qt..." +- for d in /usr/{lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do ++ for d in /usr/{lib,lib64,share,qt}/{qt-4,qt4,qt,qt*,4}; do + if test -x "$d/bin/qmake"; then + QTDIR=$d + fi +@@ -485,6 +485,7 @@ INSTTOOL = $f_insttool + DOXYDOCS = .. + DOCDIR = $f_docdir + QTDIR = $QTDIR ++MAN1DIR = share/man/man1 + EOF + + if test "$f_dot" != NO; then +diff -up doxygen-1.5.8/addon/doxywizard/Makefile.in.orig doxygen-1.5.8/addon/doxywizard/Makefile.in +--- doxygen-1.5.8/addon/doxywizard/Makefile.in.orig 2009-02-06 14:55:30.000000000 +0100 ++++ doxygen-1.5.8/addon/doxywizard/Makefile.in 2009-02-06 14:56:08.000000000 +0100 +@@ -29,11 +29,11 @@ distclean: Makefile.doxywizard + $(RM) Makefile.doxywizard + + install: +- $(INSTTOOL) -d $(INSTALL)/bin +- $(INSTTOOL) -m 755 ../../bin/doxywizard $(INSTALL)/bin +- $(INSTTOOL) -d $(INSTALL)/$(MAN1DIR) ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -m 755 ../../bin/doxywizard $(DESTDIR)$(INSTALL)/bin ++ $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/$(MAN1DIR) + cat ../../doc/doxywizard.1 | sed -e "s/DATE/$(DATE)/g" -e "s/VERSION/$(VERSION)/g" > doxywizard.1 +- $(INSTTOOL) -m 644 doxywizard.1 $(INSTALL)/$(MAN1DIR)/doxywizard.1 ++ $(INSTTOOL) -m 644 doxywizard.1 $(DESTDIR)$(INSTALL)/$(MAN1DIR)/doxywizard.1 + rm doxywizard.1 + + FORCE: +diff -up doxygen-1.5.8/Makefile.in.orig doxygen-1.5.8/Makefile.in +--- doxygen-1.5.8/Makefile.in.orig 2009-02-06 15:00:41.000000000 +0100 ++++ doxygen-1.5.8/Makefile.in 2009-02-06 15:00:54.000000000 +0100 +@@ -44,8 +44,6 @@ distclean: clean + + DATE=$(shell date "+%B %Y") + +-MAN1DIR = man/man1 +- + install: doxywizard_install + $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin + $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin diff --git a/doxygen.spec b/doxygen.spec index dce8724..aa58022 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,20 +1,16 @@ %define _default_patch_fuzz 2 -%define qt_version 3.3.8 +%define qt_version 4.4 %{!?with_qt:%define with_qt 1} Summary: A documentation system for C/C++. Name: doxygen -Version: 1.5.7.1 +Version: 1.5.8 Release: 1%{?dist} Epoch: 1 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz - -Patch0: doxygen-1.5.6-config.patch -Patch2: doxygen-1.2.18-libdir.patch -Patch3: doxygen-1.2.18-libdir64.patch -Patch4: doxygen-1.5.5-system-png.patch - +Patch1: doxygen-1.5.5-system-png.patch +Patch2: doxygen-1.5.8-qt4.patch Group: Development/Tools # No version is specified. License: GPL+ @@ -43,7 +39,7 @@ source files. Summary: A GUI for creating and editing configuration files. Group: User Interface/X Requires: %{name} = %{epoch}:%{version} -BuildRequires: qt3-devel => %{qt_version} +BuildRequires: qt-devel => %{qt_version} %description doxywizard Doxywizard is a GUI for creating and editing configuration files that @@ -52,28 +48,18 @@ are used by doxygen. %prep %setup -q -%patch0 -p1 -b .config - -%if "%{_lib}" != "lib" -%patch3 -p1 -b .libdir -%else -%patch2 -p1 -b .libdir -%endif -%patch4 -p1 -b .system-png +%patch1 -p1 -b .system-png +%patch2 -p1 -b .qt4 %build -%if %{with_qt} -QTDIR="" && . /etc/profile.d/qt.sh -%endif - +unset QTDIR ./configure \ --prefix %{_prefix} \ --shared \ - --release \ %if %{with_qt} --with-doxywizard \ %endif - --install %{_bindir}/install + --release make %{?_smp_mflags} all make docs @@ -81,7 +67,7 @@ make docs %install rm -rf %{buildroot} -make install INSTALL=%{buildroot}%{_prefix} +make install DESTDIR=%{buildroot} %if !%{with_qt} rm -rf %{buildroot}%{_mandir}/man1/doxywizard* @@ -107,6 +93,9 @@ rm -rf %{buildroot} %endif %changelog +* Thu Feb 05 2009 Than Ngo 1.5.8-1 +- 1.5.8 + * Mon Oct 06 2008 Than Ngo 1.5.7.1-1 - 1.5.7.1 diff --git a/sources b/sources index 6f30c42..991ab6f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc35dfd52bdae0247b862e67e0cbe7d7 doxygen-1.5.7.1.src.tar.gz +7438b7ff875d522f02860eea39261953 doxygen-1.5.8.src.tar.gz