[packages/xinitrc-ng] - ignore nodaemon in lightdm instead of partial hack to prefdm - rel 3

[baggins]

commit b51252bef6c1be4e6f002129eaa1508129e16bbb
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 30 14:06:50 2013 +0100

    - ignore nodaemon in lightdm instead of partial hack to prefdm
    - rel 3

 lightdm-no-to-nodaemon.patch | 11 -----------
 xinitrc-ng.spec              |  5 ++---
 2 files changed, 2 insertions(+), 14 deletions(-)
---
diff --git a/xinitrc-ng.spec b/xinitrc-ng.spec
index 7ae395a..8193185 100644
--- a/xinitrc-ng.spec
+++ b/xinitrc-ng.spec
@@ -4,12 +4,11 @@ Summary:	The default startup scripts for the X Window System
 Summary(pl.UTF-8):	Domyślne skrypty startowe X Window System
 Name:		xinitrc-ng
 Version:	1.1
-Release:	2
+Release:	3
 License:	GPL
 Group:		X11
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	f369317256368bf00dd07957929d5a63
-Patch0:		lightdm-no-to-nodaemon.patch
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng
 Requires:	/bin/sh
 Requires:	which
@@ -17,6 +16,7 @@ Requires:	xorg-app-setxkbmap
 Requires:	xorg-app-twm
 Requires:	xorg-app-xmodmap
 Requires:	xorg-app-xrdb
+Conflicts:	lightdm < 1.7.12-4
 Provides:	xinitrc >= 3.0
 Obsoletes:	xinitrc < 3.0
 Obsoletes:	xscripts
@@ -33,7 +33,6 @@ odpowiednie plik konfiguracyjne.
 
 %prep
 %setup -q
-%patch0 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/lightdm-no-to-nodaemon.patch b/lightdm-no-to-nodaemon.patch
deleted file mode 100644
index 06e5175..0000000
--- a/lightdm-no-to-nodaemon.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xinitrc-ng-1.1/prefdm~	2012-04-27 21:26:14.000000000 +0300
-+++ xinitrc-ng-1.1/prefdm	2013-09-06 00:22:55.596685047 +0300
-@@ -16,6 +16,8 @@
- 		preferred=/usr/bin/kdm
- 	elif [ "$DISPLAYMANAGER" = LightDM ]; then
- 		preferred=/usr/sbin/lightdm
-+		# reset argv, lightdm does not like "-nodaemon" argument
-+		set --
- 	elif [ "$DISPLAYMANAGER" = LXDE ]; then
- 		preferred=/usr/sbin/lxdm
- 	elif [ "$DISPLAYMANAGER" = WDM ]; then
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xinitrc-ng.git/commitdiff/b51252bef6c1be4e6f002129eaa1508129e16bbb