Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/ModemManager.git#af6a306c159bf726e446fbff6396a04bb1e94bd1
This commit is contained in:
DistroBaker 2021-01-16 23:25:57 +00:00
parent 549be1b1fd
commit 1311b2152d
2 changed files with 20 additions and 33 deletions

View File

@ -2,11 +2,9 @@
%global qmi_version %(pkg-config --modversion qmi-glib 2>/dev/null || echo bad) %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 mbim_version %(pkg-config --modversion mbim-glib 2>/dev/null || echo bad)
%global _hardened_build 1
Name: ModemManager Name: ModemManager
Version: 1.14.8 Version: 1.14.10
Release: 2%{?dist} Release: 1%{?dist}
Summary: Mobile broadband modem management service Summary: Mobile broadband modem management service
License: GPLv2+ License: GPLv2+
URL: http://www.freedesktop.org/wiki/Software/ModemManager/ URL: http://www.freedesktop.org/wiki/Software/ModemManager/
@ -27,18 +25,19 @@ Requires(post): systemd
Requires(postun): systemd Requires(postun): systemd
Requires(preun): systemd Requires(preun): systemd
BuildRequires: glib2-devel >= 2.36
BuildRequires: libgudev1-devel >= 143
BuildRequires: automake autoconf libtool autoconf-archive BuildRequires: automake autoconf libtool autoconf-archive
BuildRequires: gtk-doc
BuildRequires: libqmi-devel >= 1.26.0
BuildRequires: libmbim-devel >= 1.24.0
BuildRequires: gobject-introspection-devel >= 1.38
BuildRequires: vala
BuildRequires: dbus BuildRequires: dbus
BuildRequires: systemd-devel >= 209 BuildRequires: dbus-daemon
BuildRequires: gettext-devel >= 0.19.8 BuildRequires: gettext-devel >= 0.19.8
BuildRequires: /usr/bin/dbus-daemon BuildRequires: glib2-devel >= 2.36
BuildRequires: gobject-introspection-devel >= 1.38
BuildRequires: gtk-doc
BuildRequires: libgudev1-devel >= 143
BuildRequires: libmbim-devel >= 1.24.0
BuildRequires: libqmi-devel >= 1.26.0
BuildRequires: make
BuildRequires: systemd-devel >= 209
BuildRequires: vala
%global __provides_exclude ^libmm-plugin- %global __provides_exclude ^libmm-plugin-
@ -89,7 +88,7 @@ Vala bindings for ModemManager
%build %build
# Regenerate configure, because the one that is shipped # Regenerate configure, because the one that is shipped
# doesn't seem to obey --disable-rpath for reasons unknown. # doesn't seem to obey --disable-rpath for reasons unknown.
autoreconf -i --force autoreconf -vif
%configure \ %configure \
--disable-rpath \ --disable-rpath \
--disable-silent-rules \ --disable-silent-rules \
@ -116,33 +115,17 @@ find %{buildroot} -type f -name "*.la" -delete
%find_lang %{name} %find_lang %{name}
%ldconfig_scriptlets glib
%post %post
%if 0%{?rhel} && 0%{?rhel} <= 7
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%systemd_post ModemManager.service %systemd_post ModemManager.service
%preun %preun
%systemd_preun ModemManager.service %systemd_preun ModemManager.service
%postun %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 %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 %files -f %{name}.lang
%license COPYING %license COPYING
%doc README %doc README
@ -185,6 +168,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/vala/vapi/libmm-glib.* %{_datadir}/vala/vapi/libmm-glib.*
%changelog %changelog
* Sat Jan 16 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.10-1
- Update to 1.14.10
- Spec clean up
* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-2 * Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-2
- Drop unneeded libxslt dependency - Drop unneeded libxslt dependency

View File

@ -1 +1 @@
SHA512 (ModemManager-1.14.8.tar.xz) = 2457214fecd7d4d9fef291f756ef19973b98a05d07721cd57bdaee704cd6b9e96d27f6741bd8d245a0495f1d338e65db12f19b2d9a8dd6a5cddfb050614381c6 SHA512 (ModemManager-1.14.10.tar.xz) = 958fa7d5a44a924e6519b619b6b7547085191610b977e863372b83ae0f86ba2af07def0b27986d4f518dfb94cdcaeef005f1a8d3e96e548b7019da0dd89a1bea