|
@@ -8,7 +8,7 @@
|
|
|
Name: ModemManager
|
|
|
Summary: Mobile broadband modem management service
|
|
|
Summary(ja): モバイルブロードバンドモデム運用サービス
|
|
|
-Version: 1.14.10
|
|
|
+Version: 1.20.6
|
|
|
Release: 1%{git_snapshot}%{?_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: network,system
|
|
|
Vendor: Project Vine
|
|
@@ -16,28 +16,24 @@ Distribution: Vine Linux
|
|
|
|
|
|
License: GPLv2+
|
|
|
URL: https://www.freedesktop.org/wiki/Software/ModemManager/
|
|
|
-Source: https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
|
|
|
-
|
|
|
-Patch0: buildsys-hates-openpty.patch
|
|
|
-Patch1: ModemManager-1.8.2-elogind-1.patch
|
|
|
+Source: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/%{version}/ModemManager-%{version}.tar.bz2
|
|
|
+#https://www.freedesktop.org/software/%{name}/%{name}-%{version}.tar.xz
|
|
|
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
|
|
BuildRequires: glib2-devel >= %{glib2_version}
|
|
|
-BuildRequires: automake autoconf intltool libtool
|
|
|
+BuildRequires: meson
|
|
|
BuildRequires: gobject-introspection-devel
|
|
|
-BuildRequires: vala-devel
|
|
|
-BuildRequires: vala-tools
|
|
|
+BuildRequires: vala
|
|
|
+BuildRequires: vala-libs
|
|
|
BuildRequires: polkit-devel
|
|
|
-BuildRequires: gtk-doc
|
|
|
+BuildRequires: dbus-devel
|
|
|
# for xsltproc
|
|
|
BuildRequires: libxslt
|
|
|
%if %{with systemd}
|
|
|
BuildRequires: systemd-devel
|
|
|
%{?systemd_requires}
|
|
|
-%else
|
|
|
-BuildRequires: libgudev-devel
|
|
|
-BuildRequires: elogind-devel
|
|
|
%endif
|
|
|
+BuildRequires: libgudev-devel
|
|
|
Requires: dbus-glib
|
|
|
|
|
|
%description
|
|
@@ -85,48 +81,48 @@ Header files and libraries for building a extension library for the %{name}-glib
|
|
|
|
|
|
%prep
|
|
|
%setup -q
|
|
|
-%patch0 -p1 -b .pty
|
|
|
-%if !%{with systemd}
|
|
|
-%patch1 -p1 -b .elogind
|
|
|
-%endif
|
|
|
|
|
|
|
|
|
%build
|
|
|
-autoreconf -vif
|
|
|
-#pppddir=`ls -1d %{_libdir}/pppd/2*`
|
|
|
-%configure \
|
|
|
- --disable-static \
|
|
|
- --enable-gtk-doc=yes \
|
|
|
- --enable-vala=yes \
|
|
|
- --enable-more-warnings=yes \
|
|
|
- --with-udev-base-dir=/lib/udev \
|
|
|
- --without-mbim \
|
|
|
- --without-qmi \
|
|
|
- --with-dist-version=%{version}-%{release} \
|
|
|
+%meson \
|
|
|
+ -Ddist_version='"%{version}-%{release}"' \
|
|
|
+ -Dvapi=true \
|
|
|
+ -Dudevdir=/lib/udev \
|
|
|
+ -Dpolkit=permissive \
|
|
|
+ -Dbash_completion=false \
|
|
|
+ -Dgtk_doc=false \
|
|
|
+ -Dmbim=false \
|
|
|
+ -Dqmi=false \
|
|
|
+ -Dqrtr=false \
|
|
|
+ -Dplugin_fibocom=disabled \
|
|
|
+ -Dplugin_foxconn=disabled \
|
|
|
+ -Dplugin_qcom_soc=disabled \
|
|
|
%if %{with systemd}
|
|
|
- --with-systemdsystemunitdir=%{_unitdir}
|
|
|
+ -Dsystemd_journal=true \
|
|
|
+ -Dsystemd_suspend_resume=true \
|
|
|
+ -Dsystemdsystemunitdir=%{_unitdir} \
|
|
|
%else
|
|
|
- --with-elogind-suspend-resume=yes
|
|
|
+ -Dsystemd_journal=false \
|
|
|
+ -Dsystemd_suspend_resume=false \
|
|
|
+ -Dsystemdsystemunitdir="no" \
|
|
|
%endif
|
|
|
+ %{nil}
|
|
|
|
|
|
+%meson_build
|
|
|
|
|
|
-make %{?_smp_mflags}
|
|
|
-
|
|
|
-%check
|
|
|
-make check
|
|
|
|
|
|
%install
|
|
|
-make install DESTDIR=$RPM_BUILD_ROOT
|
|
|
+%meson_install
|
|
|
+%find_lang %{name}
|
|
|
+mkdir -p %{buildroot}%{_datadir}/bash-completion/completions/
|
|
|
+cp -a cli/mmcli-completion %{buildroot}%{_datadir}/bash-completion/completions/mmcli
|
|
|
|
|
|
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
|
|
|
-#rm -f $RPM_BUILD_ROOT%{_libdir}/pppd/2.*/*.so
|
|
|
|
|
|
-%find_lang %{name}
|
|
|
+%check
|
|
|
+
|
|
|
|
|
|
-%post
|
|
|
-/sbin/ldconfig
|
|
|
-touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%if %{with systemd}
|
|
|
+%post
|
|
|
%systemd_post ModemManager.service
|
|
|
%endif
|
|
|
|
|
@@ -135,22 +131,11 @@ touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%systemd_preun ModemManager.service
|
|
|
%endif
|
|
|
|
|
|
-%postun
|
|
|
-/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
|
|
|
%if %{with systemd}
|
|
|
+%postun
|
|
|
%systemd_postun ModemManager.service
|
|
|
%endif
|
|
|
|
|
|
-%posttrans
|
|
|
-gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
-
|
|
|
-%post glib -p /sbin/ldconfig
|
|
|
-%postun glib -p /sbin/ldconfig
|
|
|
-
|
|
|
|
|
|
%files -f %{name}.lang
|
|
|
%defattr(-,root, root,-)
|
|
@@ -181,9 +166,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%files devel
|
|
|
%defattr(-,root,root,-)
|
|
|
%{_includedir}/ModemManager/*.h
|
|
|
-%dir %{_datadir}/gtk-doc/html/%{name}
|
|
|
%{_datadir}/gir-1.0/ModemManager-1.0.gir
|
|
|
-%{_datadir}/gtk-doc/html/%{name}/*
|
|
|
%{_libdir}/pkgconfig/%{name}.pc
|
|
|
|
|
|
%files glib
|
|
@@ -199,11 +182,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
|
|
|
%dir %{_datadir}/vala
|
|
|
%dir %{_datadir}/vala/vapi
|
|
|
%{_datadir}/vala/vapi/libmm-glib.*
|
|
|
-%dir %{_datadir}/gtk-doc/html/libmm-glib
|
|
|
-%{_datadir}/gtk-doc/html/libmm-glib/*
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 21 2023 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.20.6-1
|
|
|
+- new upstream release.
|
|
|
+
|
|
|
* Mon Feb 15 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 1.14.10-1
|
|
|
- new upstream release.
|
|
|
|