rpms/upower
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix imobiledevice support with new libplist, rebuild for soname bumps

Browse Source
This commit is contained in:
Adam Williamson 2020-06-16 23:56:09 -07:00
parent c6195fd4aa
commit 9b230b03d9
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
upower-0.99.11-libplist-2.0.patch Normal file
View File

@ -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])])

14
upower.spec
View File

@ -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 <awilliam@redhat.com> - 0.99.11-4
- Fix imobiledevice support with new libplist, rebuild for soname bumps
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild