- rel 2; disable PrivateNetwork in systemd file as it breaks things

[packages/upower.git] / upower.spec

diff --git a/upower.spec b/upower.spec
index 5b7185d9cebedb9a12494ee1a8191e2d913394b7..29b1887f6087ee45398bc16366ca733e2ec58cf7 100644 (file)
--- a/upower.spec
+++ b/upower.spec
@@ -1,21 +1,21 @@
 Summary:       Power management service
 Summary(pl.UTF-8):     Usługa zarządzania energią
 Name:          upower
-Version:       0.9.23
+Version:       0.99.8
 Release:       2
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: 39cfd97bfaf7d30908f20cf937a57634
-Patch0:                %{name}-battery_range.patch
-URL:           http://upower.freedesktop.org/
+# Source0:     https://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz
+Source0:       https://gitlab.freedesktop.org/upower/upower/uploads/9125ab7ee96fdc4ecc68cfefb50c1cab/%{name}-%{version}.tar.xz
+# Source0-md5: eeb56bd91d2fb8a64c81eff6d899926b
+# https://gitlab.freedesktop.org/upower/upower/issues/68
+Patch0:                upower-bug-68.patch
+URL:           https://upower.freedesktop.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
-BuildRequires: dbus-devel >= 1.0.0
-BuildRequires: dbus-glib-devel >= 0.76
 BuildRequires: docbook-dtd412-xml
-BuildRequires: gettext-devel >= 0.17
-BuildRequires: glib2-devel >= 1:2.22.0
+BuildRequires: gettext-tools >= 0.17
+BuildRequires: glib2-devel >= 1:2.34.0
 BuildRequires: gobject-introspection-devel >= 0.10.0
 BuildRequires: gtk-doc >= 1.11
 BuildRequires: intltool >= 0.40.0
@@ -24,7 +24,6 @@ BuildRequires:        libplist-devel >= 0.12
 BuildRequires: libtool >= 2:2
 BuildRequires: libusb-devel >= 1.0.0
 BuildRequires: pkgconfig
-BuildRequires: polkit-devel >= 0.97
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: udev-glib-devel >= 1:147
@@ -32,12 +31,11 @@ BuildRequires:      xz
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      libimobiledevice >= 0.9.7
 Requires:      libplist >= 0.12
-Requires:      pm-utils
-Requires:      polkit >= 0.97
 Requires:      systemd-units >= 38
 Requires:      udev-glib >= 1:147
 Obsoletes:     DeviceKit-power < 0.15
 Obsoletes:     UPower < 0.9.8-2
+Obsoletes:     upower-pm-utils
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,9 +50,7 @@ urządzeniami energii dołączonymi do systemu.
 Summary:       UPower shared library
 Summary(pl.UTF-8):     Biblioteka współdzielona UPower
 Group:         Libraries
-Requires:      dbus-glib >= 0.76
-Requires:      dbus-libs >= 1.0.0
-Requires:      glib2 >= 1:2.22.0
+Requires:      glib2 >= 1:2.34.0
 Conflicts:     upower < 0.9.18
 
 %description libs
@@ -68,11 +64,10 @@ Summary:    Header files for UPower library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki UPower
 Group:         Development/Libraries
 Requires:      %{name}-libs = %{version}-%{release}
-Requires:      dbus-devel >= 1.0.0
-Requires:      dbus-glib-devel >= 0.76
-Requires:      glib2-devel >= 1:2.22.0
+Requires:      glib2-devel >= 1:2.34.0
 Obsoletes:     DeviceKit-power-devel
 Obsoletes:     UPower-devel
+Obsoletes:     upower-pm-utils-devel
 
 %description devel
 Header files for UPower library.
@@ -85,6 +80,7 @@ Summary:      Static UPower library
 Summary(pl.UTF-8):     Statyczna biblioteka UPower
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
+Obsoletes:     upower-pm-utils-static
 
 %description static
 Static UPower library.
@@ -99,6 +95,10 @@ Group:               Documentation
 Requires:      gtk-doc-common
 Obsoletes:     DeviceKit-power-apidocs
 Obsoletes:     UPower-apidocs
+Obsoletes:     upower-pm-utils-apidocs
+%if "%{_rpmversion}" >= "5"
+BuildArch:     noarch
+%endif
 
 %description apidocs
 UPower API documentation.
@@ -154,21 +154,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS HACKING NEWS README
 %attr(755,root,root) %{_bindir}/upower
-%attr(755,root,root) %{_libdir}/upowerd
+%attr(755,root,root) %{_libexecdir}/upowerd
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/org.freedesktop.UPower.conf
 %dir %{_sysconfdir}/UPower
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/UPower/UPower.conf
 %{_datadir}/dbus-1/system-services/org.freedesktop.UPower.service
-%{_datadir}/polkit-1/actions/org.freedesktop.upower.policy
-%{_datadir}/polkit-1/actions/org.freedesktop.upower.qos.policy
 %{systemdunitdir}/upower.service
-%attr(755,root,root) /lib/systemd/system-sleep/notify-upower.sh
-/lib/udev/rules.d/95-upower-battery-recall-dell.rules
-/lib/udev/rules.d/95-upower-battery-recall-fujitsu.rules
-/lib/udev/rules.d/95-upower-battery-recall-gateway.rules
-/lib/udev/rules.d/95-upower-battery-recall-ibm.rules
-/lib/udev/rules.d/95-upower-battery-recall-lenovo.rules
-/lib/udev/rules.d/95-upower-battery-recall-toshiba.rules
 /lib/udev/rules.d/95-upower-csr.rules
 /lib/udev/rules.d/95-upower-hid.rules
 /lib/udev/rules.d/95-upower-wup.rules
@@ -180,7 +171,7 @@ rm -rf $RPM_BUILD_ROOT
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libupower-glib.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libupower-glib.so.1
+%attr(755,root,root) %ghost %{_libdir}/libupower-glib.so.3
 %{_libdir}/girepository-1.0/UPowerGlib-1.0.typelib
 
 %files devel
@@ -189,7 +180,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libupower-glib.la
 %{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.Device.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.KbdBacklight.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.QoS.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.Wakeups.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.UPower.xml
 %{_datadir}/gir-1.0/UPowerGlib-1.0.gir