diff --git a/ModemManager-1.22.0.tar.bz2 b/ModemManager-1.22.0.tar.bz2 deleted file mode 100644 index d4f4a54130eebe69c43961724281fcb4ad4754b4..0000000000000000000000000000000000000000 Binary files a/ModemManager-1.22.0.tar.bz2 and /dev/null differ diff --git a/ModemManager-1.24.2.tar.bz2 b/ModemManager-1.24.2.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..96e5301a318dd4031b2b5aa1a0bbfee9fc2fc012 Binary files /dev/null and b/ModemManager-1.24.2.tar.bz2 differ diff --git a/ModemManager.spec b/ModemManager.spec index e6bb26008676e42145286310be5f22ffcfcb43ba..fa388bd6a7ca295c4921048acad9a5f3e5dd68db 100644 --- a/ModemManager.spec +++ b/ModemManager.spec @@ -2,23 +2,35 @@ %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) - Name: ModemManager -Version: 1.22.0 -Release: 2 +Version: 1.24.2 +Release: 1 Summary: Mobile broadband modem manager -License: GPLv2+ +License: GPL-2.0-or-later URL: https://www.freedesktop.org/wiki/Software/ModemManager/ -Source: https://gitlab.com/linux-mobile-broadband/ModemManager/-/archive/%{version}/%{name}-%{version}.tar.bz2 - -BuildRequires: meson >= 0.53 dbus-devel gtk-doc vala-tools vala-devel -BuildRequires: gettext-devel glib2-devel gobject-introspection-devel libgudev-devel -BuildRequires: libqmi-devel >= 1.34.0 libmbim-devel >= 1.30.0 systemd-devel systemd -BuildRequires: python3-gobject python3-dbus pkgconfig(polkit-gobject-1) +Source: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/%{version}/ModemManager-%{version}.tar.bz2 +BuildRequires: meson >= 0.53.0 +BuildRequires: pkgconfig(dbus-1) +BuildRequires: pkgconfig(gio-2.0) +BuildRequires: pkgconfig(gio-unix-2.0) +BuildRequires: pkgconfig(glib-2.0) >= 2.56 +BuildRequires: pkgconfig(gmodule-2.0) +BuildRequires: pkgconfig(gobject-2.0) +BuildRequires: pkgconfig(gobject-introspection-1.0) >= 0.9.6 +BuildRequires: pkgconfig(gudev-1.0) >= 232 +BuildRequires: pkgconfig(libsystemd) >= 209 +BuildRequires: pkgconfig(mbim-glib) >= 1.32.0 +BuildRequires: pkgconfig(polkit-gobject-1) >= 0.97 +BuildRequires: pkgconfig(qmi-glib) >= 1.36.0 +BuildRequires: gtk-doc +BuildRequires: vala +BuildRequires: /usr/bin/msgfmt +BuildRequires: python3dist(pygobject) Requires: libmbim-utils libqmi-utils glib2 >= %{glib2_version} Requires: libmbim >= %{mbim_version} libqmi >= %{qmi_version} Requires: %{name}-glib = %{version}-%{release} +Conflicts: %{name}-help < 1.24.2 %{?systemd_requires} %description @@ -30,13 +42,15 @@ the modems and setup connections with them. %package devel Summary: Development package for ModemManager -Requires: %{name} = %{version}-%{release} pkgconfig +Requires: %{name} = %{version}-%{release} +Conflicts: %{name}-help < 1.24.2 %description devel %{name}-devel contains header files and libraries for %{name}. %package glib Summary: Libraries for applications using glib to use ModemManager +License: LGPL-2.1-or-later Requires: glib2 >= %{glib2_version} %description glib @@ -44,18 +58,17 @@ Libraries for applications using glib to use ModemManager. %package glib-devel Summary: Development package for applications using glib to use ModemManager -Requires: pkgconfig +License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Requires: %{name}-devel = %{version}-%{release} Requires: %{name}-glib = %{version}-%{release} -Requires: glib2-devel >= %{glib2_version} %description glib-devel Development package for applications using glib to use ModemManager. %package vala Summary: Vala bindings for ModemManager -Requires: vala +License: LGPL-2.1-or-later Requires: %{name}-glib = %{version}-%{release} %description vala @@ -68,12 +81,12 @@ Vala bindings for ModemManager %build %meson \ --Ddist_version='"%{version}-%{release}"' \ --Dvapi=true \ --Dqrtr=false \ --Dgtk_doc=true \ --Dpolkit=permissive \ --Dbash_completion=false + -Ddist_version='"%{version}-%{release}"' \ + -Dvapi=true \ + -Dqrtr=false \ + -Dgtk_doc=true \ + -Dpolkit=permissive \ + -Dbash_completion=false %meson_build %install @@ -82,7 +95,6 @@ find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference meson.build %find_lang %{name} mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/ cp -a cli/mmcli-completion %{buildroot}%{_datadir}/bash-completion/completions/mmcli -%delete_la %check %meson_test @@ -93,57 +105,50 @@ cp -a cli/mmcli-completion %{buildroot}%{_datadir}/bash-completion/completions/m %preun %systemd_preun ModemManager.service -%ldconfig_scriptlets glib - -%files -%defattr(-,root,root) +%files -f %{name}.lang %doc AUTHORS %license COPYING COPYING.LIB %{_bindir}/mmcli %{_sbindir}/ModemManager %dir %{_libdir}/%{name} %{_libdir}/%{name}/*.so -%{_datadir}/locale/* %{_udevrulesdir}/* %{_unitdir}/ModemManager.service +%{_datadir}/icons/hicolor/22x22/apps/*.png %{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service -%{_datadir}/bash-completion +%{_datadir}/bash-completion/* %{_datadir}/polkit-1/actions/org.freedesktop.ModemManager1.policy %{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf %{_datadir}/ModemManager %files devel -%defattr(-,root,root) %{_libdir}/pkgconfig/%{name}.pc %{_includedir}/ModemManager/ +%{_datadir}/dbus-1/interfaces/*.xml %files glib -%defattr(-,root,root) %{_libdir}/libmm-glib.so.* %{_libdir}/girepository-1.0/*.typelib %files glib-devel -%defattr(-,root,root) %{_libdir}/libmm-glib.so %{_libdir}/pkgconfig/mm-glib.pc %{_includedir}/libmm-glib/*.h -%{_datadir}/gtk-doc/html/libmm-glib/* %{_datadir}/gir-1.0/*.gir %files vala -%defattr(-,root,root) %{_datadir}/vala/vapi/libmm-glib.* %files help -%defattr(-,root,root) -%doc README NEWS +%doc README.md NEWS %{_mandir}/man8/* %{_mandir}/man1/* -%{_datadir}/icons/hicolor/22x22/apps/*.png -%{_datadir}/gtk-doc/html/*/* -%{_datadir}/dbus-1/interfaces/*.xml +%doc %{_datadir}/gtk-doc/html/* %changelog +* Tue Aug 05 2025 Funda Wang - 1.24.2-1 +- update to 1.24.2 + * Wed Mar 13 2024 panchenbo - 1.22.0-2 - Type:bugfix - ID:NA diff --git a/ModemManager.yaml b/ModemManager.yaml index cdf40cbc7673e9df464c91c7adb96d6ca1404f9a..7de8efc1c7ff08392ee07fcd74c8e3fcbb8753e3 100644 --- a/ModemManager.yaml +++ b/ModemManager.yaml @@ -1,4 +1,4 @@ version_control: git src_repo: https://gitlab.freedesktop.org/mobile-broadband/ModemManager -tag_prefix: ModemManager- -seperator: . +tag_prefix: +separator: .