Accepting request 143527 from home:rwooninck:CK-removal
Remove ConsoleKit patch+requires in order to be able to remove ConsoleKit from Factory. OBS-URL: https://build.opensuse.org/request/show/143527 OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xdm?expand=0&rev=20
This commit is contained in:
parent
498a2fae37
commit
cc105a6026
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 15 20:21:24 UTC 2012 - tittiatcoke@gmail.com
|
||||
|
||||
- Added a switch to enable building against systemd-logind and
|
||||
to remove the dependency on ConsoleKit
|
||||
- Enabled the systemd switch already for Factory
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 25 10:21:24 UTC 2012 - werner@suse.de
|
||||
|
||||
|
13
xdm.spec
13
xdm.spec
@ -15,6 +15,11 @@
|
||||
# Please submit bugfixes or comments via http://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
%if 0%{?suse_version} > 1220
|
||||
%define with_systemd 1
|
||||
%else
|
||||
%define with_systemd 0
|
||||
%endif
|
||||
|
||||
%define _dminitdir %{_libexecdir}/X11/displaymanagers
|
||||
|
||||
@ -35,12 +40,13 @@ Source0: http://xorg.freedesktop.org/releases/individual/app/%{name}-%{ve
|
||||
Source1: xdm.tar.bz2
|
||||
Source2: HOWTO.xdm
|
||||
Source3: xdm-fallbacks.tar.bz2
|
||||
%if !%with_systemd
|
||||
Patch0: xdm-consolekit.diff
|
||||
%endif
|
||||
Patch1: xdm-tolerant-hostname-changes.diff
|
||||
Patch2: U_xdm_config-AC_LIBTOOL_DLOPEN-is-required-for-dynamic-lin.patch
|
||||
Patch3: U_xdm_config-use-libtool-export-dynamic-option-for-reverse.patch
|
||||
Patch4: U_xdm_Fix-missing-linking-dependency-on-ldl.patch
|
||||
BuildRequires: ConsoleKit-devel
|
||||
%if 0%{?suse_version} >= 01140
|
||||
# Needed to create the man page symlink to init.d
|
||||
BuildRequires: aaa_base-extras
|
||||
@ -61,7 +67,10 @@ BuildRequires: pkgconfig(xorg-macros) >= 1.4
|
||||
BuildRequires: pkgconfig(xpm)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: pkgconfig(xtrans)
|
||||
%if !%with_systemd
|
||||
BuildRequires: ConsoleKit-devel
|
||||
Requires: ConsoleKit
|
||||
%endif
|
||||
Requires: logrotate
|
||||
Requires: sessreg
|
||||
Requires: xrdb
|
||||
@ -78,7 +87,9 @@ or remote servers.
|
||||
%prep
|
||||
%setup -q
|
||||
cp %{SOURCE2} .
|
||||
%if !%with_systemd
|
||||
%patch0 -p1
|
||||
%endif
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
Loading…
Reference in New Issue
Block a user