summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-08-18 11:26:29 +0200
committerThomas Haller <thaller@redhat.com>2016-08-18 12:40:08 +0200
commit959e1517224955b9bec72d78796db9a07a080218 (patch)
treea7fa3a76b6e1c167ca7d84509e1ae6c4d36275c0 /contrib
parentcf5080668914459921081ccbc94ad8b8f2701584 (diff)
downloadNetworkManager-959e1517224955b9bec72d78796db9a07a080218.tar.gz
contrib/rpm: update spec file to make it more similar to RHEL's version
(cherry picked from commit aff491b6f319f41d9c812400f8f561a138580bb7)
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec8
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 1d74eb28c7..47ead36a30 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -18,6 +18,7 @@
%global snapshot %{nil}
%global git_sha __COMMIT__
+
%global rpm_version __VERSION__
%global real_version __VERSION__
%global release_version __RELEASE_VERSION__
@@ -363,7 +364,9 @@ by nm-connection-editor and nm-applet in a non-graphical environment.
#%patch1 -p1
%build
+%if %{with regen_docs}
gtkdocize
+%endif
autoreconf --install --force
intltoolize --automake --copy --force
%configure \
@@ -419,7 +422,10 @@ intltoolize --automake --copy --force
--with-system-libndp=yes \
--with-pppd-plugin-dir=%{_libdir}/pppd/%{ppp_version} \
--with-dist-version=%{version}-%{release} \
- --with-setting-plugins-default='ifcfg-rh,ibft'
+ --with-setting-plugins-default='ifcfg-rh,ibft' \
+ --with-config-dns-rc-manager-default=symlink \
+ --with-logging-backend-default=journal \
+ --enable-json-validation
make %{?_smp_mflags}