- pl, cleanup, completed dependencies

diff --git a/mate-session-manager.spec b/mate-session-manager.spec
index 301d58424437199b870bada07927d45071a8a522..822ccfedd13caa64b08ed24d957513f04d37ac48 100644 (file)
--- a/mate-session-manager.spec
+++ b/mate-session-manager.spec
@@ -1,13 +1,15 @@
 #
 # TODO
-# - Terminal=true, depends in mate-terminal, but probably should take preferred terminal application
+# - Terminal=true, depends on mate-terminal, but probably should take preferred terminal application
 # mate-session[4970]: WARNING: Could not launch application 'nvidia-settings.desktop': Unable to start application: Failed to execute child process "xdg-terminal" (No such file or directory)
 
 # Conditional build:
-%bcond_with    apidocs         # DocBook docs (incomplete)
-%bcond_without systemd # enable systemd support for default (when systemd is not running fallback to ConsoleKit)
+%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.6.1
 Release:       1
@@ -16,21 +18,36 @@ Group:              X11/Applications
 Source0:       http://pub.mate-desktop.org/releases/1.6/%{name}-%{version}.tar.xz
 # Source0-md5: e841ff0917f8b64ad33267b0eb5f8364
 URL:           http://wiki.mate-desktop.org/mate-session-manager
-BuildRequires: dbus-glib-devel
+BuildRequires: autoconf >= 2.53
+BuildRequires: automake >= 1:1.9
+BuildRequires: dbus-glib-devel >= 0.76
 BuildRequires: desktop-file-utils
-BuildRequires: glib2-devel >= 1:2.16.0
-BuildRequires: gtk+2-devel >= 2:2.14.0
+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: libtool >= 1:1.4.3
+%{?with_apidocs:BuildRequires: libxslt-progs}
 BuildRequires: mate-common
+BuildRequires: pango-devel
 BuildRequires: pangox-compat-devel
-%{?with_systemd:BuildRequires: systemd-devel >= 183}
+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-libXau-devel
+BuildRequires: xorg-lib-libXext-devel
+BuildRequires: xorg-lib-libXrender-devel
+BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xz
+Requires:      dbus-glib >= 0.76
 Requires:      glib2 >= 1:2.26.0
 Requires:      gsettings-desktop-schemas
+%{!?with_gtk3:Requires:        gtk+2 >= 2:2.14.0}
+%{?with_gtk3:Requires: gtk+3 >= 3.0.0}
 Requires:      gtk-update-icon-cache
 Requires:      hicolor-icon-theme
 Requires:      mate-desktop >= 1.5
@@ -40,42 +57,45 @@ Requires:   mate-file-manager
 Requires:      mate-panel
 # needed to satisfy 'windowmanager' component (may be changed if alternatives available)
 Requires:      mate-window-manager
+Requires:      upower-libs >= 0.9.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 MATE Desktop session manager.
 
+%description -l pl.UTF-8
+Zarządca sesji środowiska MATE Desktop.
+
 %package apidocs
-Summary:       Session Manager D-Bus API Reference
-Summary(pl.UTF-8):     Dokumentacja API Session Manager
+Summary:       MATE Session Manager D-Bus API Reference
+Summary(pl.UTF-8):     Dokumentacja API D-Bus MATE Session Managera
 Group:         Documentation
 
 %description apidocs
 Session Manager D-Bus API Reference.
 
 %description apidocs -l pl.UTF-8
-Dokumentacja API Session Manager.
+Dokumentacja API D-Bus MATE Session Managera.
 
 %prep
 %setup -q
 
 %build
 %{__intltoolize}
-%{?with_apidocs:%{__gtkdocize}}
 %{__aclocal}
 %{__autoheader}
 %{__autoconf}
 %{__automake}
 %configure \
-       --disable-silent-rules \
-       --disable-static \
        %{!?with_apidocs:--disable-docbook-docs} \
        %{?with_apidocs:--enable-docbook-docs --docdir=%{_gtkdocdir}/%{name}} \
-       %{__enable_disable systemd systemd} \
        --enable-ipv6 \
-       --with-gtk=2.0 \
-       --with-gnu-ld \
+       --disable-silent-rules \
+       --disable-static \
        --with-default-wm=marco \
+       --with-gnu-ld \
+       %{?with_gtk3:--with-gtk=3.0} \
+       %{__with_without systemd} \
        --with-x
 
 %{__make}
@@ -93,7 +113,7 @@ desktop-file-install \
        --add-category="X-Mate" \
        --delete-original \
        --dir=$RPM_BUILD_ROOT%{_desktopdir} \
-$RPM_BUILD_ROOT%{_desktopdir}/mate-session-properties.desktop
+       $RPM_BUILD_ROOT%{_desktopdir}/mate-session-properties.desktop
 
 %find_lang %{name}
 
@@ -110,7 +130,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS COPYING README
+%doc AUTHORS ChangeLog MAINTAINERS NEWS README
 %attr(755,root,root) %{_bindir}/mate-session
 %attr(755,root,root) %{_bindir}/mate-session-properties
 %attr(755,root,root) %{_bindir}/mate-session-save
@@ -119,12 +139,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/mate-session-save.1*
 %{_mandir}/man1/mate-session.1*
 %{_mandir}/man1/mate-wm.1*
-%{_desktopdir}/mate-session-properties.desktop
 %{_datadir}/mate-session-manager
-%{_iconsdir}/hicolor/*/apps/*.png
-%{_iconsdir}/hicolor/scalable/apps/mate-session-properties.svg
 %{_datadir}/glib-2.0/schemas/org.mate.session.gschema.xml
 %{_datadir}/xsessions/mate.desktop
+%{_desktopdir}/mate-session-properties.desktop
+%{_iconsdir}/hicolor/*x*/apps/mate-session-properties.png
+%{_iconsdir}/hicolor/scalable/apps/mate-session-properties.svg
 
 %if %{with apidocs}
 %files apidocs