diff --git a/ModemManager-1.18.12.tar.xz b/ModemManager-1.18.12.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..737caa60ae55145621a025d14939fbf46cf969f5 Binary files /dev/null and b/ModemManager-1.18.12.tar.xz differ diff --git a/ModemManager-1.18.6.tar.xz b/ModemManager-1.18.6.tar.xz deleted file mode 100644 index 645467e7ad6fe50396e562ddfe164db67a278334..0000000000000000000000000000000000000000 Binary files a/ModemManager-1.18.6.tar.xz and /dev/null differ diff --git a/ModemManager.spec b/ModemManager.spec index de81c46d92b62b07cc1f84ffe7864541672e7f8e..d42cd1bf28fb048dc3d278b1f37d01b55cfd4a49 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -1,10 +1,8 @@ -%global glib2_version %(pkg-config --modversion glib-2.0 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) +%define anolis_release 1 Name: ModemManager -Version: 1.18.6 -Release: 2%{?dist} +Version: 1.18.12 +Release: %{anolis_release}%{?dist} Summary: Mobile broadband modem management service License: GPL-2.0+ URL: http://www.freedesktop.org/wiki/Software/ModemManager/ @@ -13,13 +11,7 @@ Source0: https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.ta # For mbim-proxy and qmi-proxy Requires: libmbim-utils Requires: libqmi-utils -Requires: %{name}-glib%{?_isa} = %{version}-%{release} - -# Don't allow older versions of these than what we built against, -# because they add new API w/o versioning it or bumping the SONAME -Conflicts: glib2%{?_isa} < %{glib2_version} -Conflicts: libqmi%{?_isa} < %{qmi_version} -Conflicts: libmbim%{?_isa} < %{mbim_version} +Requires: %{name}-glib = %{version}-%{release} Requires(post): systemd Requires(postun): systemd @@ -27,21 +19,24 @@ Requires(preun): systemd Requires: polkit -BuildRequires: automake autoconf libtool autoconf-archive BuildRequires: dbus BuildRequires: dbus-daemon -BuildRequires: gettext-devel >= 0.19.8 -BuildRequires: glib2-devel >= 2.56 -BuildRequires: gobject-introspection-devel >= 1.38 +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.56.0 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gudev-1.0) >= 232 +BuildRequires: pkgconfig(libsystemd) >= 209 +BuildRequires: pkgconfig(mbim-glib) >= 1.26.0 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97 +BuildRequires: pkgconfig(qmi-glib) >= 1.30.8 +BuildRequires: pkgconfig(qrtr-glib) >= 1.0.0 +BuildRequires: pkgconfig(systemd) +BuildRequires: gobject-introspection-devel >= 0.9.6 BuildRequires: gtk-doc -BuildRequires: libgudev1-devel >= 232 -BuildRequires: libmbim-devel >= 1.26.0 -BuildRequires: libqmi-devel >= 1.30.0 -BuildRequires: libqrtr-glib-devel >= 1.0.0 BuildRequires: make -BuildRequires: systemd-devel >= 209 BuildRequires: vala -BuildRequires: polkit-devel BuildRequires: python3-gobject BuildRequires: python3-dbus @@ -53,8 +48,7 @@ interacting with these devices to client applications. %package devel Summary: Libraries and headers for adding ModemManager support to applications -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig +Requires: %{name} = %{version}-%{release} %description devel This package contains various headers for accessing some ModemManager functionality @@ -62,7 +56,6 @@ from applications. %package glib Summary: Libraries for adding ModemManager support to applications that use glib. -Requires: glib2 >= %{glib2_version} %description glib This package contains the libraries that make it easier to use some ModemManager @@ -70,11 +63,9 @@ functionality from applications that use glib. %package glib-devel Summary: Libraries and headers for adding ModemManager support to applications that use glib. -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: %{name}-devel%{?_isa} = %{version}-%{release} -Requires: %{name}-glib%{?_isa} = %{version}-%{release} -Requires: glib2-devel >= %{glib2_version} -Requires: pkgconfig +Requires: %{name} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} %description glib-devel This package contains various headers for accessing some ModemManager functionality @@ -83,7 +74,7 @@ from glib applications. %package vala Summary: Vala bindings for ModemManager Requires: vala -Requires: %{name}-glib%{?_isa} = %{version}-%{release} +Requires: %{name}-glib = %{version}-%{release} %description vala Vala bindings for ModemManager @@ -92,9 +83,6 @@ Vala bindings for ModemManager %autosetup -p1 %build -# Regenerate configure, because the one that is shipped -# doesn't seem to obey --disable-rpath for reasons unknown. -autoreconf -vif %configure \ --disable-rpath \ --disable-silent-rules \ @@ -115,17 +103,14 @@ autoreconf -vif %make_build %check -make check +%make_build check %install %make_install -find %{buildroot} -type f -name "*.la" -delete %find_lang %{name} -%ldconfig_scriptlets glib - %post %systemd_post ModemManager.service @@ -178,6 +163,9 @@ find %{buildroot} -type f -name "*.la" -delete %{_datadir}/vala/vapi/libmm-glib.* %changelog +* Sun Jan 15 2023 Funda Wang - 1.18.12-1 +- New version 1.18.12 + * Mon Mar 14 2022 Yaobin Shi - 1.18.6-2 - Enable make check for Anolis OS 23 - Add BuildRequires python3-gobject and python3-dbus