diff --git a/doxygen-1.8.9.1-html.tar.bz2 b/doxygen-1.8.9.1-html.tar.bz2
deleted file mode 100644
index 03aca8a..0000000
--- a/doxygen-1.8.9.1-html.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:2aa4d86737ac610fbd0fc8e612f0db496e5e238d399ca652c6f2fe375f5018c1
-size 743575
diff --git a/doxygen-html.sh b/doxygen-html.sh
deleted file mode 100644
index e1d99ba..0000000
--- a/doxygen-html.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh -ex
-#
-# download the binary distribution and extract the html manual from it
-
-
-spec=`dirname "$0"`/doxygen.spec
-version=`rpm -q --qf '%{version}' --specfile "$spec"`
-cwd=`pwd`
-tmpdir=`mktemp -d`
-
-pushd $tmpdir
-wget "http://ftp.stack.nl/pub/users/dimitri/doxygen-$version.linux.bin.tar.gz"
-tar xzf "doxygen-$version.linux.bin.tar.gz" "doxygen-$version/html"
-tar cjf "$cwd/doxygen-$version-html.tar.bz2" "doxygen-$version"
-popd
-rm -rf "$tmpdir"
diff --git a/doxygen.changes b/doxygen.changes
index 8ed1560..39d95c1 100644
--- a/doxygen.changes
+++ b/doxygen.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Mon Mar 2 15:22:37 UTC 2015 - pgajdos@suse.com
+
+- remove doxygen-html.sh
+
+-------------------------------------------------------------------
+Fri Feb 20 11:40:19 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Split documentation to separate package
+- Do not bundle pdf documentation
+- Generate html documentation
+
-------------------------------------------------------------------
Fri Feb 6 06:45:26 UTC 2015 - mpluskal@suse.com
diff --git a/doxygen.spec b/doxygen.spec
index ad41c98..2386289 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -17,48 +17,26 @@
Name: doxygen
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: gcc-c++
-BuildRequires: graphviz
-BuildRequires: libpng-devel
-BuildRequires: python-base
-BuildRequires: python-xml
-BuildRequires: unzip
Version: 1.8.9.1
Release: 0
Summary: Automated C, C++, and Java Documentation Generator
License: GPL-2.0+
Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/
-Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
-# script to get %%source2
-Source1: doxygen-html.sh
-Source2: %{name}-%{version}-html.tar.bz2
-Source3: ftp://ftp.stack.nl/pub/users/dimitri/doxygen_manual-%{version}.pdf.zip
-Patch: %{name}-1.5.9-64archs.patch
+Source0: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
+Patch0: %{name}-1.5.9-64archs.patch
Patch3: %{name}-1.5.9-man.patch
Patch4: %{name}-1.7.0-modify_footer.patch
Patch5: %{name}-no-lowercase-man-names.patch
+BuildRequires: bison
+BuildRequires: fdupes
+BuildRequires: flex
+BuildRequires: gcc-c++
+BuildRequires: graphviz
+BuildRequires: libpng-devel
+BuildRequires: python-base
+BuildRequires: python-xml
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#########################################################################################
-# SuSE, openSUSE
-#########################################################################################
-%if 0%{?suse_version}
-%define man_ext gz
-%endif
-#########################################################################################
-# Fedora, RHEL or CentOS
-#########################################################################################
-%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
-%define man_ext gz
-%endif
-#########################################################################################
-# Mandrake, Mandriva
-#########################################################################################
-%if 0%{?mandriva_version} || 0%{?mdkversion}
-%define man_ext lzma
-%endif
%description
Doxygen is a documentation system for C, C++, Java, and IDL. It can
@@ -68,36 +46,55 @@ documentation is extracted directly from the sources. Doxygen is
developed on a Linux platform, but it runs on most other UNIX flavors
as well. An executable for Windows 95/NT is also available.
+%package doc
+Summary: Documentation for %{name}
+Group: Documentation
+
+%description doc
+Doxygen is a documentation system for C, C++, Java, and IDL. It can
+generate an online class browser (in HTML) and an offline reference
+manual (in LaTeX) from a set of documented source files. The
+documentation is extracted directly from the sources. Doxygen is
+developed on a Linux platform, but it runs on most other UNIX flavors
+as well. An executable for Windows 95/NT is also available.
+
+This package contains only documentation
+
%prep
-%setup -q -b 2
-%patch
+%setup -q
+%patch0
%patch3
%patch4
%patch5 -p1
-cp -v %{S:3} .
-/usr/bin/unzip %{S:3}
%build
mintoc=
%ifarch ppc64
mintoc="-DENGLISH_ONLY"
%endif
-sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf
+sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf
# custom configure script
-./configure --prefix /usr --install /usr/bin/install
+./configure --prefix %{_prefix} --install %{_bindir}/install
make %{?_smp_mflags}
+# generate html documentation
+./bin/doxygen
+
%install
-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.md VERSION $RPM_BUILD_ROOT%{_docdir}/doxygen
-cp -a html $RPM_BUILD_ROOT%{_docdir}/doxygen
-cp doxygen_manual-%{version}.pdf $RPM_BUILD_ROOT%{_docdir}/doxygen
+install -d -m 755 %{buildroot}%{_docdir}/doxygen
+make install INSTALL=%{buildroot}/usr DOCDIR=%{buildroot}%{_docdir}/doxygen
+install -m 644 LICENSE LANGUAGE.HOWTO PLATFORMS README.md VERSION %{buildroot}%{_docdir}/doxygen
+cp -a doxygen_docs/html %{buildroot}%{_docdir}/%{name}-doc
+%fdupes -s %{buildroot}%{_docdir}/%{name}-doc
%files
%defattr(-,root,root)
-%doc %{_docdir}/doxygen
-%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.%{man_ext}
-%attr(755,root,root) /usr/bin/*
+%doc LICENSE
+%attr(444,root,root) %doc %{_mandir}/man1/doxygen.1.*
+%attr(755,root,root) %{_bindir}/*
+
+%files doc
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-doc
%changelog
diff --git a/doxygen_manual-1.8.9.1.pdf.zip b/doxygen_manual-1.8.9.1.pdf.zip
deleted file mode 100644
index 64053c4..0000000
--- a/doxygen_manual-1.8.9.1.pdf.zip
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0fb0f15d6fe4887dde07c2bd8e75a2ac67cf50103dc229615146c33971968b65
-size 1069541
diff --git a/doxywizard.changes b/doxywizard.changes
index 1a15b94..33641ed 100644
--- a/doxywizard.changes
+++ b/doxywizard.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Feb 20 11:41:18 UTC 2015 - mpluskal@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Enable tests
+
-------------------------------------------------------------------
Fri Feb 6 06:45:26 UTC 2015 - mpluskal@suse.com
diff --git a/doxywizard.spec b/doxywizard.spec
index ce7ead0..e70a838 100644
--- a/doxywizard.spec
+++ b/doxywizard.spec
@@ -17,47 +17,39 @@
Name: doxywizard
-BuildRequires: bison
-BuildRequires: flex
-BuildRequires: gcc-c++
-BuildRequires: libjpeg-devel
Version: 1.8.9.1
Release: 0
-Requires: doxygen = %{version}
Summary: Graphical User Interface for Doxygen
License: GPL-2.0+
Group: Development/Tools/Doc Generators
Url: http://www.stack.nl/~dimitri/doxygen/
Source: http://ftp.stack.nl/pub/users/dimitri/doxygen-%{version}.src.tar.gz
Source1: doxywizard.desktop
-Patch: doxygen-1.5.9-64archs.patch
+Patch0: doxygen-1.5.9-64archs.patch
Patch2: %{name}-1.5.9-flex.patch
Patch5: doxygen-1.5.9-man.patch
+BuildRequires: bison
+BuildRequires: flex
+BuildRequires: gcc-c++
+BuildRequires: libjpeg-devel
+Requires: doxygen = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-#########################################################################################
-# SuSE, openSUSE
-#########################################################################################
%if 0%{?suse_version}
BuildRequires: libqt4-devel >= 4.3
BuildRequires: update-desktop-files
-%define man_ext gz
%endif
-#########################################################################################
-# Fedora, RHEL or CentOS
-#########################################################################################
%if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version}
BuildRequires: desktop-file-utils
BuildRequires: qt4-devel >= 4.3.0
-%define man_ext gz
%endif
-#########################################################################################
-# Mandrake, Mandriva
-#########################################################################################
%if 0%{?mandriva_version} || 0%{?mdkversion}
BuildRequires: libqt4-devel >= 4.3
-Requires(post): desktop-file-utils
+Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
-%define man_ext lzma
+%endif
+%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
+BuildRequires: libxml2-tools
+BuildRequires: texlive-bibtex
%endif
%description
@@ -66,7 +58,7 @@ configuration files.
%prep
%setup -q -n doxygen-%{version}
-%patch
+%patch0
%patch2
%patch5
@@ -79,7 +71,7 @@ export QTDIR=%{_libdir}/qt4/
export PATH=${QTDIR}/bin:${PATH}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
-export QTDIR=/usr/lib/qt4/
+export QTDIR=%{_libexecdir}/qt4/
%if 0%{?mandriva_version} <= 2009 || 0%{?mdkversion} <= 200900
export PATH=${QTDIR}/bin:${PATH}
%endif
@@ -88,14 +80,19 @@ mintoc=
%ifarch ppc64
mintoc="-DENGLISH_ONLY"
%endif
-sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = $RPM_OPT_FLAGS $mintoc@" tmake/lib/linux-g++/tmake.conf
+sed -i~ "/^TMAKE_CFLAGS_RELEASE.*/s@^.*@TMAKE_CFLAGS_RELEASE = %{optflags} $mintoc@" tmake/lib/linux-g++/tmake.conf
# custom configure script
./configure --with-doxywizard
make %{?_smp_mflags}
+%if 0%{?suse_version} > 1230 && 0%{?suse_version} != 1315
+%check
+make test %{?_smp_mflags}
+%endif
+
%install
-make install INSTALL=$RPM_BUILD_ROOT/usr
-rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag}
+make install INSTALL=%{buildroot}/usr
+rm -f %{buildroot}%{_bindir}/{doxygen,doxytag}
%if 0%{?suse_version}
%suse_update_desktop_file -i doxywizard Development Documentation
%endif
@@ -106,25 +103,23 @@ rm -f $RPM_BUILD_ROOT/usr/bin/{doxygen,doxytag}
install -d -m 755 %{buildroot}%{_datadir}/applications/
install %{SOURCE1} %{buildroot}%{_datadir}/applications/
%endif
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/{doxygen,doxytag}.1
+rm -f %{buildroot}%{_mandir}/man1/{doxygen,doxytag}.1
%files
%defattr(-,root,root)
-%attr(755,root,root) /usr/bin/doxywizard
+%attr(755,root,root) %{_bindir}/doxywizard
%{_datadir}/applications/doxywizard.desktop
-%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.%{man_ext}
+%attr(444,root,root) %doc %{_mandir}/man1/doxywizard.1.*
%if 0%{?mandriva_version} || 0%{?mdkversion}
-
%post
- %update_menus
+ %{update_menus}
%{update_desktop_database}
%endif
%if 0%{?mandriva_version} || 0%{?mdkversion}
-
%postun
- %clean_menus
+ %{clean_menus}
%{clean_desktop_database}
%endif