[packages/xinitrc-ng] - rel 1.2 - merged patches - only xdm needs -nodaemon, added it to xinitrd config

[baggins]

commit 53f768d2a3a5b8e26237483d90cfaa4a8dcccd4c
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Jun 22 09:53:30 2025 +0200

    - rel 1.2
    - merged patches
    - only xdm needs -nodaemon, added it to xinitrd config

 sddm.patch            | 19 -------------------
 xinitrc-execute.patch | 11 -----------
 xinitrc-ng.spec       | 10 +++-------
 3 files changed, 3 insertions(+), 37 deletions(-)
---
diff --git a/xinitrc-ng.spec b/xinitrc-ng.spec
index 1960251..69a0ff9 100644
--- a/xinitrc-ng.spec
+++ b/xinitrc-ng.spec
@@ -3,14 +3,12 @@
 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:	5
+Version:	1.2
+Release:	1
 License:	GPL
 Group:		X11
 Source0:	%{name}-%{version}.tar.gz
-# Source0-md5:	f369317256368bf00dd07957929d5a63
-Patch0:		xinitrc-execute.patch
-Patch1:		sddm.patch
+# Source0-md5:	c64bf54a56bb7cabaf4568e7ae315517
 URL:		http://svn.pld-linux.org/trac/svn/wiki/packages/xinitrc-ng
 Requires:	/bin/sh
 Requires:	which
@@ -35,8 +33,6 @@ odpowiednie plik konfiguracyjne.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
diff --git a/sddm.patch b/sddm.patch
deleted file mode 100644
index 9fdb946..0000000
--- a/sddm.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- xinitrc-ng-1.1/prefdm.orig	2012-04-27 20:26:14.000000000 +0200
-+++ xinitrc-ng-1.1/prefdm	2021-02-18 13:31:01.084927767 +0100
-@@ -22,6 +22,8 @@
- 		preferred=/usr/bin/wdm
- 	elif [ "$DISPLAYMANAGER" = XDM ]; then
- 		preferred=/usr/bin/xdm
-+	elif [ "$DISPLAYMANAGER" = SDDM ]; then
-+		preferred=/usr/bin/sddm
- 	elif [ -n "$DISPLAYMANAGER" ]; then
- 		preferred=$DISPLAYMANAGER
- 	fi
-@@ -39,6 +41,7 @@
- [ -x /usr/sbin/gdm ] && exec /usr/sbin/gdm "$@" >/dev/null 2>&1 </dev/null
- [ -x /usr/bin/kdm ] && exec /usr/bin/kdm "$@" >/dev/null 2>&1 </dev/null
- [ -x /usr/bin/wdm ] && exec /usr/bin/wdm "$@" >/dev/null 2>&1 </dev/null
-+[ -x /usr/bin/sddm ] && exec /usr/bin/sddm "$@" >/dev/null 2>&1 </dev/null
- 
- # catch all exit error
- exit 1
diff --git a/xinitrc-execute.patch b/xinitrc-execute.patch
deleted file mode 100644
index d7a50ce..0000000
--- a/xinitrc-execute.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xinitrc-ng-1.1/xinitrc~	2011-07-27 23:59:12.000000000 +0300
-+++ xinitrc-ng-1.1/xinitrc	2014-06-06 01:33:19.861745454 +0300
-@@ -3,7 +3,7 @@
- # Call standard xinit actions
- . /etc/X11/xinit/xinitdefs
- 
--if [ -f $HOME/.Xclients ]; then
-+if [ -x $HOME/.Xclients ]; then
- 	exec $HOME/.Xclients "$@"
- else
- 	exec /etc/X11/xinit/Xclients "$@"
================================================================

---- gitweb:

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