rpms/doxygen/devel doxygen-1.6.0-config.patch, NONE, 1.1 .cvsignore, 1.29, 1.30 doxygen.spec, 1.67, 1.68 sources, 1.30, 1.31 doxygen-1.5.5-system-png.patch, 1.2, NONE doxygen-1.5.8-config.patch, 1.1, NONE doxygen-1.5.8-qt4.patch, 1.2, NONE

Than Ngo than at fedoraproject.org
Fri Aug 21 14:46:13 UTC 2009 

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29764

Modified Files:
	.cvsignore doxygen.spec sources 
Added Files:
	doxygen-1.6.0-config.patch 
Removed Files:
	doxygen-1.5.5-system-png.patch doxygen-1.5.8-config.patch 
	doxygen-1.5.8-qt4.patch 
Log Message:
1.6.0


doxygen-1.6.0-config.patch:
 Makefile.in                    |    2 --
 addon/doxywizard/Makefile.in   |   10 ++++------
 configure                      |    5 ++++-
 tmake/lib/linux-g++/tmake.conf |   14 +++++++-------
 4 files changed, 15 insertions(+), 16 deletions(-)

--- NEW FILE doxygen-1.6.0-config.patch ---
diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/doxywizard/Makefile.in
--- doxygen-1.6.0/addon/doxywizard/Makefile.in.config	2009-07-13 22:09:03.000000000 +0200
+++ doxygen-1.6.0/addon/doxywizard/Makefile.in	2009-08-21 16:42:13.000000000 +0200
@@ -10,8 +10,6 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE=qmake
-
 all: Makefile.doxywizard  
 	$(MAKE) -f Makefile.doxywizard 
 
@@ -29,11 +27,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.6.0/configure.config doxygen-1.6.0/configure
--- doxygen-1.6.0/configure.config	2009-08-20 14:15:07.000000000 +0200
+++ doxygen-1.6.0/configure	2009-08-21 16:41:36.000000000 +0200
@@ -268,9 +268,10 @@ 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/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4}; do
       if test -x "$d/bin/qmake"; then
         QTDIR=$d
+        QMAKE=$d/bin/qmake
       fi
     done
   else
@@ -485,6 +486,8 @@ INSTTOOL  = $f_insttool
 DOXYDOCS  = ..
 DOCDIR    = $f_docdir
 QTDIR     = $QTDIR
+QMAKE     = $QMAKE
+MAN1DIR    = share/man/man1
 EOF
 
 if test "$f_dot" != NO; then
diff -up doxygen-1.6.0/Makefile.in.config doxygen-1.6.0/Makefile.in
--- doxygen-1.6.0/Makefile.in.config	2009-08-14 15:58:42.000000000 +0200
+++ doxygen-1.6.0/Makefile.in	2009-08-21 16:34:02.000000000 +0200
@@ -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 -up doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.6.0/tmake/lib/linux-g++/tmake.conf	2009-08-21 16:34:02.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
@@ -27,12 +27,12 @@ TMAKE_CXXFLAGS_YACC	= $$TMAKE_CFLAGS_YAC
 
 TMAKE_INCDIR		=
 TMAKE_LIBDIR		=
-TMAKE_INCDIR_X11	= /usr/X11R6/include
-TMAKE_LIBDIR_X11	= /usr/X11R6/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_X11	=
+TMAKE_LIBDIR_X11	=
+TMAKE_INCDIR_QT		=
+TMAKE_LIBDIR_QT		=
+TMAKE_INCDIR_OPENGL	=
+TMAKE_LIBDIR_OPENGL	=
 
 TMAKE_LINK		= g++
 TMAKE_LINK_SHLIB	= g++


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- .cvsignore	3 Jul 2009 10:41:35 -0000	1.29
+++ .cvsignore	21 Aug 2009 14:46:13 -0000	1.30
@@ -16,3 +16,4 @@ doxygen-1.5.6.src.tar.gz
 doxygen-1.5.7.1.src.tar.gz
 doxygen-1.5.8.src.tar.gz
 doxygen-1.5.9.src.tar.gz
+doxygen-1.6.0.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- doxygen.spec	10 Aug 2009 08:30:40 -0000	1.67
+++ doxygen.spec	21 Aug 2009 14:46:13 -0000	1.68
@@ -5,17 +5,15 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.9
-Release: 3%{?dist}
+Version: 1.6.0
+Release: 1%{?dist}
 Epoch: 1
+Url: http://www.stack.nl/~dimitri/doxygen/index.html
 Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-Patch1: doxygen-1.5.8-config.patch
-Patch2: doxygen-1.5.8-qt4.patch
-Patch3: doxygen-1.5.5-system-png.patch
+Patch1: doxygen-1.6.0-config.patch
 Group: Development/Tools
 # No version is specified.
 License: GPL+
-Url: http://www.stack.nl/~dimitri/doxygen/index.html
 
 BuildRequires: perl
 BuildRequires: texlive-dvips
@@ -51,8 +49,6 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .system-png
 
 %build
 unset QTDIR
@@ -103,6 +99,9 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Fri Aug 21 2009 Than Ngo <than at redhat.com> - 1.6.0-1
+- 1.6.0
+
 * Mon Aug 10 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.5.9-3
 - Convert specfile to UTF-8.
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -p -r1.30 -r1.31
--- sources	3 Jul 2009 10:41:35 -0000	1.30
+++ sources	21 Aug 2009 14:46:13 -0000	1.31
@@ -1 +1 @@
-33c5598fa6d24cbc55849eaf89652557  doxygen-1.5.9.src.tar.gz
+54b2e1fe0de7071fe135bd0297d903ff  doxygen-1.6.0.src.tar.gz


--- doxygen-1.5.5-system-png.patch DELETED ---


--- doxygen-1.5.8-config.patch DELETED ---


--- doxygen-1.5.8-qt4.patch DELETED ---

More information about the fedora-extras-commits mailing list