- updated to 3.34.1

diff --git a/gnome-session.spec b/gnome-session.spec
index 9647208d09e8af6bb2fac9b55ee5dfde3813227a..d56228d5e7cede5a789697f9f5bab3f6f0b01d2e 100644 (file)
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -1,3 +1,4 @@
+# TODO: is polkit-gnome still used?
 #
 # Conditiional build:
 %bcond_without systemd         # disable systemd tracking support
@@ -6,13 +7,13 @@
 Summary:       Session support tools for the GNOME GUI desktop environment
 Summary(pl.UTF-8):     Programy obsługujęce sesję dla środowiska graficznego GNOME
 Name:          gnome-session
-Version:       3.30.1
+Version:       3.34.1
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.30/%{name}-%{version}.tar.xz
-# Source0-md5: 45c33dfaad7d40c008f8131aff2e0391
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.34/%{name}-%{version}.tar.xz
+# Source0-md5: 1a9c10d5468b3ba8abee94653692fe0d
 Source1:       %{name}-gnome.desktop
 Source2:       polkit-gnome-authentication-agent-1.desktop
 URL:           http://www.gnome.org/
@@ -22,32 +23,28 @@ BuildRequires:      OpenGLESv2-devel
 %{?with_consolekit:BuildRequires:      dbus-glib-devel >= 0.76}
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.46.0
-BuildRequires: gnome-common >= 2.24.0
 BuildRequires: gnome-desktop-devel >= 3.18.0
 BuildRequires: gtk+3-devel >= 3.18.0
 BuildRequires: json-glib-devel >= 0.10
 BuildRequires: libepoxy-devel
 BuildRequires: libxslt-progs
 BuildRequires: meson >= 0.43.0
+BuildRequires: ninja >= 1.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.9.0
-BuildRequires: polkit-devel
-BuildRequires: rpmbuild(macros) >= 1.601
+BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sed >= 4.0
 %{?with_systemd:BuildRequires: systemd-devel >= 1:209}
 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-libXcomposite-devel
-BuildRequires: xorg-lib-libXext-devel
-BuildRequires: xorg-lib-libXrender-devel
-BuildRequires: xorg-lib-libXtst-devel
 BuildRequires: xorg-lib-xtrans-devel
 Requires(post,postun): glib2 >= 1:2.46.0
+%{?with_consolekit:Requires:   dbus-glib >= 0.76}
 Requires:      dbus-x11
-Requires:      gnome-control-center >= 1:3.4.0
+Requires:      glib2 >= 1:2.46.0
 Requires:      gnome-desktop >= 3.18.0
 Requires:      gnome-settings-daemon >= 3.26.0
 Requires:      gnome-shell >= 3.24.0
@@ -58,9 +55,7 @@ Requires:     json-glib >= 0.10
 Requires:      polkit-gnome >= 0.101
 # needs notification-daemon in fallback mode to function
 Requires:      dbus(org.freedesktop.Notifications)
-# sr@Latn vs. sr@latin
 Obsoletes:     gnome-splash-gnome < 1:2.32.0
-Conflicts:     glibc-misc < 6:2.7
 Conflicts:     polkit-gnome < 0.101
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -91,7 +86,8 @@ find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst)
 %meson build \
        -Dsystemd=%{?with_systemd:true}%{!?with_systemd:false} \
        -Dsystemd=%{?with_consolekit:true}%{!?with_consolekit:false}
-%meson_build -C build
+
+%ninja_build -C build
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -100,12 +96,15 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome/autostart
 install -d $RPM_BUILD_ROOT%{_datadir}/gnome/default-session
 install -d $RPM_BUILD_ROOT%{_datadir}/gnome/shutdown
 
-%meson_install -C build
+%ninja_install -C build
 
 install -d $RPM_BUILD_ROOT%{_datadir}/xsessions
 cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/xsessions/gnome.desktop
 sed -e 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 
+# packaged as %doc
+%{__rm} $RPM_BUILD_ROOT%{_docdir}/gnome-session/dbus/*.html
+
 %find_lang %{name} --with-gnome --all-name
 
 %clean
@@ -123,12 +122,13 @@ fi
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS *ChangeLog NEWS README
+%doc AUTHORS MAINTAINERS NEWS README build/doc/dbus/gnome-session.html
 %attr(755,root,root) %{_bindir}/gnome-session
 %attr(755,root,root) %{_bindir}/gnome-session-custom-session
 %attr(755,root,root) %{_bindir}/gnome-session-inhibit
 %attr(755,root,root) %{_bindir}/gnome-session-quit
 %attr(755,root,root) %{_libexecdir}/gnome-session-binary
+%attr(755,root,root) %{_libexecdir}/gnome-session-ctl
 %attr(755,root,root) %{_libexecdir}/gnome-session-check-accelerated
 %attr(755,root,root) %{_libexecdir}/gnome-session-check-accelerated-gl-helper
 %attr(755,root,root) %{_libexecdir}/gnome-session-check-accelerated-gles-helper
@@ -147,6 +147,25 @@ fi
 %{_datadir}/wayland-sessions/gnome.desktop
 %{_datadir}/xsessions/gnome.desktop
 %{_datadir}/xsessions/gnome-xorg.desktop
+%{systemduserunitdir}/gnome-session-failed.service
+%{systemduserunitdir}/gnome-session-failed.target
+%{systemduserunitdir}/gnome-session-initialized.target
+%{systemduserunitdir}/gnome-session-manager.target
+%{systemduserunitdir}/gnome-session-manager@.service
+%{systemduserunitdir}/gnome-session-monitor.service
+%{systemduserunitdir}/gnome-session-pre.target
+%{systemduserunitdir}/gnome-session-restart-dbus.service
+%{systemduserunitdir}/gnome-session-shutdown.target
+%{systemduserunitdir}/gnome-session-signal-init.service
+%{systemduserunitdir}/gnome-session-stable.target
+%{systemduserunitdir}/gnome-session-stable.timer
+%{systemduserunitdir}/gnome-session-wayland.target
+%{systemduserunitdir}/gnome-session-wayland@.target
+%{systemduserunitdir}/gnome-session-x11-services.target
+%{systemduserunitdir}/gnome-session-x11.target
+%{systemduserunitdir}/gnome-session-x11@.target
+%{systemduserunitdir}/gnome-session.target
+%{systemduserunitdir}/gnome-session@.target
 %{_mandir}/man1/gnome-session.1*
 %{_mandir}/man1/gnome-session-inhibit.1*
 %{_mandir}/man1/gnome-session-quit.1*