commit 277bc5439bae037b9afa590f919c29b6467d4231
Author: Jakub Bogusz <[email protected]>
Date: Sun Sep 13 08:59:33 2020 +0200
- added libplist patch (adjust pkgconfig name for libplist 2.2.0+); release
11
upower-libplist.patch | 11 +++++++++++
upower-pm-utils.spec | 10 ++++++----
2 files changed, 17 insertions(+), 4 deletions(-)
---
diff --git a/upower-pm-utils.spec b/upower-pm-utils.spec
index 10b3d58..bf9838f 100644
--- a/upower-pm-utils.spec
+++ b/upower-pm-utils.spec
@@ -5,7 +5,7 @@ Summary: Power management service with pm-utils backend
Summary(pl.UTF-8): Usługa zarządzania energią z wykorzystaniem pm-utils
Name: %{orig_name}-pm-utils
Version: 0.9.23
-Release: 10
+Release: 11
Epoch: 1
License: GPL v2+
Group: Libraries
@@ -13,6 +13,7 @@ Source0:
http://upower.freedesktop.org/releases/%{orig_name}-%{version}.tar.xz
# Source0-md5: 39cfd97bfaf7d30908f20cf937a57634
Patch0: %{orig_name}-battery_range.patch
Patch1: %{orig_name}-glib-deprecated.patch
+Patch2: %{orig_name}-libplist.patch
URL: http://upower.freedesktop.org/
BuildRequires: autoconf >= 2.65
BuildRequires: automake >= 1:1.11
@@ -25,7 +26,7 @@ BuildRequires: gobject-introspection-devel >= 0.10.0
BuildRequires: gtk-doc >= 1.11
BuildRequires: intltool >= 0.40.0
BuildRequires: libimobiledevice-devel >= 0.9.7
-BuildRequires: libplist-devel >= 0.12
+BuildRequires: libplist-devel >= 2.2.0
BuildRequires: libtool >= 2:2
BuildRequires: libusb-devel >= 1.0.0
BuildRequires: pkgconfig
@@ -37,7 +38,7 @@ BuildRequires: xz
Requires(post,preun,postun): systemd-units >= 38
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: libimobiledevice >= 0.9.7
-Requires: libplist >= 0.12
+Requires: libplist >= 2.2.0
Requires: pm-utils
Requires: polkit >= 0.97
Requires: systemd-units >= 38
@@ -114,7 +115,7 @@ Requires: gtk-doc-common
Obsoletes: %{orig_name}-apidocs
Obsoletes: DeviceKit-power-apidocs
Obsoletes: UPower-apidocs
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
BuildArch: noarch
%endif
@@ -128,6 +129,7 @@ Dokumentacja API UPower.
%setup -q -n %{orig_name}-%{version}
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__gtkdocize}
diff --git a/upower-libplist.patch b/upower-libplist.patch
new file mode 100644
index 0000000..d421349
--- /dev/null
+++ b/upower-libplist.patch
@@ -0,0 +1,11 @@
+--- upower-0.9.23/configure.ac.orig 2020-09-13 08:29:33.403011165 +0200
++++ upower-0.9.23/configure.ac 2020-09-13 08:31:53.918916592 +0200
+@@ -200,7 +200,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 AFC is going to be
built])])
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/upower-pm-utils.git/commitdiff/277bc5439bae037b9afa590f919c29b6467d4231
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
