diff --git a/.gitignore b/.gitignore index 3b8e5b1..2308e83 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libmbim-1.20.2.tar.xz +SOURCES/libmbim-1.26.0.tar.xz diff --git a/.libmbim.metadata b/.libmbim.metadata index 97a2f33..803b304 100644 --- a/.libmbim.metadata +++ b/.libmbim.metadata @@ -1 +1 @@ -7c4394063a4ef8ba02ab117f891e721ab5ea1dd4 SOURCES/libmbim-1.20.2.tar.xz +bd963a9e82da47d993272640ecf1ea8d3301d4e0 SOURCES/libmbim-1.26.0.tar.xz diff --git a/SPECS/libmbim.spec b/SPECS/libmbim.spec index cc0aed8..ad6a22b 100644 --- a/SPECS/libmbim.spec +++ b/SPECS/libmbim.spec @@ -1,20 +1,18 @@ -%global _hardened_build 1 - Name: libmbim +Version: 1.26.0 +Release: 2%{?dist} Summary: Support library for the Mobile Broadband Interface Model protocol -Version: 1.20.2 -Release: 1%{?dist} License: LGPLv2+ URL: http://freedesktop.org/software/libmbim Source: http://freedesktop.org/software/libmbim/%{name}-%{version}.tar.xz -BuildRequires: gcc -BuildRequires: glib2-devel -BuildRequires: pkgconfig BuildRequires: automake autoconf libtool -BuildRequires: python3-devel -BuildRequires: pkgconfig(gudev-1.0) >= 147 +BuildRequires: gcc +BuildRequires: glib2-devel >= 2.48.0 BuildRequires: gtk-doc +BuildRequires: make +BuildRequires: pkgconfig +BuildRequires: python3 %description @@ -34,6 +32,7 @@ applications using MBIM functionality from applications that use glib. %package utils Summary: Utilities to use the MBIM protocol from the command line Requires: %{name}%{?_isa} = %{version}-%{release} +Conflicts: %{name} < 1.26.0 License: GPLv2+ %description utils @@ -42,50 +41,56 @@ functionality from the command line. %prep -%setup -q -# Fix python shebangs -pathfix.py -i %{__python3} -pn build-aux/mbim-codegen/*.py \ - build-aux/mbim-codegen/mbim-codegen +%autosetup -p1 + %build %configure --disable-static --enable-gtk-doc -V=1 make %{?_smp_mflags} +%{make_build} %install -make install INSTALL="install -p" DESTDIR=%{buildroot} +%{make_install} find %{buildroot}%{_datadir}/gtk-doc |xargs touch --reference configure.ac +find %{buildroot} -type f -name "*.la" -delete %check make check -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%ldconfig_scriptlets %files -%doc COPYING NEWS AUTHORS README +%license COPYING.LIB +%doc NEWS AUTHORS README %{_libdir}/libmbim-glib.so.4* -%exclude %{_libdir}/libmbim-glib.la -%{_datadir}/bash-completion - %files devel %{_includedir}/libmbim-glib/ %{_libdir}/pkgconfig/mbim-glib.pc %{_libdir}/libmbim-glib.so -%dir %{_datadir}/gtk-doc/html/libmbim-glib -%{_datadir}/gtk-doc/html/libmbim-glib/* +%{_datadir}/gtk-doc/html/libmbim-glib/ %files utils +%license COPYING %{_bindir}/mbimcli %{_bindir}/mbim-network -%{_mandir}/man1/* +%{_datadir}/bash-completion %{_libexecdir}/mbim-proxy +%{_mandir}/man1/mbim* %changelog +* Thu Oct 7 2021 Ana Cabral - 1.26.0-2 +- Add Conflicts tag because the bash-completion scripts moved + from the main package to the utils sub package causing a file + conflict on multilib systems between the old 32 bit main + package and the new 64 bit utils sub package. + +* Thu Sep 30 2021 Ana Cabral - 1.26.0-1 +- Upgrade to 1.26.0 release + * Fri Nov 29 2019 Lubomir Rintel - 1.20.2-1 - Update to 1.20.2 release