From e3e0a490750347df447bfbe48bcd7293c4433aa0 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Tue, 29 Mar 2016 18:07:53 +0200 Subject: [PATCH] contrib/rpm: allow building w/o prebuilt documentation --- contrib/fedora/rpm/NetworkManager.spec | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index cdd278e09..a540a49e1 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -344,12 +344,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 \ @@ -450,11 +444,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 -exec touch --reference configure.ac '{}' \+ %if 0%{?__debug_package} mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version} -- 2.17.1