rpms/qt5-qtbase
6
0
Fork 0
Code Issues Pull Requests Releases Activity

revert 'build docs first'

Browse Source
This commit is contained in:
Rex Dieter 2015-07-15 19:02:39 -05:00
parent eeecca6075
commit 20808dba5b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt5-qtbase.spec
View File

@ -456,10 +456,12 @@ test -x configure || chmod +x configure
%{?use_gold_linker} \ %{?use_gold_linker} \
-no-directfb -no-directfb
make %{?_smp_mflags}
%if 0%{?docs} %if 0%{?docs}
# qdoc # qdoc
make sub-src-qmake_all %{?_smp_mflags} #make sub-src-qmake_all %{?_smp_mflags}
make sub-qdoc %{?_smp_mflags} -C src #make sub-qdoc %{?_smp_mflags} -C src
# wierd but necessary, to force regeration to use just-built qdoc # wierd but necessary, to force regeration to use just-built qdoc
#rm -fv src/corelib/Makefile #rm -fv src/corelib/Makefile
# HACK to avoid multilib conflicts in noarch content # HACK to avoid multilib conflicts in noarch content
@ -476,8 +478,6 @@ make docs %{?_smp_mflags} -k || \
) )
%endif %endif
make %{?_smp_mflags}
%install %install
make install INSTALL_ROOT=%{buildroot} make install INSTALL_ROOT=%{buildroot}
@ -926,7 +926,7 @@ fi
%changelog %changelog
* Wed Jul 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-8 * Wed Jul 15 2015 Rex Dieter <rdieter@fedoraproject.org> 5.5.0-8
- %%build: build docs first, hack around 'make docs' failures (on f22+) - %%build: hack around 'make docs' failures (on f22+)
* Wed Jul 15 2015 Jan Grulich <jgrulich@redhat.com> 5.5.0-7 * Wed Jul 15 2015 Jan Grulich <jgrulich@redhat.com> 5.5.0-7
- restore previously dropped patches - restore previously dropped patches