From de82b42eba8b96876bf48f84073189632a475c59 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 17 Mar 2016 16:45:53 +0100 Subject: [PATCH] If we generate docs then install them --- NetworkManager.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/NetworkManager.spec b/NetworkManager.spec index b68cdd7..3d8a645 100644 --- a/NetworkManager.spec +++ b/NetworkManager.spec @@ -336,12 +336,6 @@ by nm-connection-editor and nm-applet in a non-graphical environment. %build -%if %{with regen_docs} -# back up pristine docs and use them instead of generated ones, which make -# multilib unhappy due to different timestamps in the generated content -cp -R docs ORIG-docs -%endif - autoreconf --install --force intltoolize --automake --copy --force %configure \ @@ -443,11 +437,8 @@ rm -f %{buildroot}%{_libdir}/*.la rm -f %{buildroot}%{_libdir}/pppd/%{ppp_version}/*.la rm -f %{buildroot}%{_libdir}/NetworkManager/*.la -%if %{with regen_docs} -# install the pristine docs -cp ORIG-docs/libnm-glib/html/* %{buildroot}%{_datadir}/gtk-doc/html/libnm-glib/ -cp ORIG-docs/libnm-util/html/* %{buildroot}%{_datadir}/gtk-doc/html/libnm-util/ -%endif +# Ensure the documentation timestamps are constant to avoid multilib conflicts +find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference configure.ac %check