rpms/doxygen/devel doxygen-1.7.1-config.patch, NONE, 1.1 .cvsignore, 1.33, 1.34 doxygen.spec, 1.75, 1.76 sources, 1.34, 1.35 doxygen-1.6.0-config.patch, 1.1, NONE doxywizard-missing-config.patch, 1.1, NONE

Mon Jul 19 11:35:06 UTC 2010

Author: than

Update of /cvs/extras/rpms/doxygen/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18992

Modified Files:
	.cvsignore doxygen.spec sources 
Added Files:
	doxygen-1.7.1-config.patch 
Removed Files:
	doxygen-1.6.0-config.patch doxywizard-missing-config.patch 
Log Message:
1.7.1


doxygen-1.7.1-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.7.1-config.patch ---
diff -up doxygen-1.7.1/addon/doxywizard/Makefile.in.config doxygen-1.7.1/addon/doxywizard/Makefile.in
--- doxygen-1.7.1/addon/doxywizard/Makefile.in.config	2010-05-23 16:51:31.000000000 +0200
+++ doxygen-1.7.1/addon/doxywizard/Makefile.in	2010-07-19 13:38:33.000000000 +0200
@@ -10,8 +10,6 @@
 # See the GNU General Public License for more details.
 # 
 
-QMAKE=qmake $(MKSPECS)
-
 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.7.1/configure.config doxygen-1.7.1/configure
--- doxygen-1.7.1/configure.config	2010-06-25 11:46:38.000000000 +0200
+++ doxygen-1.7.1/configure	2010-07-19 12:03:53.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} /usr; do
+    for d in /usr/{lib64,lib,share,qt}/{qt-4,qt4,qt,qt*,4} /usr; 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.7.1/Makefile.in.config doxygen-1.7.1/Makefile.in
--- doxygen-1.7.1/Makefile.in.config	2009-08-20 21:41:13.000000000 +0200
+++ doxygen-1.7.1/Makefile.in	2010-07-19 12:03:53.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.7.1/tmake/lib/linux-g++/tmake.conf.config doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf.config	2008-12-06 14:16:20.000000000 +0100
+++ doxygen-1.7.1/tmake/lib/linux-g++/tmake.conf	2010-07-19 12:03:53.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.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- .cvsignore	12 Feb 2010 13:52:52 -0000	1.33
+++ .cvsignore	19 Jul 2010 11:35:05 -0000	1.34
@@ -20,3 +20,4 @@ doxygen-1.6.0.src.tar.gz
 doxygen-1.6.1.src.tar.gz
 doxygen-1.6.2.src.tar.gz
 doxygen-1.6.2-20100208.tar.gz
+doxygen-1.7.1.src.tar.gz


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/doxygen.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- doxygen.spec	12 Feb 2010 13:52:52 -0000	1.75
+++ doxygen.spec	19 Jul 2010 11:35:05 -0000	1.76
@@ -1,16 +1,12 @@
 Summary: A documentation system for C/C++
 Name: doxygen
-Version: 1.6.2
-Release: 1.svn20100208%{?dist}
+Version: 1.7.1
+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
-# The source was created for a subversion checkout:
-# svn co http://doxygen.svn.sourceforge.net/svnroot/doxygen/tags/Release_1_6_2_20100208 doxygen-1.6.2-20100208
-Source0: %{name}-%{version}-20100208.tar.gz
-Patch1: doxygen-1.6.0-config.patch
+Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
+Patch1: doxygen-1.7.1-config.patch
 Patch2: doxygen-1.6.2-timestamp.patch
-Patch3: doxywizard-missing-config.patch
 
 Group: Development/Tools
 # No version is specified.
@@ -45,11 +41,10 @@ Doxywizard is a GUI for creating and edi
 are used by doxygen.
 
 %prep
-%setup -q -n %{name}-%{version}-20100208
+%setup -q
 
 %patch1 -p1 -b .config
 %patch2 -p1 -b .timestamp
-%patch3 -p1 -b .wizconfig
 
 %build
 unset QTDIR
@@ -102,6 +97,9 @@ rm -rf %{buildroot}
 %{_mandir}/man1/doxywizard*
 
 %changelog
+* Mon Jul 19 2010 Than Ngo <than at redhat.com> - 1.7.1-1
+- 1.7.1
+
 * Fri Feb 12 2010 Than Ngo <than at redhat.com> - 1.6.2-1.svn20100208
 - fix #555526, snapshot 1.6.2-20100208
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -p -r1.34 -r1.35
--- sources	12 Feb 2010 13:52:52 -0000	1.34
+++ sources	19 Jul 2010 11:35:06 -0000	1.35
@@ -1 +1 @@
-cb9389e05f86f60e7c6acba63da0a9a8  doxygen-1.6.2-20100208.tar.gz
+13e76e10fb55581a16ee04de35c264f0  doxygen-1.7.1.src.tar.gz


--- doxygen-1.6.0-config.patch DELETED ---


--- doxywizard-missing-config.patch DELETED ---

