Allow cmake support to be disabled (#1497257)

This commit is contained in:
David King 2017-10-03 16:37:49 +01:00
parent a1c6e0d5b1
commit c2ca577ff2

View File

@ -13,6 +13,8 @@
%bcond_without tests %bcond_without tests
# Disabled in June 2014: http://lists.freedesktop.org/archives/dbus/2014-June/016223.html # Disabled in June 2014: http://lists.freedesktop.org/archives/dbus/2014-June/016223.html
%bcond_with check %bcond_with check
# Allow cmake support to be disabled. #1497257
%bcond_without cmake
Name: dbus Name: dbus
Epoch: 1 Epoch: 1
@ -45,8 +47,10 @@ BuildRequires: /usr/bin/yelp-build
# For building XML documentation. # For building XML documentation.
BuildRequires: /usr/bin/xsltproc BuildRequires: /usr/bin/xsltproc
BuildRequires: xmlto BuildRequires: xmlto
%if %{with cmake}
# For AutoReq cmake-filesystem. # For AutoReq cmake-filesystem.
BuildRequires: cmake BuildRequires: cmake
%endif
#For macroized scriptlets. #For macroized scriptlets.
%{?systemd_requires} %{?systemd_requires}
@ -161,6 +165,10 @@ popd
find %{buildroot} -name '*.a' -type f -delete find %{buildroot} -name '*.a' -type f -delete
find %{buildroot} -name '*.la' -type f -delete find %{buildroot} -name '*.la' -type f -delete
%if ! %{with cmake}
rm -rf %{buildroot}%{_libdir}/cmake
%endif
install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh install -Dp -m755 %{SOURCE1} %{buildroot}%{_sysconfdir}/X11/xinit/xinitrc.d/00-start-message-bus.sh
# Obsolete, but still widely used, for drop-in configuration snippets. # Obsolete, but still widely used, for drop-in configuration snippets.
@ -351,7 +359,9 @@ popd
%{_datadir}/xml/dbus-1 %{_datadir}/xml/dbus-1
%{_libdir}/lib*.so %{_libdir}/lib*.so
%dir %{_libdir}/dbus-1.0 %dir %{_libdir}/dbus-1.0
%if %{with cmake}
%{_libdir}/cmake/DBus1 %{_libdir}/cmake/DBus1
%endif
%{_libdir}/dbus-1.0/include/ %{_libdir}/dbus-1.0/include/
%{_libdir}/pkgconfig/dbus-1.pc %{_libdir}/pkgconfig/dbus-1.pc
%{_includedir}/* %{_includedir}/*
@ -360,6 +370,7 @@ popd
%changelog %changelog
* Tue Oct 03 2017 David King <amigadave@amigadave.com> - 1:1.11.20-1 * Tue Oct 03 2017 David King <amigadave@amigadave.com> - 1:1.11.20-1
- Update to 1.11.20 - Update to 1.11.20
- Allow cmake support to be disabled (#1497257)
* Wed Sep 27 2017 David King <amigadave@amigadave.com> - 1:1.11.18-1 * Wed Sep 27 2017 David King <amigadave@amigadave.com> - 1:1.11.18-1
- Update to 1.11.18 - Update to 1.11.18