From 25ceed3b3f9cae796bafb622fa1b9c838141dc60 Mon Sep 17 00:00:00 2001
From: Than Ngo <than@redhat.com>
Date: Fri, 29 Jan 2016 17:53:49 +0100
Subject: [PATCH] clean up

---
 doxygen-1.8.11-install.patch | 24 ------------------------
 doxygen.spec                 | 18 ++++++++----------
 2 files changed, 8 insertions(+), 34 deletions(-)
 delete mode 100644 doxygen-1.8.11-install.patch

diff --git a/doxygen-1.8.11-install.patch b/doxygen-1.8.11-install.patch
deleted file mode 100644
index b789ff1..0000000
--- a/doxygen-1.8.11-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -up doxygen-1.8.11/doc/CMakeLists.txt.config doxygen-1.8.11/doc/CMakeLists.txt
---- doxygen-1.8.11/doc/CMakeLists.txt.config	2016-01-13 16:15:27.037734714 +0100
-+++ doxygen-1.8.11/doc/CMakeLists.txt	2016-01-13 17:04:21.374801922 +0100
-@@ -169,17 +169,17 @@ install(FILES
-         "${PROJECT_BINARY_DIR}/man/doxywizard.1"
-         "${PROJECT_BINARY_DIR}/man/doxysearch.1"
-         "${PROJECT_BINARY_DIR}/man/doxyindexer.1"
--        DESTINATION share/man/man1
-+        DESTINATION "${MAN_INSTALL_DIR}"
- )
- 
- install(FILES
-         "${PROJECT_BINARY_DIR}/latex/doxygen_manual.pdf"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
- 
- install(DIRECTORY
-         "${PROJECT_BINARY_DIR}/html"
--        DESTINATION "${CMAKE_INSTALL_PREFIX}/${DOC_INSTALL_DIR}"
-+        DESTINATION "${DOC_INSTALL_DIR}"
- )
- 
- endif(build_doc)
diff --git a/doxygen.spec b/doxygen.spec
index c2c69cf..e8bc80b 100644
--- a/doxygen.spec
+++ b/doxygen.spec
@@ -11,7 +11,6 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
 # this icon is part of kdesdk
 Source1: doxywizard.png
 Source2: doxywizard.desktop
-Patch1: doxygen-1.8.11-install.patch
 
 # upstream fixes
 
@@ -64,7 +63,6 @@ Requires: texlive-epstopdf-bin
 
 %prep
 %setup -q
-%patch1 -p1 -b .config
 
 # convert into utf-8
 iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new
@@ -77,37 +75,37 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
 mkdir -p %{_target_platform}
 pushd %{_target_platform}
 %cmake \
-		-Dbuild_doc=ON \
+		-Dbuild_doc=OFF \
 		-Dbuild_wizard=ON \
 		-Dbuild_xmlparser=ON \
 		-DMAN_INSTALL_DIR=%{_mandir}/man1 \
-		-DDOC_INSTALL_DIR=%{_docdir}/doxygen \
 		-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
 		-DBUILD_SHARED_LIBS=OFF \
 		..
 popd
 
 make %{?_smp_mflags} -C %{_target_platform}
-make docs -C %{_target_platform}
 
 %install
 make install \
 	DESTDIR=%{buildroot} \
 	-C %{_target_platform}
 
-mv %{buildroot}%{_docdir}/doxygen .
-
 install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
 
+# install man pages
+mkdir -p %{buildroot}/%{_mandir}/man1
+cp doc/*.1 %{buildroot}/%{_mandir}/man1/
+
 desktop-file-install \
    --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
 
 %files
-%doc LANGUAGE.HOWTO README.md doxygen
+%doc LANGUAGE.HOWTO README.md
 %{_bindir}/doxygen
 %{_mandir}/man1/doxygen.1*
-%{_mandir}/man1/doxyindexer.1.gz
-%{_mandir}/man1/doxysearch.1.gz
+%{_mandir}/man1/doxyindexer.1*
+%{_mandir}/man1/doxysearch.1*
 
 %files doxywizard
 %{_bindir}/doxywizard