X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ModemManager.spec;h=1c9fb8f05182ecd3a22c21d911cbc82cb9fac8dc;hb=d537ee123c4eb2c34514b657a6086e8d503f883f;hp=525b463f64b84692c7d32139004e504cbb9e874c;hpb=d074d5d60e15eb28dd775e7b5119a50d5c9b8bca;p=packages%2FModemManager.git

diff --git a/ModemManager.spec b/ModemManager.spec
index 525b463..1c9fb8f 100644
--- a/ModemManager.spec
+++ b/ModemManager.spec
@@ -5,42 +5,44 @@
 Summary:	Mobile broadband modem management service
 Summary(pl.UTF-8):	Usługa zarządzająca szerokopasmowymi modemami komórkowymi
 Name:		ModemManager
-Version:	1.12.4
+Version:	1.22.0
 Release:	1
 License:	GPL v2+
 Group:		Networking
-Source0:	https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.tar.xz
-# Source0-md5:	22280110d75c87a89786a317aa9cee04
+#Source0Download: https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/tags
+Source0:	https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/%{version}/%{name}-%{version}.tar.bz2
+# Source0-md5:	e967a452eb6f505a645df8c0582a17b7
 URL:		https://www.freedesktop.org/wiki/Software/ModemManager
-BuildRequires:	autoconf >= 2.63
-BuildRequires:	automake >= 1:1.11.2
+BuildRequires:	dbus-devel >= 1
 BuildRequires:	gettext-tools >= 0.19.8
-BuildRequires:	glib2-devel >= 1:2.36.0
+BuildRequires:	glib2-devel >= 1:2.56.0
 %if %(locale -a | grep -q '^C\.utf8$'; echo $?)
 BuildRequires:	glibc-localedb-all
 %endif
 BuildRequires:	gobject-introspection-devel >= 0.9.6
 BuildRequires:	gtk-doc >= 1.0
-BuildRequires:	libmbim-devel >= 1.18.0
-BuildRequires:	libqmi-devel >= 1.24.0
-BuildRequires:	libtool >= 2:2.2
+BuildRequires:	libgudev-devel >= 232
+BuildRequires:	libmbim-devel >= 1.30.0
+BuildRequires:	libqmi-devel >= 1.34.0
+BuildRequires:	libqrtr-glib-devel >= 1.0.0
+BuildRequires:	meson >= 0.53.0
+BuildRequires:	ninja >= 1.5
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.97
 BuildRequires:	ppp-plugin-devel >= 3:2.4.5
-BuildRequires:	rpmbuild(macros) >= 1.673
+BuildRequires:	rpm-build >= 4.6
+BuildRequires:	rpmbuild(macros) >= 1.752
 BuildRequires:	systemd-devel >= 1:209
-BuildRequires:	tar >= 1:1.22
-BuildRequires:	udev-glib-devel >= 1:147
 BuildRequires:	vala >= 2:0.18.0
-BuildRequires:	xz
 Requires(post,preun,postun):	systemd-units
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2 >= 1:2.36.0
+Requires:	glib2 >= 1:2.56.0
 Requires:	hicolor-icon-theme
-Requires:	libmbim >= 1.18.0
-Requires:	libqmi >= 1.24.0
+Requires:	libgudev >= 232
+Requires:	libmbim >= 1.30.0
+Requires:	libqmi >= 1.34.0
+Requires:	libqrtr-glib >= 1.0.0
 Requires:	polkit >= 0.97
-Requires:	udev-glib >= 1:147
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -57,6 +59,7 @@ Summary(pl.UTF-8):	Dopełnianie składni poleceń ModemManagera
 Group:		Applications/Shells
 Requires:	%{name} = %{version}-%{release}
 Requires:	bash-completion >= 2.0
+BuildArch:	noarch
 
 %description -n bash-completion-ModemManager
 Bash completion for ModemManager commands (mmcli).
@@ -68,7 +71,7 @@ Dopełnianie składni poleceń ModemManagera (mmcli).
 Summary:	Library to control and monitor the ModemManager
 Summary(pl.UTF-8):	Biblioteka do sterowania i monitorowania ModemManagera
 Group:		Libraries
-Requires:	glib2 >= 1:2.36.0
+Requires:	glib2 >= 1:2.56.0
 
 %description libs
 This package provides library to control and monitor the ModemManager.
@@ -82,7 +85,7 @@ Summary:	Header file defining ModemManager D-Bus interface
 Summary(pl.UTF-8):	Plik nagłówkowy opisujący interfejs D-Bus ModemManagera
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.36.0
+Requires:	glib2-devel >= 1:2.56.0
 
 %description devel
 Header file defining ModemManager D-Bus interface.
@@ -95,9 +98,7 @@ Summary:	API documentation for ModemManager
 Summary(pl.UTF-8):	Dokumentacja API ModemManagera
 Group:		Documentation
 Requires:	gtk-doc-common
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description apidocs
 API documentation for ModemManager.
@@ -111,9 +112,7 @@ Summary(pl.UTF-8):	API libmm-glib dla języka Vala
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}-%{release}
 Requires:	vala >= 2:0.18.0
