projects
/
NetworkManager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6b62536
)
contrib/rpm: allow building w/o prebuilt documentation
author
Lubomir Rintel
<lkundrak@v3.sk>
Tue, 29 Mar 2016 16:07:53 +0000
(18:07 +0200)
committer
Lubomir Rintel
<lkundrak@v3.sk>
Wed, 30 Mar 2016 11:25:49 +0000
(13:25 +0200)
contrib/fedora/rpm/NetworkManager.spec
patch
|
blob
|
history
diff --git
a/contrib/fedora/rpm/NetworkManager.spec
b/contrib/fedora/rpm/NetworkManager.spec
index
cdd278e
..
a540a49
100644
(file)
--- 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
%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 \
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
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}
%if 0%{?__debug_package}
mkdir -p %{buildroot}%{_prefix}/src/debug/NetworkManager-%{real_version}