commit 7c371171b218746f300cd78fd0279f80a855c9b5
Author: Jakub Bogusz <[email protected]>
Date: Sat Jun 8 13:01:18 2013 +0200
- updated to 1.8.4
- updated qt-dirs patch
doxygen-qt-dirs.patch | 11 +++++------
doxygen.spec | 4 ++--
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/doxygen.spec b/doxygen.spec
index 530fcba..eeacebc 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -9,13 +9,13 @@ Summary(pt_BR.UTF-8): Um sistema de documentação para C/C++
Summary(ru.UTF-8): Система документирования для C та C++
Summary(uk.UTF-8): Система документування для C та C++
Name: doxygen
-Version: 1.8.3.1
+Version: 1.8.4
Release: 1
Epoch: 1
License: GPL
Group: Development/Tools
Source0:
ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-# Source0-md5: 31b0aaab51c5cab7db9f0ebbe9f85530
+# Source0-md5: 5f460b91c0d8c34a76173cf22015c2fc
Patch0: %{name}-qt-dirs.patch
URL: http://www.doxygen.org/
%{?with_qt:BuildRequires: QtGui-devel >= 4.3}
diff --git a/doxygen-qt-dirs.patch b/doxygen-qt-dirs.patch
index 2d116d8..be7d105 100644
--- a/doxygen-qt-dirs.patch
+++ b/doxygen-qt-dirs.patch
@@ -26,13 +26,12 @@ diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config
doxygen-1.6.0/addon/d
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
+--- doxygen-1.8.4/configure.orig 2013-05-19 12:05:39.000000000 +0200
++++ doxygen-1.8.4/configure 2013-06-08 09:12:44.470080015 +0200
+@@ -296,9 +296,10 @@
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}; do
if test -x "$d/bin/qmake"; then
@@ -41,7 +40,7 @@ diff -up doxygen-1.6.0/configure.config
doxygen-1.6.0/configure
fi
done
else
-@@ -485,6 +486,8 @@ INSTTOOL = $f_insttool
+@@ -606,6 +607,8 @@
DOXYDOCS = ..
DOCDIR = $f_docdir
QTDIR = $QTDIR
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/doxygen.git/commitdiff/7c371171b218746f300cd78fd0279f80a855c9b5
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
