Compare commits

..

3 Commits
rawhide ... f20

Author SHA1 Message Date
Dan Williams db87546350 Enable vala bindings 2013-09-13 12:42:16 -05:00
Dan Williams 1060ea265a Build with MBIM support 2013-09-13 12:18:10 -05:00
Dan Williams 32b95fd6e5 Fix udev rules path, remove 'dia' build requires 2013-08-26 16:30:53 -05:00
4 changed files with 107 additions and 321 deletions

31
.gitignore vendored
View File

@ -1 +1,30 @@
/ModemManager-*.tar.xz
ModemManager-0.2-20090707.tar.bz2
ModemManager-0.2-20090826.tar.bz2
ModemManager-0.2-20091105.tar.bz2
ModemManager-0.2.997.tar.bz2
ModemManager-0.2.997.git20091214.tar.bz2
ModemManager-0.2.997.git20091216.tar.bz2
ModemManager-0.2.997.git20091218.tar.bz2
ModemManager-0.2.997.git20100101.tar.bz2
ModemManager-0.3.git20100119.tar.bz2
ModemManager-0.3.git20100211.tar.bz2
ModemManager-0.3.git20100317.tar.bz2
ModemManager-0.3.git20100323.tar.bz2
ModemManager-0.3.git20100331.tar.bz2
ModemManager-0.3.git20100405.tar.bz2
ModemManager-0.3.git20100408.tar.bz2
ModemManager-0.3.git20100409.tar.bz2
ModemManager-0.3.git20100502.tar.bz2
ModemManager-0.3.git20100504.tar.bz2
ModemManager-0.3.git20100507.tar.bz2
ModemManager-0.4.git20100628.tar.bz2
ModemManager-0.4.git20100630.tar.bz2
ModemManager-0.4.git20100720.tar.bz2
/ModemManager-0.4.git20110201.tar.bz2
/ModemManager-0.5.1.96.tar.bz2
/ModemManager-0.5.999.tar.bz2
/ModemManager-0.7.990.git20130515.tar.bz2
/ModemManager-0.7.991.git20130607.tar.bz2
/ModemManager-0.7.991.git20130710.tar.xz
/ModemManager-1.0.1.git20130723.tar.xz
/ModemManager-1.1.0.git20130913.tar.xz

View File

