- updated to 3.38.0

- use upstream gnome.desktop with more translations

diff --git a/gnome-session-gnome.desktop b/gnome-session-gnome.desktop
deleted file mode 100644 (file)
index be61c9b..0000000
--- a/gnome-session-gnome.desktop
+++ /dev/null
@@ -1,80 +0,0 @@
-[Desktop Entry]
-Name=GNOME
-Name[az]=GNOME
-Name[be]=GNOME
-Name[ca]=GNOME
-Name[cs]=GNOME
-Name[cy]=GNOME
-Name[da]=Gnome
-Name[de]=GNOME
-Name[el]=GNOME
-Name[es]=GNOME
-Name[et]=GNOME
-Name[fi]=Gnome
-Name[fr]=GNOME
-Name[he]=GNOME
-Name[hi]=गनोम
-Name[hu]=GNOME
-Name[it]=GNOME
-Name[ja]=GNOME
-Name[ko]=그놈
-Name[ms]=GNOME
-Name[nb]=GNOME
-Name[nl]=GNOME
-Name[pl]=GNOME
-Name[pt]=GNOME
-Name[pt_BR]=GNOME
-Name[ro]=GNOME
-Name[ru]=GNOME
-Name[sk]=GNOME
-Name[sl]=GNOME
-Name[sq]=GNOME
-Name[sr]=Гном
-Name[sr@Latn]=Gnom
-Name[sv]=GNOME
-Name[tr]=GNOME
-Name[uk]=GNOME
-Name[wa]=GNOME
-Name[zh_CN]=GNOME
-Name[zh_TW]=GNOME
-Comment=This session logs you into GNOME
-Comment[az]=Bu iclas sizi GNOME'a daxil edəcək
-Comment[be]=Гэтая сэсыя завядзе вас у GNOME
-Comment[ca]=Aquesta sessió entra en GNOME
-Comment[cs]=Toto sezení vás přihlásí do GNOME
-Comment[cy]=Mae'r sesiwn hwn yn eich mewngofnodi i GNOME
-Comment[da]=Denne session logger dig på Gnome
-Comment[de]=Diese Sitzung meldet Sie an GNOME an
-Comment[el]=Αυτή η συνεδρία σας εισάγει στο GNOME
-Comment[es]=Con esta sesión accede a GNOME
-Comment[fi]=Tämä istunto kirjaa sisään Gnomeen
-Comment[fr]=Cette session vous connectera dans GNOME
-Comment[he]=תצורת הפעלה זו מחברת אותך ל GNOME
-Comment[hi]=यह सत्र गनोम में लॉगिन होगा
-Comment[hu]=Ez a munkamenet a GNOME-be jelentkeztet be
-Comment[it]=Sessione di lavoro con GNOME
-Comment[ja]=GNOME セッションにログインします
-Comment[ko]=GNOME세션으로 로그인합니다
-Comment[ms]=Sesi ini akan log anda  ke GNOME
-Comment[nb]=Denne sesjonen logger deg inn til GNOME
-Comment[nl]=Deze sessie meldt u aan bij GNOME
-Comment[pl]=Sesja logowania do GNOME
-Comment[pt]=Esta sessão inicia-o no GNOME
-Comment[pt_BR]=Logar no ambiente GNOME
-Comment[ro]=Această sesiune vă va loga în GNOME
-Comment[sk]=Toto sedenie vás prihlási do prostredia GNOME
-Comment[sl]=Ta seja vas prijavi v GNOMe
-Comment[sq]=Kjo seancë do t'ju fusë në GNOME
-Comment[sr]=Ова сесија вас пријављује на Гнома
-Comment[sr@Latn]=Ova sesija vas prijavljuje na Gnoma
-Comment[sv]=Denna session loggar in dig i GNOME
-Comment[tr]=Bu oturum ile GNOME'a giriş yaparsınız
-Comment[uk]=Сеанс роботи в середовищі GNOME
-Comment[zh_CN]=此会话使您登录到 GNOME
-Comment[zh_TW]=選取這個作業階段後會進入 GNOME 環境
-Exec=gnome-session
-TryExec=gnome-session
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
-# vi: encoding=utf-8

diff --git a/gnome-session.spec b/gnome-session.spec
index a278beaeb38f6df5b8e48848f7818d2117484129..b0019e3eaab60745255dcb5630abd16b5bc5bfc7 100644 (file)
--- a/gnome-session.spec
+++ b/gnome-session.spec
@@ -7,15 +7,14 @@
 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.36.0
+Version:       3.38.0
 Release:       1
 Epoch:         1
 License:       GPL v2+
 Group:         X11/Applications
-Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.36/%{name}-%{version}.tar.xz
-# Source0-md5: cd23e30c4991ca1f477020c67ea3a540
-Source1:       %{name}-gnome.desktop
-Source2:       polkit-gnome-authentication-agent-1.desktop
+Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-session/3.38/%{name}-%{version}.tar.xz
+# Source0-md5: 736024b46e2542b9b68adaa43f754f49
+Source1:       polkit-gnome-authentication-agent-1.desktop
 URL:           https://wiki.gnome.org/Projects/SessionManagement
 BuildRequires: EGL-devel
 BuildRequires: Mesa-libGL-devel
@@ -23,18 +22,19 @@ BuildRequires:      OpenGLESv2-devel
 %{?with_consolekit:BuildRequires:      dbus-glib-devel >= 0.76}
 BuildRequires: gettext-tools
 BuildRequires: glib2-devel >= 1:2.46.0
-BuildRequires: gnome-desktop-devel >= 3.18.0
-BuildRequires: gtk+3-devel >= 3.18.0
+BuildRequires: gnome-desktop-devel >= 3.34.2
+BuildRequires: gtk+3-devel >= 3.22.0
 BuildRequires: json-glib-devel >= 0.10
 BuildRequires: libepoxy-devel
 BuildRequires: libxslt-progs
-BuildRequires: meson >= 0.43.0
+BuildRequires: meson >= 0.53.0
 BuildRequires: ninja >= 1.5
 BuildRequires: perl-base
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: rpmbuild(macros) >= 1.736
 BuildRequires: sed >= 4.0
 %{?with_systemd:BuildRequires: systemd-devel >= 1:209}
+BuildRequires: systemd-units >= 1:242
 BuildRequires: tar >= 1:1.22
 BuildRequires: xmlto
 BuildRequires: xorg-lib-libICE-devel
@@ -47,14 +47,15 @@ Requires(post,postun):      glib2 >= 1:2.46.0
 %{?with_consolekit:Requires:   dbus-glib >= 0.76}
 Requires:      dbus-x11
 Requires:      glib2 >= 1:2.46.0
-Requires:      gnome-desktop >= 3.18.0
+Requires:      gnome-desktop >= 3.34.2
 Requires:      gnome-settings-daemon >= 3.26.0
 Requires:      gnome-shell >= 3.24.0
 Requires:      gnome-wm
 Requires:      gsettings-desktop-schemas >= 3.4.0
-Requires:      gtk+3 >= 3.18.0
+Requires:      gtk+3 >= 3.22.0
 Requires:      json-glib >= 0.10
 Requires:      polkit-gnome >= 0.101
+Requires:      systemd-units >= 1:242
 # needs notification-daemon in fallback mode to function
 Requires:      dbus(org.freedesktop.Notifications)
 Obsoletes:     gnome-splash-gnome < 1:2.32.0
@@ -81,9 +82,6 @@ graficznego GNOME.
 %prep
 %setup -q
 
-#%{__mv} ChangeLog main-ChangeLog
-#find . -name ChangeLog |awk '{src=$0; dst=$0;sub("^./","",dst);gsub("/","-",dst); print "cp " src " " dst}'|sh
-
 %build
 %meson build \
        -Dconsolekit=%{?with_consolekit:true}%{!?with_consolekit:false} \
@@ -101,9 +99,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome/shutdown
 
 %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
+sed -e 's,@LIBDIR@,%{_libdir},' %{SOURCE1} > $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
 
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/gnome-session/dbus/*.html
@@ -153,6 +149,8 @@ fi
 %{_datadir}/xsessions/gnome.desktop
 %{_datadir}/xsessions/gnome-custom-session.desktop
 %{_datadir}/xsessions/gnome-xorg.desktop
+%dir %{systemduserunitdir}/gnome-launched-.scope.d
+%{systemduserunitdir}/gnome-launched-.scope.d/override.conf
 %{systemduserunitdir}/gnome-session-failed.service
 %{systemduserunitdir}/gnome-session-failed.target
 %{systemduserunitdir}/gnome-session-initialized.target
@@ -166,10 +164,13 @@ fi
 %{systemduserunitdir}/gnome-session-wayland.target
 %{systemduserunitdir}/gnome-session-wayland@.target
 %{systemduserunitdir}/gnome-session-x11-services.target
+%{systemduserunitdir}/gnome-session-x11-services-ready.target
 %{systemduserunitdir}/gnome-session-x11.target
 %{systemduserunitdir}/gnome-session-x11@.target
 %{systemduserunitdir}/gnome-session.target
 %{systemduserunitdir}/gnome-session@.target
+%dir %{systemduserunitdir}/gnome-session@gnome.target.d
+%{systemduserunitdir}/gnome-session@gnome.target.d/gnome.session.conf
 %{_mandir}/man1/gnome-session.1*
 %{_mandir}/man1/gnome-session-inhibit.1*
 %{_mandir}/man1/gnome-session-quit.1*