diff --git a/doxygen-1.5.6-html.tar.bz2 b/doxygen-1.5.6-html.tar.bz2
deleted file mode 100644
index 38611aa..0000000
--- a/doxygen-1.5.6-html.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3e183a828b7da095504fafd2fa63e17f184ef5ca9efa2ac08b69505485de8c25
-size 465888
diff --git a/doxygen-1.5.6-man.patch b/doxygen-1.5.6-man.patch
deleted file mode 100644
index 0251e57..0000000
--- a/doxygen-1.5.6-man.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in
-+++ Makefile.in
-@@ -44,7 +44,7 @@
-
- DATE=$(shell date "+%B %Y")
-
--MAN1DIR = man/man1
-+MAN1DIR = share/man/man1
-
- install: doxywizard_install
- $(INSTTOOL) -d $(INSTALL)/bin
diff --git a/doxygen-1.5.6.src.tar.bz2 b/doxygen-1.5.6.src.tar.bz2
deleted file mode 100644
index c4e1112..0000000
--- a/doxygen-1.5.6.src.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d2fdb31332d54f7744f275fcbf1dd859755090843cea1edc92e2e6f54b54e5b7
-size 3186077
diff --git a/doxygen-64archs.diff b/doxygen-1.5.8-64archs.patch
similarity index 100%
rename from doxygen-64archs.diff
rename to doxygen-1.5.8-64archs.patch
diff --git a/doxygen-1.5.6-arm.patch b/doxygen-1.5.8-arm.patch
similarity index 100%
rename from doxygen-1.5.6-arm.patch
rename to doxygen-1.5.8-arm.patch
diff --git a/doxygen-1.5.8-html.tar.bz2 b/doxygen-1.5.8-html.tar.bz2
new file mode 100644
index 0000000..9078212
--- /dev/null
+++ b/doxygen-1.5.8-html.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d888a6911c89768e6c93d35e46339b57be1cfe4f4a8ded29193223893f527416
+size 460442
diff --git a/doxygen-1.5.6-libpng.diff b/doxygen-1.5.8-libpng.patch
similarity index 100%
rename from doxygen-1.5.6-libpng.diff
rename to doxygen-1.5.8-libpng.patch
diff --git a/doxygen-1.5.8-man.patch b/doxygen-1.5.8-man.patch
new file mode 100644
index 0000000..8740c30
--- /dev/null
+++ b/doxygen-1.5.8-man.patch
@@ -0,0 +1,9 @@
+--- ./Makefile.in
++++ ./Makefile.in
+@@ -50,2 +49,0 @@ DATE=$(shell date "+%B %Y")
+-MAN1DIR = man/man1
+-
+--- ./configure
++++ ./configure
+@@ -487,0 +488 @@ QTDIR = $QTDIR
++MAN1DIR = share/man/man1
diff --git a/doxygen-1.5.8-qtdir.patch b/doxygen-1.5.8-qtdir.patch
new file mode 100644
index 0000000..2d4b72c
--- /dev/null
+++ b/doxygen-1.5.8-qtdir.patch
@@ -0,0 +1,11 @@
+--- ./configure
++++ ./configure
+@@ -268,7 +268,7 @@
+ 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; do
+ if test -x "$d/bin/qmake"; then
+ QTDIR=$d
+ fi
diff --git a/doxygen-1.5.8.src.tar.bz2 b/doxygen-1.5.8.src.tar.bz2
new file mode 100644
index 0000000..d81f9c7
--- /dev/null
+++ b/doxygen-1.5.8.src.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:bce002df5764dc7d790ffecde7c867f01c739bfdb64ebc5fb028a19ce7a6a54b
+size 3331519
diff --git a/doxygen.changes b/doxygen.changes
index bcf8054..9149aed 100644
--- a/doxygen.changes
+++ b/doxygen.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Tue Jan 6 13:31:44 CET 2009 - mseben@suse.cz
+
+- updated to version 1.5.8
+ Changes:
+ * Included Qt help update by Sebastian Pipping introducing three
+ new options to define custom filter sections and attributes:
+ QHP_CUST_FILTER_NAME, QHP_CUST_FILTER_ATTRS, QHP_SECT_FILTER_ATTRS.
+ New features:
+ * Add new option EXTENSION_MAPPING, which can be used to change
+ the mapping of file extension to language parser
+ * Added support for Vietnamese (thanks to Dang Minh Tuan)
+ * Thanks to Emin Ilker Cetinbas doxygen can now also produce
+ Turkish documentation.
+ * It is now possible to add the direction attributes normally used
+ with the @param command to document parameters inline
+
+- rewritten doxygen-*-man.patch
+- spec file clean-up
+
-------------------------------------------------------------------
Tue Jul 15 13:31:58 CEST 2008 - anosek@suse.cz
diff --git a/doxygen.spec b/doxygen.spec
index 78a1aa8..12b18d6 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -1,10 +1,17 @@
#
-# spec file for package doxygen (Version 1.5.6)
+# spec file for package doxygen (Version 1.5.8)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -13,7 +20,7 @@
Name: doxygen
BuildRequires: bison flex gcc-c++ libpng-devel
-Version: 1.5.6
+Version: 1.5.8
Release: 1
AutoReqProv: on
License: GPL v2 or later
@@ -25,8 +32,8 @@ Source: %{name}-%{version}.src.tar.bz2
Source1: doxygen-html.sh
Source2: %{name}-%{version}-html.tar.bz2
Source3: %{name}_manual-%{version}.pdf.bz2
-Patch: %{name}-64archs.diff
-Patch1: %{name}-%{version}-libpng.diff
+Patch: %{name}-%{version}-64archs.patch
+Patch1: %{name}-%{version}-libpng.patch
Patch2: %{name}-%{version}-arm.patch
Patch3: %{name}-%{version}-man.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -57,15 +64,10 @@ cp -v %{S:3} .
bzip2 -d %{name}_manual-%{version}.pdf.bz2
%build
-%{suse_update_libdir tmake/lib/linux-g++/tmake.conf}
-perl -pi -e "s#TMAKE_CFLAGS_RELEASE.*=.*#TMAKE_CFLAGS_RELEASE=$RPM_OPT_FLAGS -fno-strict-aliasing#;" tmake/lib/linux-g++/tmake.conf
./configure --prefix /usr --install /usr/bin/install
make %{?jobs:-j%jobs}
-#make docs
-#make pdf
%install
-rm -rf %{buildroot}
install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/doxygen
make install INSTALL=$RPM_BUILD_ROOT/usr DOCDIR=$RPM_BUILD_ROOT%{_docdir}/doxygen
install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README VERSION $RPM_BUILD_ROOT%{_docdir}/doxygen
@@ -83,6 +85,22 @@ rm -rf %{buildroot}
%attr(755,root,root) /usr/bin/*
%changelog
+* Tue Jan 06 2009 mseben@suse.cz
+- updated to version 1.5.8
+ Changes:
+ * Included Qt help update by Sebastian Pipping introducing three
+ new options to define custom filter sections and attributes:
+ QHP_CUST_FILTER_NAME, QHP_CUST_FILTER_ATTRS, QHP_SECT_FILTER_ATTRS.
+ New features:
+ * Add new option EXTENSION_MAPPING, which can be used to change
+ the mapping of file extension to language parser
+ * Added support for Vietnamese (thanks to Dang Minh Tuan)
+ * Thanks to Emin Ilker Cetinbas doxygen can now also produce
+ Turkish documentation.
+ * It is now possible to add the direction attributes normally used
+ with the @param command to document parameters inline
+- rewritten doxygen-*-man.patch
+- spec file clean-up
* Tue Jul 15 2008 anosek@suse.cz
- updated to version 1.5.6
Changes
@@ -318,7 +336,7 @@ rm -rf %{buildroot}
- added ghostscript-x11-packages to neededforbuild (for gs)
* Sun Jul 28 2002 meissner@suse.de
- use RPM_OPT_FLAGS so it builds on ppc64.
-* Fri Jul 19 2002 coolo@suse.de
+* Thu Jul 18 2002 coolo@suse.de
- updating to 1.2.17 (needed for new kdelibs3)
* Sun Jun 09 2002 olh@suse.de
- build with -mminimal-toc on ppc64, workaround
@@ -333,7 +351,7 @@ rm -rf %{buildroot}
- patch tmake config file as well to use qt-mt
* Tue Mar 12 2002 ro@suse.de
- build against qt3
-* Fri Feb 01 2002 ro@suse.de
+* Thu Jan 31 2002 ro@suse.de
- added libgimpprint to neededforbuild
* Tue Jan 29 2002 cihlar@suse.cz
- use %%{suse_update_libdir}
@@ -367,7 +385,7 @@ rm -rf %{buildroot}
* Wed May 16 2001 cihlar@suse.cz
- update to version 1.2.7
- fixed warnings on ia64
-* Mon Mar 19 2001 ro@suse.de
+* Sun Mar 18 2001 ro@suse.de
- fixed neededforbuild
* Mon Mar 12 2001 cihlar@suse.cz
- update to version 1.2.6
@@ -394,7 +412,7 @@ rm -rf %{buildroot}
* Tue Aug 15 2000 garloff@suse.de
- Update to stable version 1.2.1.
- No need for using -g for release version any longer.
-* Wed Jul 05 2000 garloff@suse.de
+* Tue Jul 04 2000 garloff@suse.de
- Update to doxygen-1.1.5: Many bugfixes (last pre-1.2)
- Documentation (.ps,.pdf) is now being build from the sources
* Tue Jun 27 2000 garloff@suse.de
@@ -411,14 +429,14 @@ rm -rf %{buildroot}
- Use %%{_docdir}
* Wed Jan 05 2000 garloff@suse.de
- Upgrade to doxygen-1.0.0
-* Mon Nov 01 1999 ro@suse.de
+* Sun Oct 31 1999 ro@suse.de
- re-added -g to CFLAGS (workaround for a segfault without)
* Sat Oct 30 1999 garloff@suse.de
- Update to 0.49-991003.
- Added pdf docu.
* Wed Aug 04 1999 garloff@suse.de
- Update to 0.49-990728.
-* Thu Jul 29 1999 garloff@suse.de
+* Wed Jul 28 1999 garloff@suse.de
- Added missing neededforbuild packages.
- Add -g to compile flags: Workaround for egcs on AXP (!)
* Sat Jul 24 1999 garloff@suse.de
diff --git a/doxygen_manual-1.5.6.pdf.bz2 b/doxygen_manual-1.5.6.pdf.bz2
deleted file mode 100644
index 41488e2..0000000
--- a/doxygen_manual-1.5.6.pdf.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:06515e0c9bc564f075e3171b5d833f7df9636f901800de62b6dc02138e9872e7
-size 599279
diff --git a/doxygen_manual-1.5.8.pdf.bz2 b/doxygen_manual-1.5.8.pdf.bz2
new file mode 100644
index 0000000..ae11d24
--- /dev/null
+++ b/doxygen_manual-1.5.8.pdf.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:2e60b95559e89da269ea062ae431242830a3714d7347c170bc105dfb99abd659
+size 638005
diff --git a/doxywizard-1.5.6-makefile.patch b/doxywizard-1.5.6-makefile.patch
deleted file mode 100644
index b8ea51d..0000000
--- a/doxywizard-1.5.6-makefile.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- addon/doxywizard/Makefile.doxywizard
-+++ addon/doxywizard/Makefile.doxywizard
-@@ -20,11 +20,11 @@
- CC = cc
- CXX = c++
- CFLAGS = -pipe -Wall -W -g -DNODEBUG
--CXXFLAGS= -pipe -D__FreeBSD__=6 -Wall -W -g -DNODEBUG
-+CXXFLAGS= -pipe -Wall -W -g -DNODEBUG
- INCPATH = -I../../src -I$(QTDIR)/include
- LINK = c++
--LFLAGS = -Wl,-search_paths_first
--LIBS = -framework CoreFoundation -framework ApplicationServices -liconv -L$(QTDIR)/lib -lqt-mt
-+LFLAGS =
-+LIBS = -L$(QTDIR)/lib -lqt-mt
- MOC = /Developer/qt/bin/moc
-
- TAR = tar -cf
diff --git a/doxywizard-1.5.6-flex.diff b/doxywizard-1.5.8-flex.patch
similarity index 100%
rename from doxywizard-1.5.6-flex.diff
rename to doxywizard-1.5.8-flex.patch
diff --git a/doxywizard.changes b/doxywizard.changes
index 5354d36..9bd7b01 100644
--- a/doxywizard.changes
+++ b/doxywizard.changes
@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Jan 6 13:39:49 CET 2009 - mseben@suse.cz
+
+- updated to version 1.5.8
+ Changes
+ * Completely rewrote the doxywizard. Main changes:
+ * It is now based on Qt version 4. (4.3 or higher is required)
+ * Different layout that allows easy switching between wizard and
+ expert mode, without losing settings.
+ * Running doxygen can be done without first having to save the
+ configuration file.
+ * For HTML output, there is a button to show the results in the
+ default browser.
+ * Option to change the default configuration that is used when
+ you first start the wizard.
+ * Non-default options are shown with red label, and there is
+ context menu to reset them back to the default.-
+- rewritten (*-man.patch)
+- spec file clean-up, added libqt4-devel to BuildRequires
+- fixed qmake and moc path (*-qtdir.patch)
+
-------------------------------------------------------------------
Tue Jul 15 13:39:08 CEST 2008 - anosek@suse.cz
diff --git a/doxywizard.spec b/doxywizard.spec
index 2c1cfc0..e3be89f 100644
--- a/doxywizard.spec
+++ b/doxywizard.spec
@@ -1,10 +1,17 @@
#
-# spec file for package doxywizard (Version 1.5.6)
+# spec file for package doxywizard (Version 1.5.8)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -12,8 +19,8 @@
Name: doxywizard
-BuildRequires: bison flex libdrm-devel libjpeg-devel qt3-devel update-desktop-files
-Version: 1.5.6
+BuildRequires: bison flex libdrm-devel libjpeg-devel libqt4-devel update-desktop-files
+Version: 1.5.8
Release: 1
AutoReqProv: on
Requires: doxygen = %{version}
@@ -23,12 +30,12 @@ Summary: Graphical User Interface for Doxygen
Url: http://www.stack.nl/~dimitri/doxygen/
Source: doxygen-%{version}.src.tar.bz2
Source1: doxywizard.desktop
-Patch: doxygen-64archs.diff
-Patch1: doxygen-%{version}-libpng.diff
-Patch2: %{name}-%{version}-flex.diff
+Patch: doxygen-%{version}-64archs.patch
+Patch1: doxygen-%{version}-libpng.patch
+Patch2: %{name}-%{version}-flex.patch
Patch4: doxygen-%{version}-arm.patch
Patch5: doxygen-%{version}-man.patch
-Patch6: %{name}-%{version}-makefile.patch
+Patch6: doxygen-%{version}-qtdir.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -53,24 +60,14 @@ Authors:
%patch6
%build
-%{suse_update_libdir tmake/lib/linux-g++/tmake.conf}
-export QTDIR=/usr/lib/qt3
-export PATH=$QTDIR/bin:$PATH
-export LD_RUN_PATH=$QTDIR/lib
-# this tmake version use RPM_OPTL_FLAGS instead of RPM_OPT_FLAGS,
-# I do not know why
-perl -pi -e 's#/lib#/%{_lib}#g;' -e "s#/usr/qt/3/bin/moc#/usr/lib/qt3/bin/moc#g;" -e "s#/Developer/qt/bin/moc#/usr/lib/qt3/bin/moc#g;" addon/doxywizard/Makefile.doxywizard
-perl -pi -e "s#TMAKE_CFLAGS_RELEASE.*=.*#TMAKE_CFLAGS_RELEASE=$RPM_OPT_FLAGS -fno-strict-aliasing#;" tmake/lib/linux-g++/tmake.conf
-./configure --prefix /usr --with-doxywizard --install /usr/bin/install
+./configure --with-doxywizard
make %{?jobs:-j%jobs}
%install
-rm -rf %{buildroot}
make install INSTALL=$RPM_BUILD_ROOT/usr
rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag}
%suse_update_desktop_file -i doxywizard Development Documentation
rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{doxygen,doxytag}.1
-mv $RPM_BUILD_ROOT/usr/man/man1/doxywizard.1 $RPM_BUILD_ROOT%{_mandir}/man1/doxywizard.1
%clean
rm -rf %{buildroot}
@@ -82,6 +79,24 @@ rm -rf %{buildroot}
%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.gz
%changelog
+* Tue Jan 06 2009 mseben@suse.cz
+- updated to version 1.5.8
+ Changes
+ * Completely rewrote the doxywizard. Main changes:
+ * It is now based on Qt version 4. (4.3 or higher is required)
+ * Different layout that allows easy switching between wizard and
+ expert mode, without losing settings.
+ * Running doxygen can be done without first having to save the
+ configuration file.
+ * For HTML output, there is a button to show the results in the
+ default browser.
+ * Option to change the default configuration that is used when
+ you first start the wizard.
+ * Non-default options are shown with red label, and there is
+ context menu to reset them back to the default.-
+- rewritten (*-man.patch)
+- spec file clean-up, added libqt4-devel to BuildRequires
+- fixed qmake and moc path (*-qtdir.patch)
* Tue Jul 15 2008 anosek@suse.cz
- updated to version 1.5.6
* Tue Oct 30 2007 anosek@suse.cz