@ -1,49 +1,37 @@
%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)
%global snapshot .git20130913
%global glib2_version 2.32
%global systemd_dir %{_prefix}/lib/systemd/system
%global hardened_build 1
Name: ModemManager
Version: 1.18.8
Release: 2%{?dist}
Summary: Mobile broadband modem management service
Name: ModemManager
Version: 1.1.0
Release: 2%{snapshot}%{?dist}
#
# Source from git://anongit.freedesktop.org/ModemManager/ModemManager
# tarball built with:
# ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
# make distcheck
#
Source: %{name}-%{version}%{snapshot}.tar.xz
License: GPLv2+
URL: http://www.freedesktop.org/wiki/Software/ModemManager/
Source: https://www.freedesktop.org/software/ModemManager/%{name}-%{version}.tar.xz
Group: System Environment/Base
# For mbim-proxy and qmi-proxy
Requires: libmbim-utils
Requires: libqmi-utils
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
URL: http://www.gnome.org/projects/NetworkManager/
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
Requires: glib2 >= %{glib2_version}
BuildRequires: glib2-devel >= %{glib2_version}
BuildRequires: libgudev1-devel >= 143
BuildRequires: automake autoconf intltool libtool
BuildRequires: intltool
BuildRequires: libxslt gtk-doc
BuildRequires: libqmi-devel >= 1.6
BuildRequires: libmbim-devel >= 1.5
BuildRequires: gobject-introspection-devel >= 0.10.3
BuildRequires: vala-tools vala-devel
# 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(post): systemd
Requires(postun): systemd
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: 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
%global __provides_exclude ^libmm-plugin-
Patch0: buildsys-hates-openpty.patch
%description
The ModemManager service manages WWAN modems and provides a consistent API for
@ -51,6 +39,7 @@ interacting with these devices to client applications.
%package devel
Summary: Libraries and headers for adding ModemManager support to applications
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: pkgconfig
@ -60,6 +49,7 @@ from applications.
%package glib
Summary: Libraries for adding ModemManager support to applications that use glib.
Group: Development/Libraries
Requires: glib2 >= %{glib2_version}
%description glib
@ -68,6 +58,7 @@ functionality from applications that use glib.
%package glib-devel
Summary: Libraries and headers for adding ModemManager support to applications that use glib.
Group: Development/Libraries
Requires: %{name}%{?_isa} = %{version}-%{release}
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
@ -80,6 +71,7 @@ from glib applications.
%package vala
Summary: Vala bindings for ModemManager
Group: Development/Libraries
Requires: vala
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
@ -87,55 +79,57 @@ Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Vala bindings for ModemManager
%prep
%autosetup -p1
%setup -q
%patch0 -p1 -b .pty
%build
# Regenerate configure, because the one that is shipped
# doesn't seem to obey --disable-rpath for reasons unknown.
autoreconf -vif
autoreconf -i --force
intltoolize --force
%configure \
--disable-rpath \
--disable-silent-rules \
--with-systemd-suspend-resume \
--with-systemd-journal \
--enable-more-warnings=no \
--enable-more-warnings=error \
--with-udev-base-dir=%{_prefix}/lib/udev \
--enable-gtk-doc \
--enable-gtk-doc=yes \
--with-qmi=yes \
--with-mbim=yes \
%ifarch aarch64
--enable-plugin-qcom-soc \
%endif
--disable-static \
--with-polkit=permissive \
--with-polkit=no \
--with-dist-version=%{version}-%{release}
%make_build
make %{?_smp_mflags}
%check
# make check
make check
%install
%make_install
make install DESTDIR=$RPM_BUILD_ROOT
find %{buildroot} -type f -name "*.la" -delete
%find_lang %{name}
%ldconfig_scriptlets glib
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/*.la
%post
touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
%systemd_post ModemManager.service
%preun
%systemd_preun ModemManager.service
%postun
%systemd_postun ModemManager.service
/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
%systemd_postun
%files -f %{name}.lang
%license COPYING
%doc README
%posttrans
gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%post glib -p /sbin/ldconfig
%postun glib -p /sbin/ldconfig
%files
%doc COPYING README
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.ModemManager1.conf
%{_datadir}/dbus-1/system-services/org.freedesktop.ModemManager1.service
%attr(0755,root,root) %{_sbindir}/ModemManager
@ -143,23 +137,18 @@ find %{buildroot} -type f -name "*.la" -delete
%dir %{_libdir}/%{name}
%attr(0755,root,root) %{_libdir}/%{name}/*.so*
%{_udevrulesdir}/*
%{_datadir}/polkit-1/actions/*.policy
%{_unitdir}/ModemManager.service
%{_datadir}/dbus-1/interfaces/*.xml
%{systemd_dir}/ModemManager.service
%{_datadir}/icons/hicolor/22x22/apps/*.png
%{_datadir}/bash-completion
%{_datadir}/ModemManager
%{_mandir}/man1/*
%{_mandir}/man8/*
%files devel
%{_includedir}/ModemManager/
%{_includedir}/ModemManager/*.h
%dir %{_datadir}/gtk-doc/html/%{name}
%{_datadir}/gtk-doc/html/%{name}/*
%{_libdir}/pkgconfig/%{name}.pc
%{_datadir}/dbus-1/interfaces/*.xml
%files glib
%license COPYING
%{_libdir}/libmm-glib.so.*
%{_libdir}/girepository-1.0/*.typelib
@ -176,250 +165,6 @@ find %{buildroot} -type f -name "*.la" -delete
%{_datadir}/vala/vapi/libmm-glib.*
%changelog
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Sat May 14 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.8-1
- Update to 1.18.8
* Sat Feb 12 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.6-1
- Update to 1.18.6
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.18.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Sun Sep 19 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.2-1
- update to 1.18.2
* Mon Sep 13 2021 Thomas Haller <thaller@redhat.com> - 1.18.0-2
- depend ModemManager on polkit package
* Sun Sep 12 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.18.0-1
- Update to 1.18.0
* Sat Aug 14 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.17.900-1
- Update to 1.18.0 RC1
* Wed Aug 04 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.8-4
- Rebuild for new libmbim/libqmi
* Thu Jul 29 2021 Bastien Nocera <bnocera@redhat.com> - 1.16.8-3
+ ModemManager-1.16.8-3
- Add polkit support as used upstream
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Sat Jul 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.8-1
- Update to 1.16.8
* Mon Jun 07 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.6-1
- Update to 1.16.6
* Fri Apr 30 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 1.16.4-1
- Update to 1.16.4
* Mon Jan 25 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.10-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* 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
- Drop unneeded libxslt dependency
* Mon Dec 28 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.8-1
- Update to 1.14.8
* Tue Nov 3 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.6-1
- Update to 1.14.6
* Thu Aug 20 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.2-1
- Update to 1.14.2
* Mon Jul 27 2020 Peter Robinson <pbrobinson@fedoraproject.org> - 1.14.0-1
- Update to 1.14.0
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.12.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Mar 24 2020 Lubomir Rintel <lkundrak@v3.sk> - 1.12.8-1
- Update to 1.12.8 release
* Thu Mar 5 2020 Peter Robinson <pbrobinson@fedoraproject.org> 1.12.6-1
- Update to 1.12.6 release
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Nov 29 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.8-1
- Update to 1.10.8 release
* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-2
- Don't grab cdc_ether devices on Sierra QMI modems
* Mon Sep 23 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.6-1
- Update to 1.10.6 release
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Wed Jul 10 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.4-1
- Update to 1.10.4 release
* Fri Jun 14 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.2-1
- Update to 1.10.2 release
- Don't grab cdc_ether devices on Sierra QMI modems
* Wed Mar 27 2019 Richard Hughes <richard@hughsie.com> 1.10.0-1
- Update to the release tarball.
* Mon Feb 04 2019 Kalev Lember <klember@redhat.com> - 1.10.0-0.3.rc1
- Update BRs for vala packaging changes
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.0-0.2.rc1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Jan 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.10.0-0.1.rc1
- Update to 1.10 release candidate 1
* Tue Jan 15 2019 Lubomir Rintel <lkundrak@v3.sk> - 1.8.2-1
- Update to 1.8.2 release
* Tue Jul 31 2018 Florian Weimer <fweimer@redhat.com> - 1.8.0-4
- Rebuild with fixed binutils
* Sun Jul 29 2018 Rex Dieter <rdieter@fedoraproject.org> - 1.8.0-3
- -devel: own %%_includedir/ModemManager/
- %%build: --disable-silent-rules
- use %%make_build %%make_install
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Sun Jun 03 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.0-1
- Update to 1.8.0 release
* Tue Apr 24 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.8.0-0.rc2.1
- Update to 1.8 release candidate 2
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.12-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Sat Feb 03 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.12-2
- Switch to %%ldconfig_scriptlets
* Mon Jan 22 2018 Lubomir Rintel <lkundrak@v3.sk> - 1.6.12-1
- Update to 1.6.12 release
- Require libmbim and libqmi we were built with (rh #1534945)
- Restore the scriptlets where they are needed
* Fri Jan 05 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 1.6.10-2
- Remove obsolete scriptlets
* Sun Oct 22 2017 Lubomir Rintel <lkundrak@v3.sk> - 1.6.10-1
- Update to 1.6.10 release
* Tue Aug 29 2017 Lubomir Rintel <lkundrak@v3.sk> - 1.6.8-1
- Update to 1.6.8 release
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Tue Nov 15 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6.4-1
- Update to 1.6.4 release
* Tue Oct 04 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6.2-1
- Update to 1.6.2 release
* Tue Jul 26 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6.0-1
- Update to 1.6.0 release
* Fri Jul 08 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6-0.4.rc4
- Enable suspend/resume support (rh#1341303)
* Fri Jul 08 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6-0.3.rc4
- Update to 1.6 release candidate 4
* Mon May 02 2016 Francesco Giudici <fgiudici@redhat.com> - 1.6-0.3.rc3
- Update to 1.6 release candidate 3
* Tue Apr 12 2016 Than Ngo <than@redhat.com> - 1.6-0.3.rc2
- add better fix for big endian issue on s390x/ppc64
* Thu Apr 07 2016 Than Ngo <than@redhat.com> - 1.6-0.2.rc2
- fix big endian issue on s390x/ppc64
* Fri Mar 25 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6-0.1.rc2
- Update to 1.6 release candidate 2
* Mon Mar 21 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.6-0.1.rc1
- Update to 1.6 release candidate
* Mon Mar 21 2016 Lubomir Rintel <lkundrak@v3.sk> - 1.4.14-1
- Update to 1.4.14 release
* Mon Feb 29 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 1.4.10-4
- Disable -Werror (#1307284)
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.10-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Sep 07 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.10-2
- Ensure systemctl's around when we preset the service (rh #1227424)
* Tue Aug 18 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.10-1
- Update to 1.4.10 release
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.4.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sun Mar 29 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.6-1
- Update to 1.4.6 release
* Mon Mar 2 2015 Dan Williams <dcbw@redhat.com> - 1.4.4-2
- Don't print location information in logs (rh #1194492)
* Wed Feb 11 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.4.4-1
- Update to 1.4.4 release
* Thu Jan 15 2015 Dan Williams <dcbw@redhat.com> - 1.4.2-1
- Update to 1.4.2 release
* Wed Aug 27 2014 Dan Williams <dcbw@redhat.com> - 1.4.0-1
- Update to 1.4.0 release
- Quiet debug messages about access technology changes
- Improve network time support for Huawei 3GPP devices
- Always use DHCP for QMI bearers (fixes some Huawei devices)
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Tue Aug 5 2014 Dan Williams <dcbw@redhat.com> - 1.3.0-1
- Update to git development snapshot
- Add IPv6 support for many devices
- Updated blacklist for non-modem USB devices
- Support for more MBIM devices from various manufacturers
- Support for more Huawei devices with network ports
- Add new "unmanaged" GPS location mode
- Many bug fixes for various modems
* Tue Jul 22 2014 Kalev Lember <kalevlember@gmail.com> - 1.2.0-3
- Rebuilt for gobject-introspection 1.41.4
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Feb 1 2014 poma <poma@gmail.com> - 1.2.0-1
- Update to 1.2.0 release
* Fri Sep 13 2013 Dan Williams <dcbw@redhat.com> - 1.1.0-2.git20130913
- Build with MBIM support
- Enable Vala bindings

View File

@ -0,0 +1,12 @@
diff -up ModemManager-0.4.998/src/tests/Makefile.am.foo ModemManager-0.4.998/src/tests/Makefile.am
--- ModemManager-0.4.998/src/tests/Makefile.am.foo 2011-07-06 17:59:53.711343366 -0500
+++ ModemManager-0.4.998/src/tests/Makefile.am 2011-07-06 18:00:08.971152593 -0500
@@ -45,7 +45,6 @@ if WITH_TESTS
noinst_PROGRAMS = \
test-modem-helpers \
test-charsets \
- test-qcdm-serial-port \
test-at-serial-port \
test-sms-part

View File

@ -1 +1 @@
SHA512 (ModemManager-1.18.8.tar.xz) = fd853ad5ecd018303850f506cd75025bc0cad90d7a003b082178f7495b8763e71675ac34428d09002bf5d06963030d2ee5b84a1c888c959b03f00cddb1cdaf4c
055f12a1dbfc41cc4ca053c3d6ec2eee ModemManager-1.1.0.git20130913.tar.xz