diff --git a/.gitignore b/.gitignore index f86b882..14a662d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ doxygen-1.7.1.src.tar.gz /doxygen-1.8.3.1.src.tar.gz /doxygen-1.8.4.src.tar.gz /doxygen-1.8.5.src.tar.gz +/doxygen-1.8.6.src.tar.gz diff --git a/doxygen-1.8.5-config.patch b/doxygen-1.8.5-config.patch deleted file mode 100644 index 8c4c7ba..0000000 --- a/doxygen-1.8.5-config.patch +++ /dev/null @@ -1,79 +0,0 @@ -diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/doxywizard/Makefile.in ---- doxygen-1.8.4/addon/doxywizard/Makefile.in.config 2013-01-05 16:35:52.000000000 +0100 -+++ doxygen-1.8.4/addon/doxywizard/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -10,8 +10,6 @@ - # See the GNU General Public License for more details. - # - --QMAKE=qmake $(MKSPECS) -- - all: Makefile.doxywizard - $(MAKE) -f Makefile.doxywizard - -diff -up doxygen-1.8.4/configure.config doxygen-1.8.4/configure ---- doxygen-1.8.4/configure.config 2013-05-19 12:05:39.000000000 +0200 -+++ doxygen-1.8.4/configure 2013-05-21 12:25:43.570743493 +0200 -@@ -296,9 +296,10 @@ if test "$f_wizard" = YES; then - if test -z "$QTDIR"; then - echo " QTDIR environment variable not set!" - printf " 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 -@@ -606,6 +607,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.8.4/Makefile.in.config doxygen-1.8.4/Makefile.in ---- doxygen-1.8.4/Makefile.in.config 2013-04-25 21:38:39.000000000 +0200 -+++ doxygen-1.8.4/Makefile.in 2013-05-21 12:22:49.689166894 +0200 -@@ -53,8 +53,6 @@ distclean: clean - - DATE=$(shell date "+%B %Y") - --MAN1DIR = man/man1 -- - install: doxywizard_install doxysearch_install - $(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin - $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin -diff -up doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf ---- doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100 -+++ doxygen-1.8.4/tmake/lib/linux-g++/tmake.conf 2013-05-21 12:22:49.689166894 +0200 -@@ -11,7 +11,7 @@ TMAKE_CC = gcc - TMAKE_CFLAGS = -pipe - TMAKE_CFLAGS_WARN_ON = -Wall -W - 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++ diff --git a/doxygen-1.8.6-config.patch b/doxygen-1.8.6-config.patch new file mode 100644 index 0000000..c0b2055 --- /dev/null +++ b/doxygen-1.8.6-config.patch @@ -0,0 +1,78 @@ +diff -up doxygen-1.8.6/addon/doxywizard/Makefile.in.config doxygen-1.8.6/addon/doxywizard/Makefile.in +--- doxygen-1.8.6/addon/doxywizard/Makefile.in.config 2013-12-26 12:17:57.281368574 -0700 ++++ doxygen-1.8.6/addon/doxywizard/Makefile.in 2013-12-26 12:20:44.673513404 -0700 +@@ -10,7 +10,6 @@ + # See the GNU General Public License for more details. + # + +-QMAKE=$(QTDIR)/bin/qmake $(MKSPECS) + INCBUFSIZE=$(PYTHON) ../../src/increasebuffer.py + + all: Makefile.doxywizard +diff -up doxygen-1.8.6/configure.config doxygen-1.8.6/configure +--- doxygen-1.8.6/configure.config 2013-12-24 09:14:46.000000000 -0700 ++++ doxygen-1.8.6/configure 2013-12-26 12:20:20.542636493 -0700 +@@ -326,9 +326,10 @@ if test "$f_wizard" = YES; then + if test -z "$QTDIR"; then + echo " QTDIR environment variable not set!" + printf " 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 + break 2 + fi + done +@@ -704,6 +705,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.8.6/Makefile.in.config doxygen-1.8.6/Makefile.in +--- doxygen-1.8.6/Makefile.in.config 2013-12-26 12:17:57.283368564 -0700 ++++ doxygen-1.8.6/Makefile.in 2013-12-26 12:19:17.796956667 -0700 +@@ -78,8 +78,6 @@ realclean: clean + + DATE=$(shell date "+%B %Y") + +-MAN1DIR = man/man1 +- + install: doxywizard_install doxysearch_install + $(INSTTOOL) -d $(DESTDIR)$(INSTALL)/bin + $(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)$(INSTALL)/bin +diff -up doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf +--- doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf.config 2013-11-02 08:18:53.000000000 -0600 ++++ doxygen-1.8.6/tmake/lib/linux-g++/tmake.conf 2013-12-26 12:18:38.268158455 -0700 +@@ -11,7 +11,7 @@ TMAKE_CC = gcc + TMAKE_CFLAGS = -pipe -fsigned-char + TMAKE_CFLAGS_WARN_ON = -Wall -W + 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++ diff --git a/doxygen.spec b/doxygen.spec index 3aa9bf5..95cc1b0 100644 --- a/doxygen.spec +++ b/doxygen.spec @@ -1,8 +1,8 @@ Summary: A documentation system for C/C++ Name: doxygen Epoch: 1 -Version: 1.8.5 -Release: 2%{?dist} +Version: 1.8.6 +Release: 1%{?dist} # No version is specified. License: GPL+ @@ -12,7 +12,7 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz Source1: doxywizard.png Source2: doxywizard.desktop -Patch1: doxygen-1.8.5-config.patch +Patch1: doxygen-1.8.6-config.patch Patch2: doxygen-1.8.5-html_timestamp_default_false.patch Patch3: doxygen-1.8.3-multilib.patch @@ -120,6 +120,9 @@ desktop-file-install \ %changelog +* Thu Dec 26 2013 Orion Poplawski - 1:1.8.6-1 +- 1.8.6 + * Tue Oct 08 2013 Than Ngo - 1:1.8.5-2 - add exlive-epstopdf-bin in requirement diff --git a/sources b/sources index a22241c..c899205 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 1a84da877450422c5fc49e525c546cd4 doxywizard.png -db51274568755e2c75c2657e30a78a55 doxygen-1.8.5.src.tar.gz +9385dc52f0627875f8fa758e754ec674 doxygen-1.8.6.src.tar.gz