dist-git conversion

#2781)

.gitignore

@@ -10,3 +10,5 @@ doxygen-1.4.6.src.tar.gz
 doxygen-1.4.7.src.tar.gz
 doxygen-1.5.2.src.tar.gz
 doxygen-1.5.3.src.tar.gz
+doxygen-1.5.4.src.tar.gz
+doxygen-1.5.6.src.tar.gz

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: doxygen
-# $Id: Makefile,v 1.1 2004/09/09 04:21:20 cvsdist Exp $
-NAME := doxygen
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attempt a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

doxygen-1.4.3-config.patch

@@ -1,31 +0,0 @@
---- doxygen-1.4.3/Makefile.in.redhat	2005-03-28 22:52:12.000000000 +0200
-+++ doxygen-1.4.3/Makefile.in	2005-06-14 14:26:10.000000000 +0200
-@@ -46,7 +46,7 @@
- 
- DATE=$(shell date "+%B %Y")
- 
--MAN1DIR = man/man1
-+MAN1DIR = share/man/man1
- 
- install: doxywizard_install 
- 	$(INSTTOOL) -d $(INSTALL)/bin
---- doxygen-1.4.3/tmake/lib/linux-g++/tmake.conf.redhat	2005-04-20 20:23:26.000000000 +0200
-+++ doxygen-1.4.3/tmake/lib/linux-g++/tmake.conf	2005-06-14 14:19:25.000000000 +0200
-@@ -11,7 +11,7 @@
- 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_OPENGL	= -lqgl
- TMAKE_LIBS_OPENGL	= -lMesaGL -lMesaGLU -lXmu
- 
--TMAKE_MOC		= moc
-+TMAKE_MOC		= $(QTDIR)/bin/moc
- 
- TMAKE_AR		= ar cqs
- TMAKE_RANLIB		=

doxygen-1.5.5-system-png.patch

