From 70791903cd8919a7d093bb54603fa7f05b174f77 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Feb 13 2019 15:25:34 +0000
Subject: Fix stripping leading whitespace from rstart{,d} scripts


---

diff --git a/rstart-1.0.2-shbang.patch b/rstart-1.0.2-shbang.patch
deleted file mode 100644
index 6848615..0000000
--- a/rstart-1.0.2-shbang.patch
+++ /dev/null
@@ -1,113 +0,0 @@
-diff -up rstart-1.0.2/rstartd.jx rstart-1.0.2/rstartd
---- rstart-1.0.2/rstartd.jx	2018-03-12 15:28:09.000000000 -0400
-+++ rstart-1.0.2/rstartd	2018-03-12 15:30:30.202897948 -0400
-@@ -1,53 +1,3 @@
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- #! /bin/sh
- # $Xorg: server.cpp,v 1.3 2000/08/17 19:54:01 cpqbld Exp $
- #
-diff -up rstart-1.0.2/rstart.jx rstart-1.0.2/rstart
---- rstart-1.0.2/rstart.jx	2018-03-12 15:28:09.000000000 -0400
-+++ rstart-1.0.2/rstart	2018-03-12 15:30:35.944981809 -0400
-@@ -1,52 +1,3 @@
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
--
- #! /bin/sh
- # $Xorg: client.cpp,v 1.4 2000/12/20 16:41:43 pookie Exp $
- #
diff --git a/xorg-x11-xsm.spec b/xorg-x11-xsm.spec
index 118b7fc..eb41d8b 100644
--- a/xorg-x11-xsm.spec
+++ b/xorg-x11-xsm.spec
@@ -5,7 +5,7 @@ Name: xorg-x11-%{pkgname}
 # NOTE: The Version field should be the version of the xsm tarball.
 Version: 1.0.4
 # Bump the release on rebuilds/bugfixes/etc.
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: MIT
 URL: http://www.x.org
 
@@ -22,7 +22,6 @@ Patch20: smproxy-1.0.4-ice.patch
 
 # Patches for rstart (30-39)
 Patch30: rstart-1.0.2-rstart-installation-location-fixes.patch
-Patch31: rstart-1.0.2-shbang.patch
 
 BuildRequires: automake autoconf
 
@@ -44,7 +43,6 @@ X.Org X11 X Session Manager
 %setup -q -c %{name}-%{version} -a1 -a2
 %patch20 -p0 -b .ice
 %patch30 -p0 -b .rstart-installation-location-fixes
-%patch31 -p0 -b .shbang
 
 %build
 # Build everything
@@ -69,6 +67,10 @@ done
    done
 }
 
+# strip leading blank lines before the #!/bin/sh
+sed -i -e '/./,$!d' $RPM_BUILD_ROOT%{_bindir}/rstart
+sed -i -e '/./,$!d' $RPM_BUILD_ROOT%{_bindir}/rstartd
+
 %files
 %doc xsm-*/COPYING xsm-*/README xsm-*/ChangeLog
 
@@ -101,6 +103,9 @@ done
 %config %{_sysconfdir}/X11/xsm/system.xsm
 
 %changelog
+* Wed Feb 13 2019 Adam Jackson <ajax@redhat.com> - 1.0.4-4
+- Fix stripping leading whitespace from rstart{,d} scripts
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild