use new _module_build macro to limit dependencies for Modularity

This commit is contained in:
Karsten Hopp 2017-04-21 12:58:19 +02:00
parent 4ccf308fc3
commit 07444683fe

View File

@ -2,11 +2,7 @@ Summary: A documentation system for C/C++
Name: doxygen Name: doxygen
Epoch: 1 Epoch: 1
Version: 1.8.13 Version: 1.8.13
Release: 5%{?dist} Release: 6%{?dist}
# To bootstrap on Modularity, disable checks and enable bootstrap per default:
%bcond_with check
%bcond_without bootstrap
# No version is specified. # No version is specified.
@ -23,7 +19,7 @@ Patch101: doxygen-1.8.13-#775493.patch
Patch102: doxygen-1.8.13-#776988.patch Patch102: doxygen-1.8.13-#776988.patch
BuildRequires: perl BuildRequires: perl
%if %{without bootstrap} %if ! 0%{?_module_build}
BuildRequires: tex(dvips) BuildRequires: tex(dvips)
BuildRequires: tex(latex) BuildRequires: tex(latex)
BuildRequires: tex(multirow.sty) BuildRequires: tex(multirow.sty)
@ -56,7 +52,7 @@ documentation is extracted directly from the sources. Doxygen can
also be configured to extract the code structure from undocumented also be configured to extract the code structure from undocumented
source files. source files.
%if %{without bootstrap} %if ! 0%{?_module_build}
%package doxywizard %package doxywizard
Summary: A GUI for creating and editing configuration files Summary: A GUI for creating and editing configuration files
Requires: %{name} = %{epoch}:%{version}-%{release} Requires: %{name} = %{epoch}:%{version}-%{release}
@ -97,7 +93,7 @@ mv LANGUAGE.HOWTO.new LANGUAGE.HOWTO
mkdir -p %{_target_platform} mkdir -p %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
%if %{without bootstrap} %if ! 0%{?_module_build}
%cmake \ %cmake \
-Dbuild_doc=ON \ -Dbuild_doc=ON \
-Dbuild_wizard=ON \ -Dbuild_wizard=ON \
@ -120,7 +116,7 @@ pushd %{_target_platform}
%endif %endif
popd popd
%if %{without bootstrap} %if ! 0%{?_module_build}
make docs %{?_smp_mflags} -C %{_target_platform} make docs %{?_smp_mflags} -C %{_target_platform}
%else %else
mkdir -p *-redhat-linux-gnu/latex mkdir -p *-redhat-linux-gnu/latex
@ -136,20 +132,20 @@ install -m644 -p -D %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/doxywizard.png
# install man pages # install man pages
mkdir -p %{buildroot}/%{_mandir}/man1 mkdir -p %{buildroot}/%{_mandir}/man1
cp doc/*.1 %{buildroot}/%{_mandir}/man1/ cp doc/*.1 %{buildroot}/%{_mandir}/man1/
%if ! %{without bootstrap} %if 0%{?_module_build}
rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1* rm -f %{buildroot}/%{_mandir}/man1/doxywizard.1*
%endif %endif
# remove duplicate # remove duplicate
rm -rf %{buildroot}/%{_docdir}/packages rm -rf %{buildroot}/%{_docdir}/packages
%if %{without bootstrap} %if ! 0%{?_module_build}
desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2} desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%endif %endif
%files %files
%doc LANGUAGE.HOWTO README.md %doc LANGUAGE.HOWTO README.md
%if %{without bootstrap} %if ! 0%{?_module_build}
%doc %{_target_platform}/latex/doxygen_manual.pdf %doc %{_target_platform}/latex/doxygen_manual.pdf
%doc %{_target_platform}/html %doc %{_target_platform}/html
%{_bindir}/doxyindexer %{_bindir}/doxyindexer
@ -160,7 +156,7 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%{_mandir}/man1/doxyindexer.1* %{_mandir}/man1/doxyindexer.1*
%{_mandir}/man1/doxysearch.1* %{_mandir}/man1/doxysearch.1*
%if %{without bootstrap} %if ! 0%{?_module_build}
%files doxywizard %files doxywizard
%{_bindir}/doxywizard %{_bindir}/doxywizard
%{_mandir}/man1/doxywizard* %{_mandir}/man1/doxywizard*
@ -174,6 +170,9 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE2}
%endif %endif
%changelog %changelog
* Fri Apr 21 2017 Karsten Hopp <karsten@redhat.com> - 1.8.13-6
- use new _module_build macro to limit dependencies for Modularity
* Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5 * Mon Mar 13 2017 Than Ngo <than@redhat.com> - 1:1.8.13-5
- backport to fix behavior of @ref const matching (#776988) - backport to fix behavior of @ref const matching (#776988)