- added glib-deprecated patch

- drop .la file
- release 7

diff --git a/upower-glib-deprecated.patch b/upower-glib-deprecated.patch
new file mode 100644 (file)
index 0000000..c4bf4e6
--- /dev/null
+++ b/upower-glib-deprecated.patch
@@ -0,0 +1,48 @@
+--- upower-0.9.23/configure.ac.orig    2013-10-18 16:59:43.000000000 +0200
++++ upower-0.9.23/configure.ac 2019-05-08 05:33:37.087683032 +0200
+@@ -104,7 +104,6 @@
+ dnl - Extra verbose warning switches
+ dnl ---------------------------------------------------------------------------
+ CPPFLAGS="$CPPFLAGS -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+-CPPFLAGS="$CPPFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED"
+ CPPFLAGS="$CPPFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
+ CPPFLAGS="$CPPFLAGS -DGSEAL_ENABLE"
+ 
+--- upower-0.9.23/libupower-glib/up-wakeups.c.orig     2013-10-18 16:41:24.000000000 +0200
++++ upower-0.9.23/libupower-glib/up-wakeups.c  2019-05-08 05:49:07.512642488 +0200
+@@ -89,6 +89,7 @@
+ 
+ /* FIXME: GValueArray is deprecated in GLib 2.33+, but we need to convert to
+  * GDBus to get rid of it */
++#pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ 
+ /**
+@@ -185,7 +186,7 @@
+       return array;
+ }
+ 
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic pop
+ 
+ /**
+  * up_wakeups_ensure_properties:
+--- upower-0.9.23/libupower-glib/up-device.c.orig      2013-10-18 16:41:24.000000000 +0200
++++ upower-0.9.23/libupower-glib/up-device.c   2019-05-08 05:53:54.321088713 +0200
+@@ -579,6 +579,7 @@
+ 
+ /* FIXME: GValueArray is deprecated in GLib 2.33+, but we need to convert to
+  * GDBus to get rid of it */
++#pragma GCC diagnostic push
+ #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+ 
+ /**
+@@ -748,7 +749,7 @@
+       return array;
+ }
+ 
+-#pragma GCC diagnostic error "-Wdeprecated-declarations"
++#pragma GCC diagnostic pop
+ 
+ /*
+  * up_device_set_property:

diff --git a/upower-pm-utils.spec b/upower-pm-utils.spec
index c2861c3b2d171d68731de14909b6202d7f979382..3d374dab2027cad529bf71aeccb637d54b6d1b46 100644 (file)
--- a/upower-pm-utils.spec
+++ b/upower-pm-utils.spec
@@ -1,15 +1,17 @@
+# NOTE: this package is the last version of upower from 0.9.x series, compatible with pm-utils
 %define                orig_name       upower
 
 Summary:       Power management service with pm-utils backend
 Summary(pl.UTF-8):     Usługa zarządzania energią z wykorzystaniem pm-utils
 Name:          %{orig_name}-pm-utils
 Version:       0.9.23
-Release:       6
+Release:       7
 License:       GPL v2+
 Group:         Libraries
 Source0:       http://upower.freedesktop.org/releases/%{orig_name}-%{version}.tar.xz
 # Source0-md5: 39cfd97bfaf7d30908f20cf937a57634
 Patch0:                %{orig_name}-battery_range.patch
+Patch1:                %{orig_name}-glib-deprecated.patch
 URL:           http://upower.freedesktop.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.11
@@ -124,6 +126,7 @@ Dokumentacja API UPower.
 %prep
 %setup -q -n %{orig_name}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__gtkdocize}
@@ -148,6 +151,9 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libupower-glib.la
+
 %find_lang upower
 
 %clean
@@ -201,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libupower-glib.so
-%{_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