From af6a306c159bf726e446fbff6396a04bb1e94bd1 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Jan 16 2021 22:54:28 +0000 Subject: 1.14.10, spec cleanup --- diff --git a/ModemManager.spec b/ModemManager.spec index 7466e73..0ba1136 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -2,11 +2,9 @@ %global qmi_version %(pkg-config --modversion qmi-glib 2>/dev/null || echo bad) %global mbim_version %(pkg-config --modversion mbim-glib 2>/dev/null || echo bad) -%global _hardened_build 1 - Name: ModemManager -Version: 1.14.8 -Release: 2%{?dist} +Version: 1.14.10 +Release: 1%{?dist} Summary: Mobile broadband modem management service License: GPLv2+ URL: http://www.freedesktop.org/wiki/Software/ModemManager/ @@ -27,19 +25,19 @@ Requires(post): systemd Requires(postun): systemd Requires(preun): systemd -BuildRequires: make -BuildRequires: glib2-devel >= 2.36 -BuildRequires: libgudev1-devel >= 143 BuildRequires: automake autoconf libtool autoconf-archive +BuildRequires: dbus +BuildRequires: dbus-daemon +BuildRequires: gettext-devel >= 0.19.8 +BuildRequires: glib2-devel >= 2.36 +BuildRequires: gobject-introspection-devel >= 1.38 BuildRequires: gtk-doc -BuildRequires: libqmi-devel >= 1.26.0 +BuildRequires: libgudev1-devel >= 143 BuildRequires: libmbim-devel >= 1.24.0 -BuildRequires: gobject-introspection-devel >= 1.38 -BuildRequires: vala -BuildRequires: dbus +BuildRequires: libqmi-devel >= 1.26.0 +BuildRequires: make BuildRequires: systemd-devel >= 209 -BuildRequires: gettext-devel >= 0.19.8 -BuildRequires: /usr/bin/dbus-daemon +BuildRequires: vala %global __provides_exclude ^libmm-plugin- @@ -90,7 +88,7 @@ Vala bindings for ModemManager %build # Regenerate configure, because the one that is shipped # doesn't seem to obey --disable-rpath for reasons unknown. -autoreconf -i --force +autoreconf -vif %configure \ --disable-rpath \ --disable-silent-rules \ @@ -117,33 +115,17 @@ find %{buildroot} -type f -name "*.la" -delete %find_lang %{name} +%ldconfig_scriptlets glib + %post -%if 0%{?rhel} && 0%{?rhel} <= 7 -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -%endif %systemd_post ModemManager.service %preun %systemd_preun ModemManager.service %postun -%if 0%{?rhel} && 0%{?rhel} <= 7 -/sbin/ldconfig -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi -%endif %systemd_postun ModemManager.service -%if 0%{?rhel} && 0%{?rhel} <= 7 -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -%endif - -%post glib -p /sbin/ldconfig -%postun glib -p /sbin/ldconfig - %files -f %{name}.lang %license COPYING %doc README @@ -186,6 +168,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{_datadir}/vala/vapi/libmm-glib.* %changelog +* Sat Jan 16 2021 Peter Robinson - 1.14.10-1 +- Update to 1.14.10 +- Spec clean up + * Mon Dec 28 2020 Peter Robinson - 1.14.8-2 - Drop unneeded libxslt dependency diff --git a/sources b/sources index f9c6597..1ec080b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ModemManager-1.14.8.tar.xz) = 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6 +SHA512 (ModemManager-1.14.10.tar.xz) = 958fa7d5a44a924e6519b619b6b7547085191610b977e863372b83ae0f86ba2af07def0b27986d4f518dfb94cdcaeef005f1a8d3e96e548b7019da0dd89a1bea