Merge pull request #270 from bcressey/dbus-and-expat

update libdbus and libexpat

Author: bcressey

packages/libdbus/Cargo.toml

@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://dbus.freedesktop.org/releases/dbus"
 
 [[package.metadata.build-package.external-files]]
-url = "https://dbus.freedesktop.org/releases/dbus/dbus-1.15.6.tar.xz"
-sha512 = "8c2e207d98245d5f8d358e9824be9e8646af8147958e8bd56e18d478e8976e58a6645ee1aba62451fcc58443157e2a39c4a6ed9c2e440e7b6b05053d022f0113"
+url = "https://dbus.freedesktop.org/releases/dbus/dbus-1.15.12.tar.xz"
+sha512 = "9af8ee28d61e1794eacd8cdecd6a68fa32ab5ea229df32f7112ed67f1aa8e57dd9a595ceaf42621891b50074e6f5a0cdd8c76f7d5882633446d0b81c40434cc0"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

packages/libdbus/libdbus.spec

@@ -1,5 +1,5 @@
 Name: %{_cross_os}libdbus
-Version: 1.15.6
+Version: 1.15.12
 Release: 1%{?dist}
 Epoch: 1
 Summary: Library for a message bus
@@ -26,38 +26,51 @@ Requires: %{name}
 %autosetup -n dbus-%{version} -p1
 
 %build
-%cross_configure \
-  --disable-asserts \
-  --disable-doxygen-docs \
-  --disable-ducktype-docs \
-  --disable-tests \
-  --disable-xml-docs \
-  --disable-selinux \
-  --disable-systemd \
-  --with-xml=expat \
+CONFIGURE_OPTS=(
+ -Dasserts=false
+ -Dcontainers=false
+ -Dembedded_tests=false
+ -Dinstalled_tests=false
+ -Dmessage_bus=false
+ -Dstats=false
+ -Dtools=false
+ -Dtraditional_activation=false
+ -Duser_session=false
 
-%force_disable_rpath
+ -Dapparmor=disabled
+ -Ddoxygen_docs=disabled
+ -Dducktype_docs=disabled
+ -Dkqueue=disabled
+ -Dlaunchd=disabled
+ -Dlibaudit=disabled
+ -Dmodular_tests=disabled
+ -Dqt_help=disabled
+ -Drelocation=disabled
+ -Dselinux=disabled
+ -Dsystemd=disabled
+ -Dvalgrind=disabled
+ -Dx11_autolaunch=disabled
+ -Dxml_docs=disabled
 
-%make_build
+ -Dchecks=true
+)
+
+%cross_meson "${CONFIGURE_OPTS[@]}"
+%cross_meson_build
 
 %install
-%make_install
+%cross_meson_install
 
 rm -rf %{buildroot}%{_cross_docdir}/dbus/examples
 
 %files
 %license COPYING
 %{_cross_attribution_file}
 %{_cross_libdir}/*.so.*
-%exclude %{_cross_bindir}
-%exclude %{_cross_datadir}/dbus-1
 %exclude %{_cross_datadir}/doc
 %exclude %{_cross_datadir}/xml
-%exclude %{_cross_libexecdir}
-%exclude %{_cross_sysconfdir}
 
 %files devel
-%{_cross_libdir}/*.a
 %{_cross_libdir}/*.so
 %dir %{_cross_libdir}/dbus-1.0
 %{_cross_libdir}/dbus-1.0/*

packages/libexpat/Cargo.toml

@@ -12,8 +12,8 @@ path = "../packages.rs"
 releases-url = "https://github.com/libexpat/libexpat/releases/"
 
 [[package.metadata.build-package.external-files]]
-url = "https://github.com/libexpat/libexpat/releases/download/R_2_6_3/expat-2.6.3.tar.xz"
-sha512 = "e02c4ad88f9d539258aa1c1db71ded7770a8f12c77b5535e5b34f040ae5b1361ef23132f16d96bdb7c096a83acd637a7c907916bdfcc6d5cfb9e35d04020ca0b"
+url = "https://github.com/libexpat/libexpat/releases/download/R_2_6_4/expat-2.6.4.tar.xz"
+sha512 = "620da34d98524478b445038bf1dd439790fe11169496516425fca922226797835c27549fc5fb825792b516563b24eb922d9ad8f27d20a0229e7ee8cd640dfb25"
 
 [build-dependencies]
 glibc = { path = "../glibc" }

packages/libexpat/libexpat.spec

@@ -1,4 +1,4 @@
-%global unversion 2_6_3
+%global unversion 2_6_4
 
 Name: %{_cross_os}libexpat
 Version: %(echo %{unversion} | sed 's/_/./g')