!2 Update to 0.99.17
From: @zhang__3125 Reviewed-by: @liqingqing_1229 Signed-off-by: @liqingqing_1229
This commit is contained in:
commit
4a01d6a635
@ -1,32 +0,0 @@
|
|||||||
From fe356951a9d45fee73036aaa72661f0319dffba3 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Bastien Nocera <hadess@hadess.net>
|
|
||||||
Date: Tue, 21 Aug 2018 13:30:44 +0200
|
|
||||||
Subject: [PATCH] daemon: Fix upower not having access to udev events
|
|
||||||
|
|
||||||
PrivateNetwork=true will cut off upower from the udev netlink socket, so
|
|
||||||
it's not what we want to use, as we want those events.
|
|
||||||
|
|
||||||
See https://lists.freedesktop.org/archives/systemd-devel/2018-July/041000.html
|
|
||||||
|
|
||||||
Closes: #68
|
|
||||||
---
|
|
||||||
src/upower.service.in | 3 ++-
|
|
||||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/src/upower.service.in b/src/upower.service.in
|
|
||||||
index 835529a..8838655 100644
|
|
||||||
--- a/src/upower.service.in
|
|
||||||
+++ b/src/upower.service.in
|
|
||||||
@@ -17,7 +17,8 @@ ProtectHome=true
|
|
||||||
PrivateTmp=true
|
|
||||||
|
|
||||||
# Network
|
|
||||||
-PrivateNetwork=true
|
|
||||||
+# PrivateNetwork=true would block udev's netlink socket
|
|
||||||
+RestrictAddressFamilies=AF_UNIX AF_NETLINK
|
|
||||||
|
|
||||||
# Execute Mappings
|
|
||||||
MemoryDenyWriteExecute=true
|
|
||||||
--
|
|
||||||
2.19.0
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
upower-v0.99.17.tar.bz2
Normal file
BIN
upower-v0.99.17.tar.bz2
Normal file
Binary file not shown.
47
upower.spec
47
upower.spec
@ -1,17 +1,16 @@
|
|||||||
Name: upower
|
Name: upower
|
||||||
Version: 0.99.8
|
Version: 0.99.17
|
||||||
Release: 5
|
Release: 1
|
||||||
Summary: Power Management Service
|
Summary: Power Management Service
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://upower.freedesktop.org/
|
URL: http://upower.freedesktop.org/
|
||||||
|
Source0: https://gitlab.freedesktop.org/upower/%{name}/-/archive/v%{version}/%{name}-v%{version}.tar.bz2
|
||||||
|
|
||||||
Source0: https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/%{name}-%{version}.tar.xz
|
BuildRequires: libtool intltool gettext libgudev1-devel gobject-introspection-devel gtk-doc systemd libxslt
|
||||||
|
BuildRequires: libusbx-devel libimobiledevice-devel glib2-devel >= 2.34.0 libplist-devel
|
||||||
Patch0: 0001-daemon-Fix-upower-not-having-access-to-udev-events.patch
|
BuildRequires: meson
|
||||||
|
|
||||||
BuildRequires: sqlite-devel libtool intltool gettext libgudev1-devel gobject-introspection-devel gtk-doc systemd libxslt
|
|
||||||
BuildRequires: libusbx-devel libimobiledevice-devel glib2-devel >= 2.6.0
|
|
||||||
Requires: gobject-introspection udev
|
Requires: gobject-introspection udev
|
||||||
|
%{?systemd_requires}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
UPower is an abstraction for enumerating power devices, listening to
|
UPower is an abstraction for enumerating power devices, listening to
|
||||||
@ -36,27 +35,39 @@ BuildArch: noarch
|
|||||||
Developer documentation for for libupower-glib.
|
Developer documentation for for libupower-glib.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-v%{version} -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure --enable-gtk-doc --enable-introspection
|
%meson \
|
||||||
|
-Dman=true \
|
||||||
|
-Dgtk-doc=true \
|
||||||
|
-Dintrospection=enabled \
|
||||||
|
|
||||||
make
|
%meson_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%make_install
|
%meson_install
|
||||||
|
|
||||||
%find_lang upower
|
%find_lang upower
|
||||||
|
|
||||||
%ldconfig_scriptlets
|
%ldconfig_scriptlets
|
||||||
|
|
||||||
|
%post
|
||||||
|
%systemd_post upower.service
|
||||||
|
|
||||||
|
%preun
|
||||||
|
%systemd_preun upower.service
|
||||||
|
|
||||||
|
%postun
|
||||||
|
%systemd_postun_with_restart upower.service
|
||||||
|
|
||||||
%files -f upower.lang
|
%files -f upower.lang
|
||||||
%{!?_licensedir:%global license %%doc}
|
%{!?_licensedir:%global license %%doc}
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%doc NEWS AUTHORS HACKING README
|
%doc NEWS AUTHORS HACKING README
|
||||||
%{_libdir}/libupower-glib.so.*
|
%{_libdir}/libupower-glib.so.*
|
||||||
%{_sysconfdir}/dbus-1/system.d/*.conf
|
%{_datadir}/dbus-1/system.d/*.conf
|
||||||
/usr/lib/udev/rules.d/*.rules
|
%{_udevrulesdir}/*.rules
|
||||||
%dir %{_localstatedir}/lib/upower
|
%dir %{_localstatedir}/lib/upower
|
||||||
%dir %{_sysconfdir}/UPower
|
%dir %{_sysconfdir}/UPower
|
||||||
%config %{_sysconfdir}/UPower/UPower.conf
|
%config %{_sysconfdir}/UPower/UPower.conf
|
||||||
@ -65,11 +76,10 @@ make
|
|||||||
%{_libdir}/girepository-1.0/*.typelib
|
%{_libdir}/girepository-1.0/*.typelib
|
||||||
%{_mandir}/man*
|
%{_mandir}/man*
|
||||||
%{_datadir}/dbus-1/system-services/*.service
|
%{_datadir}/dbus-1/system-services/*.service
|
||||||
/usr/lib/systemd/system/*.service
|
%{_unitdir}/*.service
|
||||||
%exclude %{_libdir}/*.la
|
%exclude %{_libdir}/*.la
|
||||||
%exclude %{_libdir}/*.a
|
%exclude %{_libdir}/*.a
|
||||||
|
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%{_datadir}/dbus-1/interfaces/*.xml
|
%{_datadir}/dbus-1/interfaces/*.xml
|
||||||
%{_libdir}/libupower-glib.so
|
%{_libdir}/libupower-glib.so
|
||||||
@ -80,11 +90,14 @@ make
|
|||||||
%{_includedir}/libupower-glib/upower.h
|
%{_includedir}/libupower-glib/upower.h
|
||||||
|
|
||||||
%files devel-docs
|
%files devel-docs
|
||||||
%{_datadir}/gtk-doc
|
%dir %{_datadir}/gtk-doc
|
||||||
%dir %{_datadir}/gtk-doc/html/UPower
|
%dir %{_datadir}/gtk-doc/html/UPower
|
||||||
%{_datadir}/gtk-doc/html/UPower/*
|
%{_datadir}/gtk-doc/html/UPower/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 28 2022 lin zhang <lin.zhang@turbolinux.com.cn> - 0.99.17-1
|
||||||
|
- Update to 0.99.17
|
||||||
|
|
||||||
* Wed Nov 20 2019 mengxian <mengxian@huawei.com> - 0.99.8-5
|
* Wed Nov 20 2019 mengxian <mengxian@huawei.com> - 0.99.8-5
|
||||||
- Fix compilation problem in x86_64
|
- Fix compilation problem in x86_64
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user