rpms/doxygen/F-8 doxygen-1.5.6-config.patch, NONE, 1.1 .cvsignore, 1.24, 1.25 doxygen.spec, 1.49, 1.50 sources, 1.26, 1.27 doxygen-1.4.3-config.patch, 1.1, NONE doxygen-1.5.5-brokenpaths.patch, 1.1, NONE

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/doxygen/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1218

Modified Files:
	.cvsignore doxygen.spec sources 
Added Files:
	doxygen-1.5.6-config.patch 
Removed Files:
	doxygen-1.4.3-config.patch doxygen-1.5.5-brokenpaths.patch 
Log Message:
1.5.6


doxygen-1.5.6-config.patch:

--- NEW FILE doxygen-1.5.6-config.patch ---
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		=


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-8/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore	8 Jan 2008 14:25:55 -0000	1.24
+++ .cvsignore	23 May 2008 08:58:35 -0000	1.25
@@ -11,3 +11,4 @@
 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


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-8/doxygen.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- doxygen.spec	17 Mar 2008 13:14:59 -0000	1.49
+++ doxygen.spec	23 May 2008 08:58:35 -0000	1.50
@@ -3,19 +3,16 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.5
-Release: 2%{?dist}
+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
 
-# upstream patches
-Patch100: doxygen-1.5.5-brokenpaths.patch
-
 Group: Development/Tools
 License: GPL
 Url: http://www.stack.nl/~dimitri/doxygen/index.html
@@ -52,7 +49,7 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .redhat
+%patch0 -p1 -b .config
 
 %if "%{_lib}" != "lib"
 %patch3 -p1 -b .libdir
@@ -61,9 +58,6 @@
 %endif
 %patch4 -p1 -b .system-png
 
-# upstream patches
-%patch100 -p1 -b .brokenpaths
-
 %build
 %if %{with_qt}
 QTDIR="" && . /etc/profile.d/qt.sh
@@ -110,6 +104,9 @@
 %endif
 
 %changelog
+* Fri May 23 2008 Than Ngo <than at redhat.com> 1.5.6-1
+- 1.5.6
+
 * Mon Mar 17 2008 Than Ngo <than at redhat.com> 1.5.5-2
 - apply patch to not break partial include paths, thanks to Tim Niemueller
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-8/sources,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- sources	22 Feb 2008 15:59:55 -0000	1.26
+++ sources	23 May 2008 08:58:35 -0000	1.27
@@ -1 +1 @@
-95813ecd95b371d13d63844ddb9b5c46  doxygen-1.5.5.src.tar.gz
+779974eedf011ed52e1fe21fc2d5079c  doxygen-1.5.6.src.tar.gz


--- doxygen-1.4.3-config.patch DELETED ---


--- doxygen-1.5.5-brokenpaths.patch DELETED ---