@@ -0,0 +1,105 @@
+diff -up doxygen-1.5.5/Makefile.in.me doxygen-1.5.5/Makefile.in
+--- doxygen-1.5.5/Makefile.in.me	2008-02-20 14:36:50.000000000 +0100
++++ doxygen-1.5.5/Makefile.in	2008-02-20 14:37:12.000000000 +0100
+@@ -7,7 +7,6 @@ clean: FORCE
+ 	cd doc ; $(MAKE) clean
+ 	cd qtools ; $(MAKE) clean
+ 	cd src ; $(MAKE) clean
+-	cd libpng ; $(MAKE) clean
+ 	cd libmd5 ; $(MAKE) clean
+ 	cd addon/doxywizard ; $(MAKE) clean
+ 	cd addon/doxmlparser/src ; $(MAKE) clean
+@@ -18,7 +17,6 @@ clean: FORCE
+ 
+ distclean: clean
+ 	cd src ; $(MAKE) distclean
+-	cd libpng ; $(MAKE) distclean
+ 	cd libmd5 ; $(MAKE) distclean
+ 	cd addon/doxywizard ; $(MAKE) distclean
+ 	cd addon/doxmlparser/src ; $(MAKE) distclean
+@@ -32,11 +30,10 @@ distclean: clean
+ 	-rm -f objects/*.o
+ 	-rm -f src/Makefile.doxygen src/Makefile.libdoxygen 
+ 	-rm -f src/Makefile.doxytag src/Makefile.libdoxycfg
+-	-rm -f libpng/Makefile.libpng
+ 	-rm -f libmd5/Makefile.libmd5
+ 	-rm -f Makefile qtools/Makefile src/Makefile examples/Makefile doc/Makefile 
+ 	-rm -f .makeconfig .tmakeconfig
+-	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libpng/libpng.pro libmd5/libmd5.pro
++	-rm -f src/doxygen.pro src/libdoxygen.pro src/doxytag.pro qtools/qtools.pro src/libdoxycfg.pro libmd5/libmd5.pro
+ 	-rm -f src/version.cpp
+ 	-rm -r addon/doxywizard/Makefile
+ 	-rm -f addon/doxywizard/Makefile.doxywizard
+@@ -83,7 +80,7 @@ docs: FORCE
+ pdf: docs
+ 	cd latex ; $(MAKE)
+ 
+-DISTFILES =  Doxyfile libpng libmd5 addon tmake doc wintools examples bin lib objects \
++DISTFILES =  Doxyfile libmd5 addon tmake doc wintools examples bin lib objects \
+              qtools src configure configure.bin Makefile.in Makefile.win_nmake.in \
+              Makefile.win_make.in INSTALL make.bat LANGUAGE.HOWTO LICENSE PLATFORMS \
+              VERSION packages winbuild
+diff -up doxygen-1.5.5/configure.me doxygen-1.5.5/configure
+--- doxygen-1.5.5/configure.me	2008-02-20 14:35:56.000000000 +0100
++++ doxygen-1.5.5/configure	2008-02-20 14:36:42.000000000 +0100
+@@ -540,7 +540,7 @@ TMAKE_CXXFLAGS += -DENGLISH_ONLY
+ EOF
+ fi
+ 
+-f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libpng/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
++f_inmakefiles="Makefile.in qtools/Makefile.in src/Makefile.in examples/Makefile.in doc/Makefile.in addon/doxywizard/Makefile.in addon/doxmlparser/src/Makefile.in addon/doxmlparser/test/Makefile.in addon/doxmlparser/examples/metrics/Makefile.in libmd5/Makefile.in addon/doxyapp/Makefile.in"
+ 
+ for i in $f_inmakefiles ; do
+      SRC=$i
+@@ -557,7 +557,6 @@ EOF
+        echo "" >> $DST
+        echo "all: src/version.cpp " >> $DST
+        echo "	\$(MAKE) -C qtools" >> $DST
+-       echo "	\$(MAKE) -C libpng" >> $DST
+        echo "	\$(MAKE) -C libmd5" >> $DST
+        echo "	\$(MAKE) -C src" >> $DST
+        if test $f_wizard = YES; then
+@@ -577,7 +576,7 @@ EOF
+      echo "  Created $DST from $SRC..."
+ done
+ 
+-f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libpng/libpng.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" 
++f_inprofiles="qtools/qtools.pro.in src/libdoxygen.pro.in src/libdoxycfg.pro.in src/doxygen.pro.in src/doxytag.pro.in addon/doxywizard/doxywizard.pro.in addon/doxmlparser/src/doxmlparser.pro.in addon/doxmlparser/test/xmlparse.pro.in addon/doxmlparser/examples/metrics/metrics.pro.in libmd5/libmd5.pro.in addon/doxyapp/doxyapp.pro.in" 
+ 
+ for i in $f_inprofiles ; do
+      SRC=$i
+diff -up doxygen-1.5.5/src/pngenc.cpp.me doxygen-1.5.5/src/pngenc.cpp
+--- doxygen-1.5.5/src/pngenc.cpp.me	2008-02-20 14:38:46.000000000 +0100
++++ doxygen-1.5.5/src/pngenc.cpp	2008-02-20 14:39:11.000000000 +0100
+@@ -25,7 +25,7 @@
+ #endif
+ 
+ #define ALL_STATIC
+-#include <../libpng/png.h>
++#include <png.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff -up doxygen-1.5.5/src/libdoxygen.pro.in.me doxygen-1.5.5/src/libdoxygen.pro.in
+--- doxygen-1.5.5/src/libdoxygen.pro.in.me	2008-02-20 14:38:08.000000000 +0100
++++ doxygen-1.5.5/src/libdoxygen.pro.in	2008-02-20 14:38:29.000000000 +0100
+@@ -224,7 +224,6 @@ win32-msvc:TMAKE_CXXFLAGS  += -Zm200
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+ linux-g++:TMAKE_CXXFLAGS    += -fno-exceptions -fno-rtti
+ INCLUDEPATH                += ../qtools
+-INCLUDEPATH                += ../libpng
+ INCLUDEPATH                += ../libmd5
+ win32:INCLUDEPATH          += .
+ win32-g++:INCLUDEPATH      = ../qtools /usr/include/libpng12 ../libmd5
+diff -up doxygen-1.5.5/src/doxygen.pro.in.me doxygen-1.5.5/src/doxygen.pro.in
+--- doxygen-1.5.5/src/doxygen.pro.in.me	2008-02-20 14:37:34.000000000 +0100
++++ doxygen-1.5.5/src/doxygen.pro.in	2008-02-20 14:37:54.000000000 +0100
+@@ -28,7 +28,7 @@ win32-borland:TMAKE_LFLAGS += -L..\lib -
+ win32:TMAKE_CXXFLAGS       += -DQT_NODLL
+ win32-g++:LIBS             = -L../lib -ldoxygen -ldoxycfg -lqtools -lpng -lmd5 -liconv
+ win32-g++:TMAKE_CXXFLAGS   += -fno-exceptions -fno-rtti
+-INCLUDEPATH                += ../qtools ../libpng ../libmd5 .
++INCLUDEPATH                += ../qtools ../libmd5 .
+ #win32-g++:INCLUDEPATH      -= ../libpng
+ DESTDIR                    =  ../bin
+ TARGET                     =  doxygen

doxygen-1.5.6-config.patch

@@ -0,0 +1,45 @@
+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		=

doxygen.spec

@@ -3,14 +3,15 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.3
+Version: 1.5.6
 Release: 1%{?dist}
 Epoch: 1
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 
-Patch0: doxygen-1.4.3-config.patch
+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
 
 Group: Development/Tools
 License: GPL
@@ -23,6 +24,7 @@ BuildRequires: ghostscript
 BuildRequires: gettext
 BuildRequires: flex
 BuildRequires: bison
+BuildRequires: libpng-devel
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -47,13 +49,14 @@ are used by doxygen.
 
 %prep
 %setup -q
-%patch0 -p1 -b .redhat
+%patch0 -p1 -b .config
 
 %if "%{_lib}" != "lib"
 %patch3 -p1 -b .libdir
 %else
 %patch2 -p1 -b .libdir
 %endif
+%patch4 -p1 -b .system-png
 
 %build
 %if %{with_qt}
@@ -101,6 +104,19 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri May 23 2008 Than Ngo <than@redhat.com> 1.5.6-1
+- 1.5.6
+
+* Mon Mar 17 2008 Than Ngo <than@redhat.com> 1.5.5-2
+- apply patch to not break partial include paths, thanks to Tim Niemueller
+
+* Fri Feb 22 2008 Than Ngo <than@redhat.com> 1.5.5-1
+- 1.5.5
+- use system libpng/zlib
+
+* Tue Jan 08 2008 Than Ngo <than@redhat.com> 1.5.4-1
+- 1.5.4
+
 * Fri Aug 10 2007 Than Ngo <than@redhat.com> - 1:1.5.3-1
 - 1.5.3
 

sources

@@ -1 +1 @@
-5fd6f0c2c7946005703b47dc6b663757  doxygen-1.5.3.src.tar.gz
+779974eedf011ed52e1fe21fc2d5079c  doxygen-1.5.6.src.tar.gz