Fix builds on PPC, ARM and S390

Update to 0.99.14

.gitignore

@@ -34,3 +34,5 @@ upower-0.9.5.tar.bz2
 /upower-0.99.10.tar.xz
 /upower-0.99.11.tar.xz
 /upower-0.99.12.tar.xz
+/upower-0.99.13.tar.xz
+/upower-v0.99.14.tar.bz2

build-fixes.patch

@@ -0,0 +1,100 @@
+From 8eb8ab1056e03b68634098b754c89c5a99f33c5c Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 5 Feb 2022 02:26:48 +0000
+Subject: [PATCH 1/2] build: Fix default udevrulesdir
+
+We need to append 'rules.d' to the udev_dir.
+---
+ meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index f87de19..3858cbe 100644
+--- a/meson.build
++++ b/meson.build
+@@ -90,7 +90,7 @@ endif
+ udevrulesdir = get_option('udevrulesdir')
+ if udevrulesdir == 'auto'
+     udev_dep = dependency('udev', required: true)
+-    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir')
++    udevrulesdir = udev_dep.get_pkgconfig_variable('udev_dir') / 'rules.d'
+ endif
+ 
+ dbusdir = get_option('datadir') / 'dbus-1'
+-- 
+2.34.1
+
+
+From 1dc74629ff24a2121f17f6e38b2c8067be0b7182 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <heftig@archlinux.org>
+Date: Sat, 5 Feb 2022 02:30:52 +0000
+Subject: [PATCH 2/2] build: Fix version macros
+
+The project version is a string. We need to split it into an array of
+version components.
+---
+ libupower-glib/meson.build | 11 ++++++++---
+ 1 file changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/libupower-glib/meson.build b/libupower-glib/meson.build
+index 1bab59b..2ff7baf 100644
+--- a/libupower-glib/meson.build
++++ b/libupower-glib/meson.build
+@@ -1,7 +1,12 @@
++version_arr = meson.project_version().split('.')
++major_version = version_arr[0].to_int()
++minor_version = version_arr[1].to_int()
++micro_version = version_arr[2].to_int()
++
+ cdata = configuration_data()
+-cdata.set('UP_MAJOR_VERSION', meson.project_version()[0])
+-cdata.set('UP_MINOR_VERSION', meson.project_version()[1])
+-cdata.set('UP_MICRO_VERSION', meson.project_version()[2])
++cdata.set('UP_MAJOR_VERSION', major_version)
++cdata.set('UP_MINOR_VERSION', minor_version)
++cdata.set('UP_MICRO_VERSION', micro_version)
+ 
+ up_version_h = configure_file(
+     output: 'up-version.h',
+-- 
+2.34.1
+
+From 7660d6d8850e37db8c7f0d06316a82e956e89e81 Mon Sep 17 00:00:00 2001
+From: Bastien Nocera <hadess@hadess.net>
+Date: Mon, 7 Feb 2022 11:09:21 +0100
+Subject: [PATCH] build: Fix missing libm link on some platforms
+
+This should fix the PPC64 and ARMv7 builds.
+---
+ meson.build     | 1 +
+ src/meson.build | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index c612953..be7658a 100644
+--- a/meson.build
++++ b/meson.build
+@@ -45,6 +45,7 @@ glib_dep = dependency('glib-2.0', version: '>=' + glib_min_version)
+ gobject_dep = dependency('gobject-2.0', version: '>=' + glib_min_version)
+ gio_dep = dependency('gio-2.0', version: '>=' + glib_min_version)
+ gio_unix_dep = dependency('gio-unix-2.0', version: '>=' + glib_min_version)
++m_dep = cc.find_library('m', required: true)
+ 
+ xsltproc = find_program('xsltproc', required: get_option('gtk-doc') or get_option('man'))
+ 
+diff --git a/src/meson.build b/src/meson.build
+index d0d8141..406f9cb 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -6,7 +6,7 @@ upowerd_deps = declare_dependency(
+         include_directories('../dbus'),
+     ],
+     dependencies: [
+-        glib_dep, gobject_dep, gio_dep, gio_unix_dep, libupower_glib_dep, upowerd_dbus_dep
++        m_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, libupower_glib_dep, upowerd_dbus_dep
+     ],
+     compile_args: [
+         '-DUP_COMPILATION',
+-- 
+2.34.1
+

sources

@@ -1 +1 @@
-SHA512 (upower-0.99.12.tar.xz) = 9858a0e5f65271522cc5f36b0cd8722a5fb3effba37dbc5b22f08606701d4242ee54329d07460768004a24dc42705a84140ac6d9691afb7f09584b2e61fe3413
+SHA512 (upower-v0.99.14.tar.bz2) = 8682528afb2af968a34bcde718ac53596ae04d1324b4aef98592799a506e69e17aa457887a4fbf2f4950ae9ee7c6b5519f32ec01b965142b7eed6750007f7158

tests/tests.yml

@@ -4,6 +4,8 @@
   - role: standard-test-source
     tags:
     - always
+    required_packages:
+    - git-core
   - role: standard-test-basic
     tags:
     - atomic
@@ -13,6 +15,7 @@
     - pygobject3-devel
     - python3-dbus
     - python3-dbusmock
+    - python3-packaging
     - umockdev-devel
     tests:
     - smoke:

upower.spec

@@ -1,16 +1,16 @@
 %global commit  93cfe7c8d66ed486001c4f3f55399b7a
 Summary:        Power Management Service
 Name:           upower
-Version:        0.99.12
-Release:        2%{?dist}
+Version:        0.99.14
+Release:        1%{?dist}
 License:        GPLv2+
 URL:            http://upower.freedesktop.org/
-Source0:        https://gitlab.freedesktop.org/upower/upower/uploads/244f5966c58773bbd3b4c507c549560f/upower-0.99.12.tar.xz
+Source0:        https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
+Patch0:         build-fixes.patch
 
-BuildRequires: make
+BuildRequires:  meson
 BuildRequires:  sqlite-devel
 BuildRequires:  git
-BuildRequires:  libtool
 BuildRequires:  gettext
 BuildRequires:  libgudev1-devel
 %ifnarch s390 s390x
@@ -22,10 +22,6 @@ 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
@@ -55,24 +51,21 @@ BuildArch: noarch
 Developer documentation for for libupower-glib.
 
 %prep
-%autosetup -p1 -S git
+%autosetup -n %{name}-v%{version} -p1 -S git
 
 %build
-autoreconf -i
-%configure \
-        --enable-gtk-doc \
-        --disable-static \
-        --enable-introspection \
+%meson \
+  -Dman=true \
+  -Dgtk-doc=true \
+  -Dintrospection=enabled \
 %ifarch s390 s390x
-	--with-backend=dummy
+  -Dos_backend=dummy
 %endif
 
-# Disable SMP build, fails to build docs
-make
+%meson_build
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+%meson_install
 
 %find_lang upower
 
@@ -93,9 +86,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %doc NEWS AUTHORS HACKING README
 %{_libdir}/libupower-glib.so.*
 %{_datadir}/dbus-1/system.d/*.conf
-%ifnarch s390 s390x
 %{_udevrulesdir}/*.rules
-%endif
 %ghost %dir %{_localstatedir}/lib/upower
 %dir %{_sysconfdir}/UPower
 %config %{_sysconfdir}/UPower/UPower.conf
@@ -123,6 +114,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_datadir}/gtk-doc/html/UPower/*
 
 %changelog
+* Mon Feb 07 2022 Bastien Nocera <bnocera@redhat.com> - 0.99.14-1
++ upower-0.99.14-1
+- Update to 0.99.14
+
+* Tue Aug 17 2021 Bastien Nocera <bnocera@redhat.com> - 0.99.13-1
++ upower-0.99.13-1
+- Update to 0.99.13
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.99.12-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild