[doxygen/f20] 1.8.5

Wed Aug 28 12:11:26 UTC 2013

commit cc48c150787a5823bb85662d2c07a9de87714a4b
Author: Than Ngo <than at redhat.com>
Date:   Wed Aug 28 14:09:18 2013 +0200

    1.8.5

 doxygen-1.8.4-config.patch |   16 ---------
 doxygen-1.8.5-config.patch |   79 ++++++++++++++++++++++++++++++++++++++++++++
 doxygen.spec               |    6 ++-
 3 files changed, 83 insertions(+), 18 deletions(-)
---

diff --git a/doxygen-1.8.4-config.patch b/doxygen-1.8.4-config.patch
index 5c789be..8c4c7ba 100644
--- a/doxygen-1.8.4-config.patch
+++ b/doxygen-1.8.4-config.patch
@@ -10,22 +10,6 @@ diff -up doxygen-1.8.4/addon/doxywizard/Makefile.in.config doxygen-1.8.4/addon/d
  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.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
diff --git a/doxygen-1.8.5-config.patch b/doxygen-1.8.5-config.patch
new file mode 100644
index 0000000..8c4c7ba
--- /dev/null
+++ b/doxygen-1.8.5-config.patch
@@ -0,0 +1,79 @@
+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.spec b/doxygen.spec
index 1834249..d361621 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -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.4-config.patch
+Patch1: doxygen-1.8.5-config.patch
 Patch2: doxygen-1.8.5-html_timestamp_default_false.patch 
 Patch3: doxygen-1.8.3-multilib.patch
 
@@ -93,15 +93,17 @@ make docs
 
 %install
 make install DESTDIR=%{buildroot}
+make doxywizard_install DESTDIR=%{buildroot}
 
 install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
+install -m644 -p doc/doxywizard.1 %{buildroot}%{_mandir}/man1/
 
 desktop-file-install \
    --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 
 
 %files
-%doc LANGUAGE.HOWTO README examples
+%doc LANGUAGE.HOWTO README.md examples
 %doc html
 %{_bindir}/doxygen
 %{_mandir}/man1/doxygen.1*
