up to 1.18.0

- upower support dropped by upstream
- drop unsupported ku_IQ locale

diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index f065f71383a629db4cf07332727c6cc67497a4d5..824896c93bab228f6a63da4b6222b3ade5c7d207 100644 (file)
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -6,17 +6,16 @@
 # Conditional build:
 %bcond_without apidocs # DocBook docs
 %bcond_without systemd # systemd support for default (when systemd is not running fallback to ConsoleKit)
-%bcond_with    upower  # UPower suspend/hibernate support (0.9.x only)
 
 Summary:       MATE Desktop session manager
 Summary(pl.UTF-8):     Zarządca sesji środowiska MATE Desktop
 Name:          mate-session-manager
-Version:       1.16.1
+Version:       1.18.0
 Release:       1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://pub.mate-desktop.org/releases/1.16/%{name}-%{version}.tar.xz
-# Source0-md5: b993895aa50682336cdf14e01aaa4f49
+Source0:       http://pub.mate-desktop.org/releases/1.18/%{name}-%{version}.tar.xz
+# Source0-md5: cbea9714d953fddd8fcb2307db889f26
 URL:           http://wiki.mate-desktop.org/mate-session-manager
 BuildRequires: autoconf >= 2.53
 BuildRequires: automake >= 1:1.9
@@ -33,7 +32,6 @@ BuildRequires:        pangox-compat-devel
 BuildRequires: pkgconfig
 %{?with_systemd:BuildRequires: systemd-devel >= 1:183}
 BuildRequires: tar >= 1:1.22
-%{?with_upower:BuildRequires:  upower-devel >= 0.9.0}
 %{?with_apidocs:BuildRequires: xmlto}
 BuildRequires: xorg-lib-libICE-devel
 BuildRequires: xorg-lib-libSM-devel
@@ -56,7 +54,6 @@ Requires:     hicolor-icon-theme
 Requires:      marco
 # needed to satisfy 'panel' component (may be changed if alternatives available)
 Requires:      mate-panel
-%{?with_upower:Requires:       upower-libs >= 0.9.0}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -94,7 +91,6 @@ Dokumentacja API D-Bus MATE Session Managera.
        --enable-ipv6 \
        --disable-silent-rules \
        --disable-static \
-       %{!?with_upower:--disable-upower} \
        --with-default-wm=marco \
        --with-gnu-ld \
        %{__with_without systemd} \
@@ -107,7 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,jv}
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,ku_IQ,jv}
 
 desktop-file-install \
        --remove-category="MATE" \