From 0f8b3c603924d76d39d14e7f5b803228c6ab8927 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 19 2015 15:50:52 +0000 Subject: import upower-0.99.2-1.el7 --- diff --git a/.gitignore b/.gitignore index 8bc32bc..a1da61f 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/upower-0.9.20.tar.xz +SOURCES/upower-0.99.2.tar.xz diff --git a/.upower.metadata b/.upower.metadata index b58b156..7977ff9 100644 --- a/.upower.metadata +++ b/.upower.metadata @@ -1 +1 @@ -960ce9b3feaabf743c1070ec260e761176c0411e SOURCES/upower-0.9.20.tar.xz +c8813e21b4ffca5a7cee4c6af5763239158aaf5e SOURCES/upower-0.99.2.tar.xz diff --git a/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch b/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch new file mode 100644 index 0000000..acdc792 --- /dev/null +++ b/SOURCES/0005-lib-Fix-crash-on-uninitialized-variant.patch @@ -0,0 +1,37 @@ +From 2510148b16a71504dff3880c8af416fd85a2885d Mon Sep 17 00:00:00 2001 +From: Vlad Orlov +Date: Fri, 13 Mar 2015 13:17:31 +0100 +Subject: lib: Fix crash on uninitialized variant + +Initialize the GVariant* pointers, so that they aren't uninitialized when +jumping to "out:" and unref'ing them. + +https://bugs.freedesktop.org/show_bug.cgi?id=89476 +https://bugs.debian.org/774546 +https://bugs.launchpad.net/ubuntu-mate/+bug/1428337 + +diff --git a/libupower-glib/up-device.c b/libupower-glib/up-device.c +index 9f6e0e1..f053f3d 100644 +--- a/libupower-glib/up-device.c ++++ b/libupower-glib/up-device.c +@@ -422,7 +422,7 @@ GPtrArray * + up_device_get_history_sync (UpDevice *device, const gchar *type, guint timespec, guint resolution, GCancellable *cancellable, GError **error) + { + GError *error_local = NULL; +- GVariant *gva; ++ GVariant *gva = NULL; + guint i; + GPtrArray *array = NULL; + gboolean ret; +@@ -502,7 +502,7 @@ GPtrArray * + up_device_get_statistics_sync (UpDevice *device, const gchar *type, GCancellable *cancellable, GError **error) + { + GError *error_local = NULL; +- GVariant *gva; ++ GVariant *gva = NULL; + guint i; + GPtrArray *array = NULL; + gboolean ret; +-- +cgit v0.10.2 + diff --git a/SOURCES/upower-udev.patch b/SOURCES/upower-udev.patch deleted file mode 100644 index 7056d93..0000000 --- a/SOURCES/upower-udev.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up upower-0.9.20/rules/Makefile.am.udev upower-0.9.20/rules/Makefile.am ---- upower-0.9.20/rules/Makefile.am.udev 2013-10-09 18:36:47.423105278 -0400 -+++ upower-0.9.20/rules/Makefile.am 2013-10-09 18:37:10.809252963 -0400 -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --udevrulesdir = $(slashlibdir)/udev/rules.d -+udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = \ - 95-upower-battery-recall-dell.rules \ - 95-upower-battery-recall-fujitsu.rules \ -diff -up upower-0.9.20/rules/Makefile.in.udev upower-0.9.20/rules/Makefile.in ---- upower-0.9.20/rules/Makefile.in.udev 2013-10-09 18:37:30.168375214 -0400 -+++ upower-0.9.20/rules/Makefile.in 2013-10-09 18:37:49.334496254 -0400 -@@ -310,7 +310,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --udevrulesdir = $(slashlibdir)/udev/rules.d -+udevrulesdir = $(prefix)/lib/udev/rules.d - udevrules_DATA = \ - 95-upower-battery-recall-dell.rules \ - 95-upower-battery-recall-fujitsu.rules \ diff --git a/SPECS/upower.spec b/SPECS/upower.spec index 6a6ad21..32380c9 100644 --- a/SPECS/upower.spec +++ b/SPECS/upower.spec @@ -2,35 +2,33 @@ Summary: Power Management Service Name: upower -Version: 0.9.20 -Release: 7%{?dist} +Version: 0.99.2 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://upower.freedesktop.org/ Source0: http://upower.freedesktop.org/releases/upower-%{version}.tar.xz + +## upstream fixes +Patch5: 0005-lib-Fix-crash-on-uninitialized-variant.patch + BuildRequires: sqlite-devel BuildRequires: libtool BuildRequires: intltool BuildRequires: gettext BuildRequires: libgudev1-devel %ifnarch s390 s390x -BuildRequires: libusb1-devel +BuildRequires: libusbx-devel BuildRequires: libimobiledevice-devel %endif BuildRequires: glib2-devel >= 2.6.0 BuildRequires: dbus-devel >= 1.2 BuildRequires: dbus-glib-devel >= 0.82 -BuildRequires: polkit-devel >= 0.92 BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc -Requires: polkit >= 0.92 Requires: udev -Requires: pm-utils >= 1.2.2.1 Requires: gobject-introspection -# install udev rules in /usr/lib/udev -Patch0: upower-udev.patch - %description UPower (formerly DeviceKit-power) provides a daemon, API and command line tools for managing power devices attached to the system. @@ -38,14 +36,13 @@ line tools for managing power devices attached to the system. %package devel Summary: Headers and libraries for UPower Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Obsoletes: DeviceKit-power-devel < 1:0.9.0-2 +Requires: %{name}%{?_isa} = %{version}-%{release} %description devel Headers and libraries for UPower. %package devel-docs -Summary: Headers and libraries for UPower +Summary: Developer documentation for for libupower-glib Requires: %{name} = %{version}-%{release} BuildArch: noarch @@ -53,20 +50,19 @@ BuildArch: noarch Developer documentation for for libupower-glib. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build %configure \ --enable-gtk-doc \ --disable-static \ - --enable-deprecated \ --enable-introspection \ %ifarch s390 s390x --with-backend=dummy %endif -make %{?_smp_mflags} +# Disable SMP build, fails to build docs +make %install make install DESTDIR=$RPM_BUILD_ROOT @@ -79,8 +75,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %postun -p /sbin/ldconfig %files -f upower.lang -%defattr(-,root,root,-) -%doc NEWS COPYING AUTHORS HACKING README +%{!?_licensedir:%global license %%doc} +%license COPYING +%doc NEWS AUTHORS HACKING README %{_libdir}/libupower-glib.so.* %{_sysconfdir}/dbus-1/system.d/*.conf %ifnarch s390 s390x @@ -95,15 +92,10 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_mandir}/man1/* %{_mandir}/man7/* %{_mandir}/man8/* -%{_datadir}/polkit-1/actions/*.policy %{_datadir}/dbus-1/system-services/*.service /usr/lib/systemd/system/*.service -%ifnarch s390 s390x -/usr/lib/systemd/system-sleep/notify-upower.sh -%endif %files devel -%defattr(-,root,root,-) %{_datadir}/dbus-1/interfaces/*.xml %{_libdir}/libupower-glib.so %{_libdir}/pkgconfig/*.pc @@ -113,12 +105,15 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la %{_includedir}/libupower-glib/upower.h %files devel-docs -%defattr(-,root,root,-) %{_datadir}/gtk-doc %dir %{_datadir}/gtk-doc/html/UPower %{_datadir}/gtk-doc/html/UPower/* %changelog +* Thu Dec 18 2014 Richard Hughes - 0.99.2-1 +- New upstream release +- Resolves: #1174421 + * Mon Mar 17 2014 Richard Hughes - 0.9.20-7 - Mark the devel-docs subpackage as noarch to silence a rpmdiff false positive. - Resolves: #1070661