This commit is contained in:
Than Ngo 2013-05-21 12:31:22 +02:00
parent b3ca81baa3
commit 7a60b03a15
4 changed files with 23 additions and 19 deletions

1
.gitignore vendored
View File

@ -36,3 +36,4 @@ doxygen-1.7.1.src.tar.gz
/doxygen-1.8.2.src.tar.gz
/doxygen-1.8.3.src.tar.gz
/doxygen-1.8.3.1.src.tar.gz
/doxygen-1.8.4.src.tar.gz

View File

@ -1,6 +1,6 @@
diff -up doxygen-1.8.3/addon/doxywizard/Makefile.in.config doxygen-1.8.3/addon/doxywizard/Makefile.in
--- doxygen-1.8.3/addon/doxywizard/Makefile.in.config 2012-01-29 16:23:25.000000000 +0100
+++ doxygen-1.8.3/addon/doxywizard/Makefile.in 2013-01-02 16:45:56.206014990 +0100
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.
#
@ -26,13 +26,13 @@ diff -up doxygen-1.8.3/addon/doxywizard/Makefile.in.config doxygen-1.8.3/addon/d
rm doxywizard.1
FORCE:
diff -up doxygen-1.8.3/configure.config doxygen-1.8.3/configure
--- doxygen-1.8.3/configure.config 2012-12-27 12:24:51.000000000 +0100
+++ doxygen-1.8.3/configure 2013-01-02 16:45:56.206014990 +0100
@@ -280,9 +280,10 @@ if test "$f_wizard" = YES; then
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!"
echo -n " Checking for Qt..."
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
@ -41,7 +41,7 @@ diff -up doxygen-1.8.3/configure.config doxygen-1.8.3/configure
fi
done
else
@@ -514,6 +515,8 @@ INSTTOOL = $f_insttool
@@ -606,6 +607,8 @@ INSTTOOL = $f_insttool
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
@ -50,9 +50,9 @@ diff -up doxygen-1.8.3/configure.config doxygen-1.8.3/configure
EOF
if test "$f_dot" != NO; then
diff -up doxygen-1.8.3/Makefile.in.config doxygen-1.8.3/Makefile.in
--- doxygen-1.8.3/Makefile.in.config 2012-12-25 13:17:27.000000000 +0100
+++ doxygen-1.8.3/Makefile.in 2013-01-02 16:50:44.919183628 +0100
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")
@ -62,9 +62,9 @@ diff -up doxygen-1.8.3/Makefile.in.config doxygen-1.8.3/Makefile.in
install: doxywizard_install doxysearch_install
$(INSTTOOL) -d $(DESTDIR)/$(INSTALL)/bin
$(INSTTOOL) -m 755 bin/doxygen $(DESTDIR)/$(INSTALL)/bin
diff -up doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf.config doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf
--- doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf.config 2012-12-22 19:49:04.000000000 +0100
+++ doxygen-1.8.3/tmake/lib/linux-g++/tmake.conf 2013-01-02 16:52:08.828039570 +0100
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

View File

@ -1,8 +1,8 @@
Summary: A documentation system for C/C++
Name: doxygen
Epoch: 1
Version: 1.8.3.1
Release: 2%{?dist}
Version: 1.8.4
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.3-config.patch
Patch1: doxygen-1.8.4-config.patch
Patch2: doxygen-1.8.1.1-html_timestamp_default_false.patch
Patch3: doxygen-1.8.3-multilib.patch
@ -115,6 +115,9 @@ desktop-file-install \
%changelog
* Tue May 21 2013 Than Ngo <than@redhat.com> - 1:1.8.4-1
- 1.8.4
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:1.8.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

View File

@ -1,2 +1,2 @@
1a84da877450422c5fc49e525c546cd4 doxywizard.png
31b0aaab51c5cab7db9f0ebbe9f85530 doxygen-1.8.3.1.src.tar.gz
5f460b91c0d8c34a76173cf22015c2fc doxygen-1.8.4.src.tar.gz