Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package upower for openSUSE:Factory checked
in at 2021-01-29 14:57:01
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/upower (Old)
and /work/SRC/openSUSE:Factory/.upower.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "upower"
Fri Jan 29 14:57:01 2021 rev:74 rq:867215 version:0.99.11
Changes:
--------
--- /work/SRC/openSUSE:Factory/upower/upower.changes 2020-05-04
18:38:56.468855997 +0200
+++ /work/SRC/openSUSE:Factory/.upower.new.28504/upower.changes 2021-01-29
14:57:14.501522156 +0100
@@ -1,0 +2,6 @@
+Mon Jan 25 13:10:08 UTC 2021 - Michal Suchanek <msucha...@suse.com>
+
+- Use libplist-2.0 on Tumblewewd.
+ + upower-build-Use-a-newer-libplist-if-available.patch
+
+-------------------------------------------------------------------
New:
----
upower-build-Use-a-newer-libplist-if-available.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ upower.spec ++++++
--- /var/tmp/diff_new_pack.p97HHM/_old 2021-01-29 14:57:16.009524375 +0100
+++ /var/tmp/diff_new_pack.p97HHM/_new 2021-01-29 14:57:16.013524381 +0100
@@ -1,7 +1,7 @@
#
# spec file for package upower
#
-# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,12 @@
#
+%if 0%{?suse_version} > 1500
+%define libplist2 1
+%else
+%define libplist2 0
+%endif
+
Name: upower
Version: 0.99.11
Release: 0
@@ -29,6 +35,8 @@
Patch0: upower-hibernate-insteadof-hybridsleep.patch
# PATCH-FEATURE-SLE upower-sle15.patch fcro...@suse.com -- Disable some
hardenings, don't work on SLE15 SP2+
Patch1: upower-sle15.patch
+# PATCH-FIX-UPSTREAM
https://gitlab.freedesktop.org/upower/upower/-/commit/694207d3f08bdd2095f01eee09eb523363800825
+Patch2: upower-build-Use-a-newer-libplist-if-available.patch
BuildRequires: gobject-introspection-devel >= 0.9.9
BuildRequires: gtk-doc >= 1.11
@@ -42,7 +50,11 @@
BuildRequires: pkgconfig(gobject-2.0)
BuildRequires: pkgconfig(gudev-1.0) >= 147
BuildRequires: pkgconfig(libimobiledevice-1.0) >= 0.9.7
+%if %libplist2
+BuildRequires: pkgconfig(libplist-2.0)
+%else
BuildRequires: pkgconfig(libplist) >= 0.12
+%endif
BuildRequires: pkgconfig(libusb-1.0) >= 1.0.0
BuildRequires: pkgconfig(systemd)
BuildRequires: pkgconfig(udev)
@@ -103,6 +115,7 @@
%if 0%{?sle_version}
%patch1 -p1
%endif
+%patch2 -p1
%build
NOCONFIGURE=1 ./autogen.sh
++++++ upower-build-Use-a-newer-libplist-if-available.patch ++++++
>From 694207d3f08bdd2095f01eee09eb523363800825 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <had...@hadess.net>
Date: Tue, 16 Jun 2020 14:04:25 +0200
Subject: [PATCH] build: Use a newer libplist if available
Upstream: accepted
Git-commit: 694207d3f08bdd2095f01eee09eb523363800825
---
configure.ac | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/configure.ac b/configure.ac
index a96b794..5f08d91 100644
--- a/configure.ac
+++ b/configure.ac
@@ -202,8 +202,10 @@ if test x$with_backend = xlinux; then
PKG_CHECK_MODULES(USB, [libusb-1.0 >= 1.0.0])
AC_ARG_WITH(idevice, AS_HELP_STRING([--without-idevice],[Build without
libimobiledevice]),
with_idevice=$withval,with_idevice=yes)
+ LIBPLIST_DEP=libplist
+ PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0)
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_DEP, 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])])
--
2.29.2