-%if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
-%endif
 
 %description -n vala-libmm-glib
 libmm-glib API for Vala language.
@@ -125,32 +124,18 @@ API libmm-glib dla języka Vala.
 %setup -q
 
 %build
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-%configure \
-	%{__enable_disable apidocs gtk-doc} \
-	--disable-silent-rules \
-	--disable-static \
-	--enable-more-warnings \
-	--enable-vala \
-	--with-html-dir=%{_gtkdocdir} \
-	--with-polkit \
-	--with-suspend-resume=systemd
-
-LC_ALL=C.UTF-8 \
-%{__make}
+%meson build \
+	--default-library=shared \
+	%{?with_apidocs:-Dgtk_doc=true} \
+	-Dsystemdsystemunitdir=%{systemdunitdir} \
+	-Dvapi=true
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-%{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
-
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
+%ninja_install -C build
 
 %find_lang %{name}
 
@@ -159,7 +144,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 %update_icon_cache hicolor
-%systemd_service_enable ModemManager.service
+%systemd_post ModemManager.service
 
 %preun
 %systemd_preun ModemManager.service
@@ -173,20 +158,25 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README
+%doc AUTHORS NEWS README
 %attr(755,root,root) %{_bindir}/mmcli
 %attr(755,root,root) %{_sbindir}/ModemManager
 %dir %{_libdir}/ModemManager
+%dir %{_libdir}/ModemManager/fcc-unlock.d
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-altair-lte.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-anydata.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-broadmobi.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-cinterion.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-dell.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-dlink.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-ericsson-mbm.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-fibocom.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-foxconn.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-generic.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-gosuncn.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-haier.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-huawei.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-intel.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-iridium.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-linktop.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-longcheer.so
@@ -199,6 +189,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-novatel-lte.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-option.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-pantech.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-qcom-soc.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-quectel.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-samsung.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-sierra.so
@@ -212,6 +203,8 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-wavecom.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-x22x.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-plugin-zte.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-shared-fibocom.so
+%attr(755,root,root) %{_libdir}/%{name}/libmm-shared-foxconn.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-shared-icera.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-shared-novatel.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-shared-option.so
@@ -219,39 +212,47 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libmm-shared-telit.so
 %attr(755,root,root) %{_libdir}/%{name}/libmm-shared-xmm.so
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/mm-dell-dw5821e-carrier-mapping.conf
+%{_datadir}/%{name}/connection.available.d
+%{_datadir}/%{name}/fcc-unlock.available.d
+%{_datadir}/%{name}/mm-foxconn-t77w968-carrier-mapping.conf
+/lib/udev/rules.d/77-mm-broadmobi-port-types.rules
 /lib/udev/rules.d/77-mm-cinterion-port-types.rules
 /lib/udev/rules.d/77-mm-dell-port-types.rules
 /lib/udev/rules.d/77-mm-dlink-port-types.rules
 /lib/udev/rules.d/77-mm-ericsson-mbm.rules
 /lib/udev/rules.d/77-mm-fibocom-port-types.rules
+/lib/udev/rules.d/77-mm-foxconn-port-types.rules
+/lib/udev/rules.d/77-mm-gosuncn-port-types.rules
 /lib/udev/rules.d/77-mm-haier-port-types.rules
 /lib/udev/rules.d/77-mm-huawei-net-port-types.rules
+/lib/udev/rules.d/77-mm-linktop-port-types.rules
 /lib/udev/rules.d/77-mm-longcheer-port-types.rules
 /lib/udev/rules.d/77-mm-mtk-port-types.rules
 /lib/udev/rules.d/77-mm-nokia-port-types.rules
-/lib/udev/rules.d/77-mm-pcmcia-device-blacklist.rules
+/lib/udev/rules.d/77-mm-qcom-soc.rules
 /lib/udev/rules.d/77-mm-quectel-port-types.rules
 /lib/udev/rules.d/77-mm-sierra.rules
 /lib/udev/rules.d/77-mm-simtech-port-types.rules
 /lib/udev/rules.d/77-mm-telit-port-types.rules
 /lib/udev/rules.d/77-mm-tplink-port-types.rules
 /lib/udev/rules.d/77-mm-ublox-port-types.rules
-/lib/udev/rules.d/77-mm-usb-device-blacklist.rules
-/lib/udev/rules.d/77-mm-usb-serial-adapters-greylist.rules
 /lib/udev/rules.d/77-mm-x22x-port-types.rules
 /lib/udev/rules.d/77-mm-zte-port-types.rules
 /lib/udev/rules.d/80-mm-candidate.rules
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.ModemManager1.conf
+%dir %{_sysconfdir}/ModemManager
+%dir %{_sysconfdir}/ModemManager/fcc-unlock.d
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Bearer.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Call.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Firmware.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Location.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Messaging.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Modem3gpp.ProfileManager.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Modem3gpp.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.ModemCdma.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Oma.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Sar.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Simple.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Signal.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.ModemManager1.Modem.Time.xml