- 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 b5fc58d2cb5a8e3f70db93da0f1897cca2efb588..29b1887f6087ee45398bc16366ca733e2ec58cf7 100644 (file)
--- a/upower.spec
+++ b/upower.spec
@@ -1,20 +1,21 @@
 Summary:       Power management service
 Summary(pl.UTF-8):     Usługa zarządzania energią
 Name:          upower
-Version:       0.99.1
+Version:       0.99.8
 Release:       2
 License:       GPL v2+
 Group:         Libraries
-Source0:       http://upower.freedesktop.org/releases/%{name}-%{version}.tar.xz
-# Source0-md5: e21ea7875e46142e37695850754a296a
-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.29.19
+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
@@ -30,7 +31,6 @@ BuildRequires:        xz
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      libimobiledevice >= 0.9.7
 Requires:      libplist >= 0.12
-Requires:      pm-utils
 Requires:      systemd-units >= 38
 Requires:      udev-glib >= 1:147
 Obsoletes:     DeviceKit-power < 0.15
@@ -50,10 +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.29.19
-Obsoletes:     upower-pm-utils-libs
+Requires:      glib2 >= 1:2.34.0
 Conflicts:     upower < 0.9.18
 
 %description libs
@@ -67,9 +64,7 @@ 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.29.19
+Requires:      glib2-devel >= 1:2.34.0
 Obsoletes:     DeviceKit-power-devel
 Obsoletes:     UPower-devel
 Obsoletes:     upower-pm-utils-devel
@@ -101,6 +96,9 @@ 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.
@@ -110,6 +108,7 @@ Dokumentacja API UPower.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__gtkdocize}
@@ -155,7 +154,7 @@ 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