(re)enable -doc generatation

Fixes some bootstrapping issues
This commit is contained in:
Rex Dieter 2013-09-27 16:15:33 -05:00
parent 6dd363f139
commit bbafcff0b3

View File

@ -12,8 +12,9 @@
%define rpm_macros_dir %{_sysconfdir}/rpm %define rpm_macros_dir %{_sysconfdir}/rpm
%endif %endif
# define to build docs (currently broken) # define to build docs, need to undef this for bootstrapping
#define docs 1 # where qt5-qttools builds are not yet available
%define docs 1
Summary: Qt5 - QtBase components Summary: Qt5 - QtBase components
Name: qt5-qtbase Name: qt5-qtbase
@ -117,12 +118,16 @@ Requires: pkgconfig(gl)
%description devel %description devel
%{summary}. %{summary}.
%if 0%{?docs}
%package doc %package doc
Summary: API documentation for %{name} Summary: API documentation for %{name}
Requires: %{name} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
# for qhelpgenerator
BuildRequires: qt5-qttools-devel
BuildArch: noarch BuildArch: noarch
%description doc %description doc
%{summary}. %{summary}.
%endif
%package static %package static
Summary: Static library files for %{name} Summary: Static library files for %{name}
@ -255,12 +260,13 @@ popd
make %{?_smp_mflags} make %{?_smp_mflags}
%if 0%{?docs} %if 0%{?docs}
make docs # wierd but necessary, to force regeration to use just-built qdoc
rm -fv src/corelib/Makefile
make %{?_smp_mflags} docs
%endif %endif
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
%if 0%{?docs} %if 0%{?docs}
@ -577,7 +583,7 @@ popd
%changelog %changelog
* Fri Sep 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.1.1-6 * Fri Sep 27 2013 Rex Dieter <rdieter@fedoraproject.org> - 5.1.1-6
- -doc subpkg (not enabled, needswork) - -doc subpkg
- enable %%check - enable %%check
* Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5 * Mon Sep 23 2013 Dan Horák <dan[at]danny.cz> - 5.1.1-5