X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=mate-session-manager.spec;h=731707bc29b0ff10db1ecba965fc49658d6c5da5;hb=8bae1e92183ca19b16c3e49d3a8a48af73909054;hp=8819788cdcfaf8e37049fc147bbb91768cbff4ba;hpb=60ee2bdcad8baba61543b3f8ae2e1123288fd4ed;p=packages%2Fmate-session-manager.git

diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 8819788..731707b 100644
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -5,28 +5,25 @@
 
 # Conditional build:
 %bcond_without	apidocs	# DocBook docs
-%bcond_with	gtk3	# use GTK+ 3.x instead of 2.x
 %bcond_without	systemd	# systemd support for default (when systemd is not running fallback to ConsoleKit)
 
 Summary:	MATE Desktop session manager
 Summary(pl.UTF-8):	Zarządca sesji środowiska MATE Desktop
 Name:		mate-session-manager
-Version:	1.8.0
+Version:	1.20.1
 Release:	1
 License:	GPL v2+
 Group:		X11/Applications
-Source0:	http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
-# Source0-md5:	6841203f347da7baf0696d42289b1240
-Patch0:		%{name}-en_us_suspend_hotkey.patch
+Source0:	http://pub.mate-desktop.org/releases/1.20/%{name}-%{version}.tar.xz
+# Source0-md5:	f42444b7e48e80c0ad2d2925491e2c39
 URL:		http://wiki.mate-desktop.org/mate-session-manager
 BuildRequires:	autoconf >= 2.53
 BuildRequires:	automake >= 1:1.9
 BuildRequires:	dbus-glib-devel >= 0.76
 BuildRequires:	desktop-file-utils
-BuildRequires:	glib2-devel >= 1:2.26.0
-%{!?with_gtk3:BuildRequires:	gtk+2-devel >= 2:2.14.0}
-%{?with_gtk3:BuildRequires:	gtk+3-devel >= 3.0.0}
-BuildRequires:	intltool >= 0.40.0
+BuildRequires:	glib2-devel >= 1:2.50.0
+BuildRequires:	gtk+3-devel >= 3.22.0
+BuildRequires:	intltool >= 0.50.1
 BuildRequires:	libtool >= 1:1.4.3
 %{?with_apidocs:BuildRequires:	libxslt-progs}
 BuildRequires:	mate-common
@@ -35,30 +32,28 @@ BuildRequires:	pangox-compat-devel
 BuildRequires:	pkgconfig
 %{?with_systemd:BuildRequires:	systemd-devel >= 1:183}
 BuildRequires:	tar >= 1:1.22
-BuildRequires:	upower-devel >= 0.9.0
 %{?with_apidocs:BuildRequires:	xmlto}
 BuildRequires:	xorg-lib-libICE-devel
 BuildRequires:	xorg-lib-libSM-devel
+BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xorg-lib-libXext-devel
 BuildRequires:	xorg-lib-libXrender-devel
 BuildRequires:	xorg-lib-libXtst-devel
+BuildRequires:	xorg-lib-xtrans-devel
 BuildRequires:	xz
 # needed to satisfy 'filemanager' component (may be changed if alternatives available)
 Requires:	caja
 Requires:	dbus-glib >= 0.76
-Requires:	glib2 >= 1:2.26.0
+Requires:	glib2 >= 1:2.50.0
 Requires:	gsettings-desktop-schemas
-%{!?with_gtk3:Requires:	gtk+2 >= 2:2.14.0}
-%{?with_gtk3:Requires:	gtk+3 >= 3.0.0}
+Requires:	gtk+3 >= 3.22.0
 Requires:	gtk-update-icon-cache
 Requires:	hicolor-icon-theme
 # needed to satisfy 'windowmanager' component (may be changed if alternatives available)
 Requires:	marco
-Requires:	mate-desktop >= 1.5
 # needed to satisfy 'panel' component (may be changed if alternatives available)
 Requires:	mate-panel
-Requires:	upower-libs >= 0.9.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -71,6 +66,9 @@ Zarządca sesji środowiska MATE Desktop.
 Summary:	MATE Session Manager D-Bus API Reference
 Summary(pl.UTF-8):	Dokumentacja API D-Bus MATE Session Managera
 Group:		Documentation
+%if "%{_rpmversion}" >= "5"
+BuildArch:	noarch
+%endif
 
 %description apidocs
 Session Manager D-Bus API Reference.
@@ -80,7 +78,6 @@ Dokumentacja API D-Bus MATE Session Managera.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -96,7 +93,6 @@ Dokumentacja API D-Bus MATE Session Managera.
 	--disable-static \
 	--with-default-wm=marco \
 	--with-gnu-ld \
-	%{?with_gtk3:--with-gtk=3.0} \
 	%{__with_without systemd} \
 	--with-x
 
@@ -107,9 +103,7 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-# mate < 1.5 did not exist in pld, avoid dependency on mate-conf
-%{__rm} $RPM_BUILD_ROOT%{_datadir}/MateConf/gsettings/mate-session.convert
-%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/cmn
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/{es_ES,frp,ku_IQ,jv}
 
 desktop-file-install \
 	--remove-category="MATE" \
@@ -118,6 +112,9 @@ desktop-file-install \
 	--dir=$RPM_BUILD_ROOT%{_desktopdir} \
 	$RPM_BUILD_ROOT%{_desktopdir}/mate-session-properties.desktop
 
+# not supported by glibc yet
+%{__rm} -r $RPM_BUILD_ROOT%{_localedir}/pms
+
 %find_lang %{name}
 
 %clean
@@ -133,11 +130,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog MAINTAINERS NEWS README
+%doc AUTHORS ChangeLog NEWS README
 %attr(755,root,root) %{_bindir}/mate-session
+%attr(755,root,root) %{_bindir}/mate-session-inhibit
 %attr(755,root,root) %{_bindir}/mate-session-properties
 %attr(755,root,root) %{_bindir}/mate-session-save
 %attr(755,root,root) %{_bindir}/mate-wm
+%{_mandir}/man1/mate-session-inhibit.1*
 %{_mandir}/man1/mate-session-properties.1*
 %{_mandir}/man1/mate-session-save.1*
 %{_mandir}/man1/mate-session.1*