up to 1.18.0

- upstream switched to gtk3 exclusively
- drop unsupported ku_IQ locale

diff --git a/mate-screensaver.spec b/mate-screensaver.spec
index 5b9a500466d9e461ba244d20932bc588ca930374..9c3697993f8d529cb16b9103064bba4bee5db4b9 100644 (file)
--- a/mate-screensaver.spec
+++ b/mate-screensaver.spec
@@ -1,16 +1,12 @@
-#
-# Conditional build:
-%bcond_with    gtk3            # use GTK+ 3.x instead of 2.x
-
 Summary:       MATE screensaver
 Summary(pl.UTF-8):     Wygaszacz ekranu MATE
 Name:          mate-screensaver
-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: 10544b42b6eb139b30bc917c23e34170
+Source0:       http://pub.mate-desktop.org/releases/1.18/%{name}-%{version}.tar.xz
+# Source0-md5: 41b86ab569acdf1203670ed1c899a0f2
 Source1:       %{name}.pamd
 URL:           http://mate-desktop.org/
 BuildRequires: OpenGL-GLX-devel
@@ -19,15 +15,14 @@ BuildRequires:      automake >= 1:1.9
 BuildRequires: dbus-glib-devel >= 0.30
 BuildRequires: gettext-tools >= 0.10.40
 BuildRequires: glib2-devel >= 1:2.36.0
-%{!?with_gtk3:BuildRequires:   gtk+2-devel >= 2:2.24.0}
-%{?with_gtk3:BuildRequires:    gtk+3-devel >= 3.0.0}
+BuildRequires: gtk+3-devel >= 3.14
 BuildRequires: intltool >= 0.50.1
 BuildRequires: libmatekbd-devel >= 1.7.1
 BuildRequires: libnotify-devel >= 0.7.0
 BuildRequires: libtool >= 1:1.4.3
 BuildRequires: mate-common
-BuildRequires: mate-desktop-devel >= 1.9.4
-BuildRequires: mate-menus-devel >= 1.5.0
+BuildRequires: mate-desktop-devel >= 1.17.0
+BuildRequires: mate-menus-devel >= 1.10.0
 BuildRequires: pam-devel
 BuildRequires: pkgconfig
 BuildRequires: systemd-devel
@@ -42,12 +37,11 @@ BuildRequires:      xz
 Requires(post,postun): glib2 >= 1:2.36.0
 Requires:      dbus-glib >= 0.30
 Requires:      glib2 >= 1:2.36.0
-%{!?with_gtk3:Requires:        gtk+2 >= 2:2.24.0}
-%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
+Requires:      gtk+3 >= 3.14
 Requires:      libmatekbd >= 1.7.1
 Requires:      libnotify >= 0.7.0
-Requires:      mate-desktop >= 1.9.4
-Requires:      mate-menus >= 1.5.0
+Requires:      mate-desktop >= 1.17.0
+Requires:      mate-menus >= 1.10.0
 Requires:      xdg-menus
 Requires:      xorg-lib-libX11 >= 1.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -75,7 +69,6 @@ być dobrze zintegrowany ze środowiskiem graficznym.
        --enable-locking \
        --enable-pam \
        --disable-silent-rules \
-       %{?with_gtk3:--with-gtk=3.0} \
        --with-mit-ext \
        --with-shadow \
        --with-xf86gamma-ext \
@@ -89,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/frp
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{frp,ku_IQ}
 
 install %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/mate-screensaver