rpms/doxygen/F-10 doxygen-1.6.0-config.patch, NONE, 1.1 doxygen-1.6.0-timestamp.patch, NONE, 1.1 doxygen.spec, 1.58, 1.59 sources, 1.29, 1.30 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.1, NONE

Tue Aug 25 14:30:04 UTC 2009

Author: than

Update of /cvs/extras/rpms/doxygen/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24765

Modified Files:
	doxygen.spec sources 
Added Files:
	doxygen-1.6.0-config.patch doxygen-1.6.0-timestamp.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.1


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++

doxygen-1.6.0-timestamp.patch:
 config.xml        |    4 ++++
 configoptions.cpp |    8 ++++++++
 htmlgen.cpp       |    5 ++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

--- NEW FILE doxygen-1.6.0-timestamp.patch ---
diff -up doxygen-1.6.0/src/config.cpp.orig doxygen-1.6.0/src/config.cpp
diff -up doxygen-1.6.0/src/config.l.orig doxygen-1.6.0/src/config.l
diff -up doxygen-1.6.0/src/configoptions.cpp.orig doxygen-1.6.0/src/configoptions.cpp
--- doxygen-1.6.0/src/configoptions.cpp.orig	2009-08-24 12:04:45.000000000 +0200
+++ doxygen-1.6.0/src/configoptions.cpp	2009-08-24 12:06:34.000000000 +0200
@@ -1072,6 +1072,14 @@ void addConfigOptions(Config *cfg)
   cs->setWidgetType(ConfigString::File);
   cs->addDependency("GENERATE_HTML");
   //----
+  cb = cfg->addBool(
+                 "HTML_TIMESTAMP",
+                 "If the HTML_TIMESTAMP tag is set to YES then the generated HTML\n"
+                 "documentation will contain the timesstamp.",
+                 FALSE
+                );
+  cb->addDependency("GENERATE_HTML");
+  //----
   cs = cfg->addString(
                  "HTML_STYLESHEET",
                  "The HTML_STYLESHEET tag can be used to specify a user-defined cascading\n"
diff -up doxygen-1.6.0/src/config.xml.orig doxygen-1.6.0/src/config.xml
--- doxygen-1.6.0/src/config.xml.orig	2009-08-24 11:55:46.000000000 +0200
+++ doxygen-1.6.0/src/config.xml	2009-08-24 12:03:06.000000000 +0200
@@ -751,6 +751,10 @@ The HTML_FOOTER tag can be used to speci
 each generated HTML page. If it is left blank doxygen will generate a 
 standard footer. 
 ' defval='' depends='GENERATE_HTML'/>
+    <option type='bool' id='HTML_TIMESTAMP' docs='
+If the HTML_TIMESTAMP tag is set to YES then the generated HTML
+documentation will contain the timesstamp.
+' defval='' depends='GENERATE_HTML'/>
     <option type='string' id='HTML_STYLESHEET' format='file' docs='
 The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 style sheet that is used by each HTML page. It can be used to 
diff -up doxygen-1.6.0/src/htmlgen.cpp.orig doxygen-1.6.0/src/htmlgen.cpp
--- doxygen-1.6.0/src/htmlgen.cpp.orig	2009-08-24 11:55:20.000000000 +0200
+++ doxygen-1.6.0/src/htmlgen.cpp	2009-08-24 11:53:29.000000000 +0200
@@ -56,6 +56,7 @@ static const char search_script[]=
 
 static QCString g_header;
 static QCString g_footer;
+static bool timestamp=false;
 
 //------------------------- Pictures for the Tabs ------------------------
 
@@ -640,6 +641,8 @@ void HtmlGenerator::init()
   if (!Config_getString("HTML_FOOTER").isEmpty()) 
   {
     g_footer=fileToString(Config_getString("HTML_FOOTER"));
+    if (Config_getBool("HTML_TIMESTAMP"))
+      timestamp=true;
     //printf("g_footer='%s'\n",g_footer.data());
   }
   createSubDirs(d);
@@ -864,7 +867,7 @@ static void writePageFooter(QTextStream 
   {
     t << "<hr size=\"1\"/><address style=\"text-align: right;\"><small>";
     t << theTranslator->trGeneratedAt(
-        dateToString(TRUE),
+        dateToString(timestamp),
         Config_getString("PROJECT_NAME")
         );
     t << " " << endl << "<a href=\"http://www.doxygen.org/index.html\">";


Index: doxygen.spec
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-10/doxygen.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -p -r1.58 -r1.59
--- doxygen.spec	3 Jul 2009 10:59:38 -0000	1.58
+++ doxygen.spec	25 Aug 2009 14:30:04 -0000	1.59
@@ -5,17 +5,16 @@
 
 Summary: A documentation system for C/C++.
 Name: doxygen
-Version: 1.5.9
+Version: 1.6.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
-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
+Patch2: doxygen-1.6.0-timestamp.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 +50,7 @@ are used by doxygen.
 %setup -q
 
 %patch1 -p1 -b .config
-%patch2 -p1 -b .qt4
-%patch3 -p1 -b .system-png
+%patch2 -p1 -b .timestamp
 
 %build
 unset QTDIR
@@ -103,6 +101,22 @@ rm -rf %{buildroot}
 %endif
 
 %changelog
+* Tue Aug 25 2009 Than Ngo <than at redhat.com> - 1.6.1-1
+- 1.6.1
+
+* Mon Aug 24 2009 Than Ngo <than at redhat.com> - 1.6.0-2
+- fix #516339, allow to enable/disable timstamp to avoid the multilib issue
+  HTMP_TIMESTAMP is disable by default
+
+* 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.
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.5.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Fri Jul 03 2009 Than Ngo <than at redhat.com> - 1.5.9-1
 - 1.5.9
 
@@ -319,7 +333,7 @@ rm -rf %{buildroot}
 * Wed Mar 14 2001 Jeff Johnson <jbj at redhat.com>
 - update to 1.2.6
 
-* Wed Feb 28 2001 Trond Eivind Glomsrød <teg at redhat.com>
+* Wed Feb 28 2001 Trond Eivind GlomsrÃ¸d <teg at redhat.com>
 - rebuild
 
 * Tue Dec 26 2000 Than Ngo <than at redhat.com>


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/doxygen/F-10/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- sources	3 Jul 2009 10:59:38 -0000	1.29
+++ sources	25 Aug 2009 14:30:04 -0000	1.30
@@ -1 +1 @@
-33c5598fa6d24cbc55849eaf89652557  doxygen-1.5.9.src.tar.gz
+2ec343643e134f0d3ce2069420bcb4f0  doxygen-1.6.1.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 ---


