rpm/xdm
SHA256
1
0
Fork 0
forked from pool/xdm
Code Pull Requests Activity

Accepting request 399984 from home:pjanouch:branches:X11:XOrg

Browse Source 
- spec-cleaner cleanups

- xdm.tar.bz2:
  sys.xsession - factor out scriptlets to add services
  to start in the context of a desktop session. These
  scriptlets sould be shipped with their respective
  services, not with xdm.
  Check etc/X11/sdm/scripts/xsession-sriptlets.HOWTO for
  further details (boo#972787).

- Simplify dbus detection to support all kind of (boo#980521) 
- Avoid option --write-env-file for newer gpg (boo#972787)

OBS-URL: https://build.opensuse.org/request/show/399984
OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=131
This commit is contained in:
Egbert Eich 2016-06-06 09:49:16 +00:00 committed by Git OBS Bridge
parent 5c8573530f
commit ea51843dfa
3 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xdm.changes
View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Fri Jun 03 13:49:07 UTC 2016 - pjanouch@suse.de
- spec-cleaner cleanups
-------------------------------------------------------------------
Fri Jun 03 13:48:56 UTC 2016 - eich@suse.com
- xdm.tar.bz2:
sys.xsession - factor out scriptlets to add services
to start in the context of a desktop session. These
scriptlets sould be shipped with their respective
services, not with xdm.
Check etc/X11/sdm/scripts/xsession-sriptlets.HOWTO for
further details (boo#972787).
-------------------------------------------------------------------
Wed May 25 10:44:56 UTC 2016 - werner@suse.de
- Simplify dbus detection to support all kind of (boo#980521)
- Avoid option --write-env-file for newer gpg (boo#972787)
-------------------------------------------------------------------
Fri May 6 21:14:31 UTC 2016 - eich@suse.com

58
xdm.spec
View File

@ -16,20 +16,20 @@
#
%define _dminitdir %{_libexecdir}/X11/displaymanagers
%if 0%{?suse_version} > 1230
%define with_systemd 1
%else
%define with_systemd 0
%endif
%define _dminitdir %{_libexecdir}/X11/displaymanagers
%if 0%{?suse_version} < 01210
%define dm_fallbacks 1
%else
%define dm_fallbacks 0
%endif
%if !%with_systemd
%define _unitdir %{_prefix}/lib/systemd/system
%endif
Name: xdm
Version: 1.1.11
Release: 0
@ -43,18 +43,12 @@ Source2: HOWTO.xdm
Source3: xdm-fallbacks.tar.bz2
Source4: display-manager.service
Source5: xsession.desktop
%if !%with_systemd
Patch0: xdm-consolekit.diff
%endif
Patch1: xdm-tolerant-hostname-changes.diff
%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
# Needed to create the man page symlink to init.d
BuildRequires: aaa_base-extras
%endif
# needed for patch0, patch2, patch3, patch4
BuildRequires: libtool
BuildRequires: pam-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xau)
BuildRequires: pkgconfig(xaw7)
@ -67,13 +61,6 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.4
BuildRequires: pkgconfig(xpm)
BuildRequires: pkgconfig(xt)
BuildRequires: pkgconfig(xtrans)
%if !%with_systemd
BuildRequires: ConsoleKit-devel
Requires: ConsoleKit
%else
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%endif
Requires: /sbin/pidof
Requires: logrotate
Requires: sessreg
@ -83,18 +70,28 @@ Requires: xmessage
Requires: xrdb
Requires: xset
Requires: xsetroot
%if 0%{?suse_version} > 1320
Requires: xterm-bin
%else
Requires: xterm
%endif
Recommends: dbus-1-x11
# This was part of the xorg-x11 package up to version 7.6
Conflicts: xorg-x11 <= 7.6
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%if !%with_systemd
%define _unitdir /usr/lib/systemd/system
Patch0: xdm-consolekit.diff
%endif
%if 0%{?suse_version} >= 01140 && 0%{?suse_version} < 1320
# Needed to create the man page symlink to init.d
BuildRequires: aaa_base-extras
%endif
%if !%with_systemd
BuildRequires: ConsoleKit-devel
Requires: ConsoleKit
%else
BuildRequires: systemd-rpm-macros
%{?systemd_requires}
%endif
%if 0%{?suse_version} > 1320
Requires: xterm-bin
%else
Requires: xterm
%endif
%description
@ -108,9 +105,9 @@ Requires: xdm
Supplements: xdm
%description xsession
This package contains the System desktop file which will cause
the execution of a user provided $HOME/.xsession script or pick
the system wide DM default set in /etc/sysconfig/displaymanager.
This package contains the System desktop file which will cause
the execution of a user provided $HOME/.xsession script or pick
the system wide DM default set in %{_sysconfdir}/sysconfig/displaymanager.
%prep
%setup -q
@ -159,7 +156,7 @@ rm %{buildroot}%{_libdir}/X11/xdm/libXdmGreet.la
mv %{buildroot}%{_libdir}/X11/xdm/chooser %{buildroot}%{_bindir}
# fdo#35868 (closed INVALID, but because of above fix, we want it)
ln -s xdm.1%{?ext_man} %{buildroot}%{_mandir}/man1/chooser.1%{?ext_man}
%__install -D %{S:5} -m 0644 %{buildroot}%{_datadir}/xsessions/xsession.desktop
install -D %{SOURCE5} -m 0644 %{buildroot}%{_datadir}/xsessions/xsession.desktop
%if 0%{?suse_version} < 1315
# missing manual page
mkdir -p %{buildroot}%{_mandir}/man8
@ -167,7 +164,7 @@ ln -s ../man7/init.d.7%{?ext_man} %{buildroot}%{_mandir}/man8/rcxdm.8%{?ext_man}
ln -sf %{_sysconfdir}/init.d/xdm %{buildroot}%{_sbindir}/rcxdm
%else
rm -f %{buildroot}%{_sbindir}/rcxdm
%__install -D %{S:4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
install -D %{SOURCE4} -m 0444 %{buildroot}%{_unitdir}/display-manager.service
ln -sf service %{buildroot}%{_sbindir}/rcdisplay-manager
cat > %{buildroot}%{_sbindir}/rcxdm <<-'EOF'
#!/bin/bash
@ -217,6 +214,7 @@ chmod 0755 %{buildroot}%{_sbindir}/rcxdm
%{_dminitdir}/wdm.fallback
%endif
%config %{_sysconfdir}/X11/xdm/
%dir %{_sysconfdir}/X11/xdm/scripts
%config(noreplace) %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/xdmcp
%if 0%{?suse_version} < 1315
%{_sysconfdir}/init.d/xdm

4
xdm.tar.bz2
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:38777b09a28f19fd77012bd68d83e398ab64457581a7baf9d38f42e89784d285
size 22583
oid sha256:446bc5f779347d8867e8d8e2012063d7d302631fac6de71424d9e05fb399b818
size 22422