!55 Update to 43.0
From: @dwl301 Reviewed-by: @t_feng Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot
Gitee
commit
f1bd396bc7
@ -1,10 +0,0 @@
|
|||||||
--- gdm-42.0/meson.build.orig 2022-04-01 14:44:07.292205407 +0800
|
|
||||||
+++ gdm-42.0/meson.build 2022-04-01 14:44:35.215611962 +0800
|
|
||||||
@@ -170,6 +170,7 @@ default_pam_config = get_option('default
|
|
||||||
# If requested, try autodetecting from release files (see NetworkManager source)
|
|
||||||
if default_pam_config == 'autodetect'
|
|
||||||
pam_autodetect_map = {
|
|
||||||
+ '/etc/openEuler-release': 'redhat',
|
|
||||||
'/etc/redhat-release': 'redhat',
|
|
||||||
'/etc/fedora-release': 'redhat',
|
|
||||||
'/etc/exherbo-release': 'exherbo',
|
|
||||||
BIN
gdm-42.0.tar.xz
BIN
gdm-42.0.tar.xz
Binary file not shown.
BIN
gdm-43.0.tar.xz
Normal file
BIN
gdm-43.0.tar.xz
Normal file
Binary file not shown.
@ -1,10 +0,0 @@
|
|||||||
--- gdm-42.0/data/gdm.service.in.orig 2022-04-01 14:42:08.314733966 +0800
|
|
||||||
+++ gdm-42.0/data/gdm.service.in 2022-04-01 14:42:20.537474205 +0800
|
|
||||||
@@ -20,6 +20,7 @@ After=rc-local.service plymouth-start.se
|
|
||||||
OnFailure=plymouth-quit.service
|
|
||||||
|
|
||||||
[Service]
|
|
||||||
+ExecStartPre=/bin/sh -c "systemctl stop session-c*.scope"
|
|
||||||
ExecStart=${sbindir}/gdm
|
|
||||||
KillMode=mixed
|
|
||||||
Restart=always
|
|
||||||
154
gdm.spec
154
gdm.spec
@ -1,76 +1,117 @@
|
|||||||
|
%global _hardened_build 1
|
||||||
|
|
||||||
%define libauditver 1.0.6
|
%define libauditver 1.0.6
|
||||||
%define gtk3_version 2.99.2
|
%define gtk3_version 2.99.2
|
||||||
%define pam_version 0.99.8.1-11
|
%define pam_version 0.99.8.1-11
|
||||||
%define desktop_file_utils_version 0.2.90
|
%define desktop_file_utils_version 0.2.90
|
||||||
%define nss_version 3.11.1
|
%define nss_version 3.11.1
|
||||||
|
|
||||||
Name: gdm
|
Name: gdm
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 42.0
|
Version: 43.0
|
||||||
Release: 2
|
Release: 1
|
||||||
Summary: A graphical display manager
|
Summary: The GNOME Display Manager
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: https://wiki.gnome.org/Projects/GDM
|
URL: https://wiki.gnome.org/Projects/GDM
|
||||||
Source0: http://download.gnome.org/sources/gdm/42/gdm-%{version}.tar.xz
|
Source0: http://download.gnome.org/sources/gdm/43/gdm-%{version}.tar.xz
|
||||||
Source1: org.gnome.login-screen.gschema.override
|
Source1: org.gnome.login-screen.gschema.override
|
||||||
Source5: default.pa-for-gdm
|
Source5: default.pa-for-gdm
|
||||||
|
|
||||||
Patch0: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
|
Patch0: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
|
||||||
Patch1: 0001-Honor-initial-setup-being-disabled-by-distro-install.patch
|
Patch1: 0001-data-add-system-dconf-databases-to-gdm-profile.patch
|
||||||
Patch2: gdm-should-recover-automatically.patch
|
|
||||||
Patch3: 9000-add-openeuler-pam-config.patch
|
|
||||||
|
|
||||||
BuildRequires: meson automake autoconf systemd dconf itstool libtool which
|
BuildRequires: accountsservice-devel
|
||||||
BuildRequires: systemd-devel libselinux-devel libattr-devel gettext-devel
|
BuildRequires: audit-libs-devel >= %{libauditver}
|
||||||
BuildRequires: yelp-devel yelp-tools plymouth-devel libdmx-devel libXdmcp-devel
|
BuildRequires: dconf
|
||||||
BuildRequires: xorg-x11-server-Xorg xorg-x11-server-devel keyutils-libs-devel accountsservice-devel
|
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
||||||
BuildRequires: pkgconfig(check) pkgconfig(gobject-introspection-1.0) pkgconfig(libcanberra-gtk3)
|
BuildRequires: gettext-devel
|
||||||
BuildRequires: pkgconfig(iso-codes) pkgconfig(gudev-1.0)
|
BuildRequires: keyutils-libs-devel
|
||||||
BuildRequires: pkgconfig(ply-boot-client) pkgconfig(x11) pkgconfig(xau)
|
BuildRequires: libXdmcp-devel
|
||||||
BuildRequires: desktop-file-utils >= %{desktop_file_utils_version}
|
BuildRequires: libattr-devel
|
||||||
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
BuildRequires: libdmx-devel
|
||||||
BuildRequires: nss-devel >= %{nss_version}
|
BuildRequires: meson
|
||||||
BuildRequires: pam-devel >= 0:%{pam_version}
|
BuildRequires: nss-devel >= %{nss_version}
|
||||||
BuildRequires: audit-devel >= %{libauditver}
|
BuildRequires: pam-devel >= 0:%{pam_version}
|
||||||
|
BuildRequires: pkgconfig(accountsservice) >= 0.6.3
|
||||||
|
BuildRequires: pkgconfig(check)
|
||||||
|
BuildRequires: pkgconfig(gobject-introspection-1.0)
|
||||||
|
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
||||||
|
BuildRequires: pkgconfig(gudev-1.0)
|
||||||
|
BuildRequires: pkgconfig(iso-codes)
|
||||||
|
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||||
|
BuildRequires: pkgconfig(libselinux)
|
||||||
|
BuildRequires: pkgconfig(libsystemd)
|
||||||
|
BuildRequires: pkgconfig(ply-boot-client)
|
||||||
|
BuildRequires: pkgconfig(systemd)
|
||||||
|
BuildRequires: pkgconfig(x11)
|
||||||
|
BuildRequires: pkgconfig(xau)
|
||||||
|
BuildRequires: pkgconfig(xorg-server)
|
||||||
|
BuildRequires: plymouth-devel
|
||||||
|
BuildRequires: systemd
|
||||||
|
BuildRequires: which
|
||||||
|
BuildRequires: xorg-x11-server-Xorg
|
||||||
|
BuildRequires: xorg-x11-server-devel
|
||||||
|
BuildRequires: yelp-devel
|
||||||
|
BuildRequires: yelp-tools
|
||||||
|
|
||||||
|
Requires: accountsservice
|
||||||
|
Requires: audit-libs >= %{libauditver}
|
||||||
|
Requires: dconf
|
||||||
|
Requires: gnome-keyring-pam
|
||||||
|
Requires: gnome-session
|
||||||
|
Requires: gnome-session-wayland-session
|
||||||
|
Requires: gnome-settings-daemon >= 3.27.90
|
||||||
|
Requires: gnome-shell
|
||||||
|
Requires: iso-codes
|
||||||
|
Requires: libXau >= 1.0.4-4
|
||||||
|
Requires: pam >= 0:%{pam_version}
|
||||||
|
Requires: /sbin/nologin
|
||||||
|
Requires: setxkbmap
|
||||||
|
Requires: systemd >= 186
|
||||||
|
Requires: system-logos
|
||||||
|
Requires: systemd-pam
|
||||||
|
Requires: xhost xmodmap xrdb
|
||||||
|
Requires: xorg-x11-xinit
|
||||||
|
Requires: /usr/bin/dbus-run-session
|
||||||
|
|
||||||
|
Provides: service(graphical-login) = %{name}
|
||||||
|
Provides: gdm-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
||||||
|
Provides: gdm-plugin-smartcard = %{epoch}:%{version}-%{release}
|
||||||
|
Provides: gdm-plugin-fingerprint = %{epoch}:%{version}-%{release}
|
||||||
|
Provides: pulseaudio-gdm-hooks = 1:%{version}-%{release}
|
||||||
|
Obsoletes: gdm-libs < 1:%{version}-%{release} gdm-plugin-smartcard < 1:%{version}-%{release}
|
||||||
|
Obsoletes: gdm-plugin-fingerprint < 1:%{version}-%{release} pulseaudio-gdm-hooks < 1:%{version}-%{release}
|
||||||
|
|
||||||
Requires(pre): shadow-utils
|
Requires(pre): shadow-utils
|
||||||
Requires(post): systemd
|
Requires(post): systemd
|
||||||
Requires(preun): systemd
|
Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
|
|
||||||
Requires: accountsservice dconf gnome-keyring-pam gnome-session dbus-daemon
|
|
||||||
Requires: gnome-session-wayland-session gnome-settings-daemon >= 3.27.90 gnome-shell iso-codes
|
|
||||||
Requires: libXau >= 1.0.4-4 util-linux systemd >= 186 xorg-x11-xkb-utils
|
|
||||||
Requires: system-logos xorg-x11-server-utils xorg-x11-xinit systemd-pam
|
|
||||||
Requires: audit-libs >= %{libauditver} pam >= 0:%{pam_version}
|
|
||||||
|
|
||||||
Provides: service(graphical-login) = %{name}
|
|
||||||
Provides: gdm-libs%{?_isa} = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: gdm-plugin-smartcard = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: gdm-plugin-fingerprint = %{epoch}:%{version}-%{release}
|
|
||||||
Provides: pulseaudio-gdm-hooks = 1:%{version}-%{release}
|
|
||||||
Obsoletes: gdm-libs < 1:%{version}-%{release} gdm-plugin-smartcard < 1:%{version}-%{release}
|
|
||||||
Obsoletes: gdm-plugin-fingerprint < 1:%{version}-%{release} pulseaudio-gdm-hooks < 1:%{version}-%{release}
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The GNOME Display Manager is a system service that is responsible for
|
GDM, the GNOME Display Manager, handles authentication-related backend
|
||||||
providing graphical log-ins and managing local and remote displays,
|
functionality for logging in a user and unlocking the user's session after
|
||||||
and if the session doesn't provide a display server, GDM will start
|
it's been locked. GDM also provides functionality for initiating user-switching,
|
||||||
the display server. It also provides initiate functionality for
|
so more than one user can be logged in at the same time. It handles
|
||||||
user-switching, so multiple users can be logged in at the same time.
|
graphical session registration with the system for both local and remote
|
||||||
|
sessions (in the latter case, via the XDMCP protocol). In cases where the
|
||||||
|
session doesn't provide it's own display server, GDM can start the display
|
||||||
|
server on behalf of the session.
|
||||||
|
|
||||||
%package devel
|
%package devel
|
||||||
Summary: Development files for gdm
|
Summary: Development files for gdm
|
||||||
Requires: %{name} = %{epoch}:%{version}-%{release} pam-devel
|
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||||
Provides: gdm-pam-extensions-devel = %{epoch}:%{version}-%{release}
|
Requires: pam-devel
|
||||||
Obsoletes: gdm-pam-extensions-devel < %{epoch}:%{version}-%{release}
|
Provides: gdm-pam-extensions-devel = %{epoch}:%{version}-%{release}
|
||||||
|
Obsoletes: gdm-pam-extensions-devel < %{epoch}:%{version}-%{release}
|
||||||
|
|
||||||
%description devel
|
%description devel
|
||||||
The gdm-devel package contains header files and others for building
|
The gdm-devel package contains headers and other
|
||||||
applications that use GDM.
|
files needed to build custom greeters.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -n %{name}-%{version} -p1
|
%autosetup -n %{name}-%{version} -p1
|
||||||
|
sed -i '/ExecStart/i ExecStartPre=\/bin\/sh -c "systemctl stop session-c*.scope"' data/gdm.service.in
|
||||||
|
sed -i "/redhat-release/i \ \ \ \ '\/etc\/openEuler-release': 'redhat'," meson.build
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%meson -Dpam-prefix=%{_sysconfdir} \
|
%meson -Dpam-prefix=%{_sysconfdir} \
|
||||||
@ -94,6 +135,7 @@ install -d %{buildroot}/run/gdm
|
|||||||
%meson_install
|
%meson_install
|
||||||
|
|
||||||
install -p -m644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/lib/gdm/.config/pulse/default.pa
|
install -p -m644 -D %{SOURCE5} %{buildroot}%{_localstatedir}/lib/gdm/.config/pulse/default.pa
|
||||||
|
#install -p -m644 -D %{SOURCE6} %{buildroot}%{_sysusersdir}/%{name}.conf
|
||||||
rm -f %{buildroot}%{_sysconfdir}/pam.d/gdm
|
rm -f %{buildroot}%{_sysconfdir}/pam.d/gdm
|
||||||
cp -a %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
|
cp -a %{SOURCE1} %{buildroot}%{_datadir}/glib-2.0/schemas
|
||||||
rm -rf %{buildroot}/%{_prefix}/doc
|
rm -rf %{buildroot}/%{_prefix}/doc
|
||||||
@ -177,6 +219,7 @@ fi
|
|||||||
%config %{_sysconfdir}/gdm/PostSession/*
|
%config %{_sysconfdir}/gdm/PostSession/*
|
||||||
%config %{_sysconfdir}/pam.d/gdm-autologin
|
%config %{_sysconfdir}/pam.d/gdm-autologin
|
||||||
%config %{_sysconfdir}/pam.d/gdm-password
|
%config %{_sysconfdir}/pam.d/gdm-password
|
||||||
|
# not config files
|
||||||
%{_sysconfdir}/gdm/Xsession
|
%{_sysconfdir}/gdm/Xsession
|
||||||
%{_datadir}/gdm/gdm.schemas
|
%{_datadir}/gdm/gdm.schemas
|
||||||
%{_sysconfdir}/dbus-1/system.d/gdm.conf
|
%{_sysconfdir}/dbus-1/system.d/gdm.conf
|
||||||
@ -225,17 +268,20 @@ fi
|
|||||||
%{_unitdir}/gdm.service
|
%{_unitdir}/gdm.service
|
||||||
%dir %{_userunitdir}/gnome-session@gnome-login.target.d/
|
%dir %{_userunitdir}/gnome-session@gnome-login.target.d/
|
||||||
%{_userunitdir}/gnome-session@gnome-login.target.d/session.conf
|
%{_userunitdir}/gnome-session@gnome-login.target.d/session.conf
|
||||||
|
#%%{_sysusersdir}/%{name}.conf
|
||||||
|
|
||||||
%files devel
|
%files devel
|
||||||
%dir %{_includedir}/gdm
|
%dir %{_includedir}/gdm
|
||||||
%{_includedir}/gdm/*.h
|
%{_includedir}/gdm/*.h
|
||||||
%exclude %{_includedir}/gdm/gdm-pam-extensions.h
|
|
||||||
%dir %{_datadir}/gir-1.0
|
%dir %{_datadir}/gir-1.0
|
||||||
%{_datadir}/gir-1.0/Gdm-1.0.gir
|
%{_datadir}/gir-1.0/Gdm-1.0.gir
|
||||||
%{_libdir}/pkgconfig/gdm.pc
|
%{_libdir}/pkgconfig/gdm.pc
|
||||||
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
|
%{_libdir}/pkgconfig/gdm-pam-extensions.pc
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1:43.0-1
|
||||||
|
- Update to 43.0
|
||||||
|
|
||||||
* Mon Aug 1 2022 caodongxia <caodongxia@h-partners.com> - 1:42.0-2
|
* Mon Aug 1 2022 caodongxia <caodongxia@h-partners.com> - 1:42.0-2
|
||||||
- The installation dependency pam is added to solve the gdm.servic startup problem
|
- The installation dependency pam is added to solve the gdm.servic startup problem
|
||||||
|
|
||||||
|
|||||||
1
gdm.sysusers
Normal file
1
gdm.sysusers
Normal file
@ -0,0 +1 @@
|
|||||||
|
u gdm 42 "GNOME Display Manager" /var/lib/gdm
|
||||||
Loading…
x
Reference in New Issue
Block a user