- up to 1.7.1

- remove -DQT_NO_CODECS from CXXFLAGS to prevent segfault

Changed files:
    doxygen-qt-dirs.patch -> 1.7
    doxygen.spec -> 1.113

diff --git a/doxygen-qt-dirs.patch b/doxygen-qt-dirs.patch
index d38bd06156c49a4d3419e0d153b70d89c50dc67c..56f671f5a9985a4e53b02bde2d3dd9e7727ccfab 100644 (file)
--- a/doxygen-qt-dirs.patch
+++ b/doxygen-qt-dirs.patch
@@ -5,7 +5,7 @@ diff -up doxygen-1.6.0/addon/doxywizard/Makefile.in.config doxygen-1.6.0/addon/d
  # See the GNU General Public License for more details.
  # 
  
--QMAKE=qmake
+-QMAKE=qmake $(MKSPECS)
 -
  all: Makefile.doxywizard  
        $(MAKE) -f Makefile.doxywizard 
@@ -33,7 +33,7 @@ diff -up doxygen-1.6.0/configure.config doxygen-1.6.0/configure
    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/{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
          QTDIR=$d

diff --git a/doxygen.spec b/doxygen.spec
index f1193f4cf09f479cfdd834b423181f84c4c88cef..7242c7c3c4ad86da0455689f2c7904c6556276d7 100644 (file)
--- 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.6.3
+Version:       1.7.1
 Release:       1
 Epoch:         1
 License:       GPL
 Group:         Development/Tools
 Source0:       ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
-# Source0-md5: 2d6ea20a9d850d94321cee78bab7bb87
+# Source0-md5: 13e76e10fb55581a16ee04de35c264f0
 Patch0:                %{name}-qt-dirs.patch
 URL:           http://www.doxygen.org/
 %{?with_qt:BuildRequires:      QtGui-devel >= 4.3}
@@ -147,7 +147,7 @@ rm -rf libpng src/unistd.h addon/doxywizard/Makefile.doxywizard
        LINK="%{__cxx}" \
        QTDIR="%{_prefix}" \
        CFLAGS="%{rpmcflags}" \
-       CXXFLAGS="%{rpmcxxflags} -DQT_NO_CODECS -DQT_LITE_UNICODE -DNODEBUG -fno-rtti -fno-exceptions" \
+       CXXFLAGS="%{rpmcxxflags} -DQT_LITE_UNICODE -DNODEBUG -fno-rtti -fno-exceptions" \
        LFLAGS="%{rpmldflags}"
 
 %{__make} docs