This commit is contained in:
Than Ngo 2016-01-29 17:53:49 +01:00
parent bdf7426494
commit 25ceed3b3f
2 changed files with 8 additions and 34 deletions

View File

@ -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)

View File

@ -11,7 +11,6 @@ Source0: ftp://ftp.stack.nl/pub/users/dimitri/%{name}-%{version}.src.tar.gz
# this icon is part of kdesdk # this icon is part of kdesdk
Source1: doxywizard.png Source1: doxywizard.png
Source2: doxywizard.desktop Source2: doxywizard.desktop
Patch1: doxygen-1.8.11-install.patch
# upstream fixes # upstream fixes
@ -64,7 +63,6 @@ Requires: texlive-epstopdf-bin
%prep %prep
%setup -q %setup -q
%patch1 -p1 -b .config
# convert into utf-8 # convert into utf-8
iconv --from=ISO-8859-1 --to=UTF-8 LANGUAGE.HOWTO > LANGUAGE.HOWTO.new 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} mkdir -p %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
%cmake \ %cmake \
-Dbuild_doc=ON \ -Dbuild_doc=OFF \
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
-Dbuild_xmlparser=ON \ -Dbuild_xmlparser=ON \
-DMAN_INSTALL_DIR=%{_mandir}/man1 \ -DMAN_INSTALL_DIR=%{_mandir}/man1 \
-DDOC_INSTALL_DIR=%{_docdir}/doxygen \
-DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
.. ..
popd popd
make %{?_smp_mflags} -C %{_target_platform} make %{?_smp_mflags} -C %{_target_platform}
make docs -C %{_target_platform}
%install %install
make install \ make install \
DESTDIR=%{buildroot} \ DESTDIR=%{buildroot} \
-C %{_target_platform} -C %{_target_platform}
mv %{buildroot}%{_docdir}/doxygen .
install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png 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 \ desktop-file-install \
--dir=%{buildroot}%{_datadir}/applications %{SOURCE2} --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%files %files
%doc LANGUAGE.HOWTO README.md doxygen %doc LANGUAGE.HOWTO README.md
%{_bindir}/doxygen %{_bindir}/doxygen
%{_mandir}/man1/doxygen.1* %{_mandir}/man1/doxygen.1*
%{_mandir}/man1/doxyindexer.1.gz %{_mandir}/man1/doxyindexer.1*
%{_mandir}/man1/doxysearch.1.gz %{_mandir}/man1/doxysearch.1*
%files doxywizard %files doxywizard
%{_bindir}/doxywizard %{_bindir}/doxywizard