- more cleanup
* no longer support sle12; adjusted xdm.tar.bz2 and
applied xdm-with-update-alternative.patch to this tarball
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=210
This commit is contained in:
Git OBS Bridge
parent
0a60c1edee
commit
af95512d55
@ -1,57 +0,0 @@
|
||||
---
|
||||
etc/X11/xdm/Xservers | 3 ++-
|
||||
usr/lib/X11/display-manager | 7 +++++--
|
||||
var/adm/fillup-templates/sysconfig.displaymanager | 8 --------
|
||||
3 files changed, 7 insertions(+), 11 deletions(-)
|
||||
|
||||
--- xdm.old/etc/X11/xdm/Xservers 2018-04-05 14:48:56.669172739 +0200
|
||||
+++ xdm.new/etc/X11/xdm/Xservers 2018-04-05 14:45:33.129981406 +0200
|
||||
@@ -13,6 +13,7 @@
|
||||
# use such a line to enable the console login option in the kdm menu
|
||||
#:0 local@tty1 /usr/bin/X vt7
|
||||
# "reserve" means that the X server gets only started on request (only kdm)
|
||||
+# -keeptty implies that controlling tty is not detached (breaks startx!)
|
||||
|
||||
-:0 local /usr/bin/X -nolisten tcp -br vt7
|
||||
+:0 local /usr/bin/X -nolisten tcp -br vt7 -keeptty
|
||||
|
||||
--- xdm.old/usr/lib/X11/display-manager
|
||||
+++ xdm.new/usr/lib/X11/display-manager 2018-04-05 12:44:11.247521173 +0000
|
||||
@@ -121,6 +121,8 @@ plymouth_quit()
|
||||
|
||||
#set -x
|
||||
|
||||
+# DISPLAYMANAGER used to be set in /etc/sysconfig/displaymanager, but the default is now set by update-alternatives
|
||||
+DISPLAYMANAGER=$(realpath --relative-base=/usr/lib/X11/displaymanagers /usr/lib/X11/displaymanagers/default-displaymanager)
|
||||
DM=${DISPLAYMANAGER##*/}
|
||||
|
||||
case "$DM" in
|
||||
@@ -138,8 +140,9 @@ case "$DM" in
|
||||
for i in $DISPLAY_MANAGERS
|
||||
do
|
||||
name="${i}_vars"
|
||||
- PIDFILE=/run/$i.pid;
|
||||
- $name $DM && break;
|
||||
+ type -t $name &> /dev/null || continue
|
||||
+ PIDFILE=/run/$i.pid
|
||||
+ $name $DM && break
|
||||
done
|
||||
if [ -z "$DISPLAYMANAGER" -o ! -x "$DISPLAYMANAGER" ]
|
||||
then
|
||||
--- xdm.old/var/adm/fillup-templates/sysconfig.displaymanager
|
||||
+++ xdm.new/var/adm/fillup-templates/sysconfig.displaymanager 2017-10-12 14:35:23.775259305 +0000
|
||||
@@ -1,14 +1,6 @@
|
||||
## Path: Desktop/Display manager
|
||||
## Description: settings to generate a proper displaymanager config
|
||||
|
||||
-## Type: string(kdm,xdm,gdm,wdm,entrance,console,lightdm,sddm)
|
||||
-## Default: ""
|
||||
-#
|
||||
-# Here you can set the default Display manager (kdm/xdm/gdm/wdm/entrance/console).
|
||||
-# all changes in this file require a restart of the displaymanager
|
||||
-#
|
||||
-DISPLAYMANAGER=""
|
||||
-
|
||||
## Type: yesno
|
||||
## Default: no
|
||||
#
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 4 11:17:34 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- more cleanup
|
||||
* no longer support sle12; adjusted xdm.tar.bz2 and
|
||||
applied xdm-with-update-alternative.patch to this tarball
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Sep 4 10:29:39 UTC 2020 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
||||
42
xdm.spec
42
xdm.spec
@ -35,10 +35,9 @@ Source2: HOWTO.xdm
|
||||
Source4: display-manager.service
|
||||
Source5: xsession.desktop
|
||||
Patch1: xdm-tolerant-hostname-changes.diff
|
||||
# PATCH-FEATURE-OPENSUSE xdm-with-update-alternative.patch dimstar@opensuse.org -- Choice of default DM by means of u-a
|
||||
Patch2: xdm-with-update-alternative.patch
|
||||
# needed for patch0, patch2, patch3, patch4
|
||||
Patch3: n_Allow-the-greeter-to-set-the-input-fields-bg-color.patch
|
||||
BuildRequires: firewall-macros
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pam-devel
|
||||
BuildRequires: pkgconfig
|
||||
@ -54,9 +53,6 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.4
|
||||
BuildRequires: pkgconfig(xpm)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: pkgconfig(xtrans)
|
||||
%if 0%{?suse_version} > 1320
|
||||
BuildRequires: firewall-macros
|
||||
%endif
|
||||
Requires: %fillup_prereq
|
||||
Requires: /sbin/pidof
|
||||
Requires: /sbin/startproc
|
||||
@ -72,17 +68,9 @@ Requires: xsetroot
|
||||
Recommends: dbus-1-x11
|
||||
# This was part of the xorg-x11 package up to version 7.6
|
||||
Conflicts: xorg-x11 <= 7.6
|
||||
%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
|
||||
# Needed to create the man page symlink to init.d
|
||||
BuildRequires: aaa_base-extras
|
||||
%endif
|
||||
BuildRequires: systemd-rpm-macros
|
||||
%{?systemd_requires}
|
||||
%if 0%{?suse_version} > 1320
|
||||
Requires: xterm-bin
|
||||
%else
|
||||
Requires: xterm
|
||||
%endif
|
||||
|
||||
%description
|
||||
Xdm manages a collection of X displays, which may be on the local host
|
||||
@ -129,20 +117,6 @@ rm %{buildroot}%{_sysconfdir}/X11/xdm/{GiveConsole,TakeConsole,Xsetup_0}
|
||||
pushd %{buildroot}
|
||||
# SuSE default XDM configuration
|
||||
tar xf %{SOURCE1}
|
||||
%if 0%{?suse_version} > 1320
|
||||
rm etc/sysconfig/SuSEfirewall2.d/services/xdmcp
|
||||
rmdir etc/sysconfig/SuSEfirewall2.d/services
|
||||
rmdir etc/sysconfig/SuSEfirewall2.d
|
||||
rmdir etc/sysconfig
|
||||
%else
|
||||
rm usr/lib/firewalld/services/x11.xml
|
||||
rmdir usr/lib/firewalld/services
|
||||
rmdir usr/lib/firewalld
|
||||
%endif
|
||||
%if 0%{?suse_version} >= 1330
|
||||
patch -p1 < %{PATCH2}
|
||||
rm -f usr/lib/X11/display-manager.orig
|
||||
%endif
|
||||
%if "%{_fillupdir}" != "/var/adm/fillup-templates"
|
||||
mkdir -p %{buildroot}$(dirname %{_fillupdir})
|
||||
mv %{buildroot}/var/adm/fillup-templates \
|
||||
@ -173,29 +147,23 @@ cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF'
|
||||
exec -a rcdisplay-manager %{_sbindir}/rcdisplay-manager ${1+"$@"}
|
||||
EOF
|
||||
chmod 0755 %{buildroot}%{_sbindir}/rcxdm
|
||||
%if 0%{?suse_version} >= 1330
|
||||
# prepare for defaul-dm to be chosen by means of update-alternatives
|
||||
mkdir -p %{buildroot}%{_sysconfdir}/alternatives
|
||||
touch %{buildroot}%{_sysconfdir}/alternatives/default-displaymanager
|
||||
ln -s %{_sysconfdir}/alternatives/default-displaymanager %{buildroot}/usr/lib/X11/displaymanagers/default-displaymanager
|
||||
# Inject a dummy 'console' selection - which used to be choice in /etc/sysconfig/displaymanager
|
||||
touch %{buildroot}/usr/lib/X11/displaymanagers/console
|
||||
%endif
|
||||
|
||||
%post
|
||||
%service_add_post display-manager.service
|
||||
%{fillup_only -n displaymanager}
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%{_sbindir}/update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager \
|
||||
default-displaymanager /usr/lib/X11/displaymanagers/console 5
|
||||
%{_sbindir}/update-alternatives --install /usr/lib/X11/displaymanagers/default-displaymanager \
|
||||
default-displaymanager /usr/lib/X11/displaymanagers/xdm 10
|
||||
# get rid of DISPLAYMANAGER in /etc/sysconfig/displaymanager (boo#1125040)
|
||||
sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
|
||||
%endif
|
||||
%if 0%{?suse_version} > 1320
|
||||
%firewalld_reload
|
||||
%endif
|
||||
|
||||
%pre
|
||||
%service_add_pre display-manager.service
|
||||
@ -203,12 +171,10 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
|
||||
%postun
|
||||
# Do not restart DM on update (bnc#886641)
|
||||
%service_del_postun -n display-manager.service
|
||||
%if 0%{?suse_version} >= 1330
|
||||
[ -f /usr/lib/X11/displaymanagers/console ] || %{_sbindir}/update-alternatives \
|
||||
--remove default-displaymanager /usr/lib/X11/displaymanagers/console
|
||||
[ -f /usr/lib/X11/displaymanagers/xdm ] || %{_sbindir}/update-alternatives \
|
||||
--remove default-displaymanager /usr/lib/X11/displaymanagers/xdm
|
||||
%endif
|
||||
|
||||
%preun
|
||||
%service_del_preun display-manager.service
|
||||
@ -219,20 +185,14 @@ sed -i 's/DISPLAYMANAGER=.*//g' /etc/sysconfig/displaymanager
|
||||
%doc HOWTO.xdm
|
||||
%dir %{_dminitdir}
|
||||
%{_dminitdir}/xdm
|
||||
%if 0%{?suse_version} >= 1330
|
||||
%{_dminitdir}/console
|
||||
/usr/lib/X11/displaymanagers/default-displaymanager
|
||||
%ghost %{_sysconfdir}/alternatives/default-displaymanager
|
||||
%endif
|
||||
%config %{_sysconfdir}/X11/xdm/
|
||||
%dir %{_sysconfdir}/X11/xdm/scripts
|
||||
%if 0%{?suse_version} > 1320
|
||||
%dir /usr/lib/firewalld
|
||||
%dir /usr/lib/firewalld/services
|
||||
/usr/lib/firewalld/services/x11.xml
|
||||
%else
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
|
||||
%endif
|
||||
%exclude %{_sysconfdir}/init.d/xdm
|
||||
%{_unitdir}/display-manager.service
|
||||
/usr/lib/X11/display-manager
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:3490e1140041d9bf6a9bfafc3f6e4ce0faf8ad04dbd53726ee0335f758882681
|
||||
size 23798
|
||||
oid sha256:8ae3032f832a90eae20a93fbde856450e702ab3f0b23f5c4abe70011bcc74de5
|
||||
size 23946
|
||||
|
||||
Loading…
Reference in New Issue
Block a user