diff --git a/upower-0.99.11-libplist-2.0.patch b/upower-0.99.11-libplist-2.0.patch new file mode 100644 index 0000000..854cc52 --- /dev/null +++ b/upower-0.99.11-libplist-2.0.patch @@ -0,0 +1,11 @@ +--- upower-0.99.11/configure.ac 2019-07-07 01:29:27.000000000 -0700 ++++ upower-0.99.11/configure.ac.new 2020-06-16 23:53:21.290122829 -0700 +@@ -203,7 +203,7 @@ + AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without libimobiledevice]), + with_idevice=$withval,with_idevice=yes) + AS_IF([test "x$with_idevice" != "xno"], +- [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist >= 0.12, have_idevice=yes, have_idevice=no)], ++ [PKG_CHECK_MODULES(IDEVICE, libimobiledevice-1.0 >= 0.9.7 libplist-2.0 >= 0.12, have_idevice=yes, have_idevice=no)], + [have_idevice=no]) + AS_IF([test "x$have_idevice" = "xyes"], + [AC_DEFINE(HAVE_IDEVICE, 1, [Define to 1 if iDevice is going to be built])]) diff --git a/upower.spec b/upower.spec index 5dd5062..71248ec 100644 --- a/upower.spec +++ b/upower.spec @@ -2,10 +2,13 @@ Summary: Power Management Service Name: upower Version: 0.99.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: http://upower.freedesktop.org/ Source0: https://gitlab.freedesktop.org/upower/upower/uploads/%{commit}/%{name}-%{version}.tar.xz +# update libplist test in configure.ac for 2.2.0 +# not upstreamed yet as it needs to be smarter +Patch0: upower-0.99.11-libplist-2.0.patch BuildRequires: sqlite-devel BuildRequires: libtool @@ -19,6 +22,11 @@ BuildRequires: glib2-devel >= 2.6.0 BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc BuildRequires: systemd +# Only required while we're patching configure.ac +BuildRequires: autoconf +BuildRequires: automake +BuildRequires: gettext-devel + Requires: udev Requires: gobject-introspection @@ -50,6 +58,7 @@ Developer documentation for for libupower-glib. %autosetup -p1 %build +autoreconf -i %configure \ --enable-gtk-doc \ --disable-static \ @@ -114,6 +123,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_datadir}/gtk-doc/html/UPower/* %changelog +* Tue Jun 16 2020 Adam Williamson - 0.99.11-4 +- Fix imobiledevice support with new libplist, rebuild for soname bumps + * Fri Jan 31 2020 Fedora Release Engineering - 0.99.11-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild