[packages/screen] - revert to home .screen dir

arekm arekm at pld-linux.org
Wed Dec 12 20:21:19 CET 2012


commit c2321e88f4ca5936f333034e37940457d973dc0b
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Wed Dec 12 20:21:17 2012 +0100

    - revert to home .screen dir

 screen.spec | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)
---
diff --git a/screen.spec b/screen.spec
index 9bd6bc5..8bc896e 100644
--- a/screen.spec
+++ b/screen.spec
@@ -149,7 +149,7 @@ CFLAGS="%{rpmcflags} -DMAXWIN=256"
 	--with-sys-screenrc=/etc/screenrc \
 	--with-pty-mode=0620 \
 	--with-pty-group=5 \
-	--with-socket-dir="%{_localstatedir}/run/screen"
+	--disable-socket-dir
 
 %{__make} -j1
 
@@ -176,16 +176,6 @@ cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/screen
 bzip2 -dc %{SOURCE1} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.screen-non-english-man-pages
 
-# Create the socket dir
-install -d $RPM_BUILD_ROOT%{_localstatedir}/run/screen
-
-# And tell systemd to recreate it on start with tmpfs
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/screen.conf
-# screen needs directory in /var/run
-d %{_localstatedir}/run/screen 0775 root screen
-EOF
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -200,7 +190,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS README ChangeLog doc/{FAQ,README.DOTSCREEN} etc/screenrc
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/screenrc
 %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/*
-%{_sysconfdir}/tmpfiles.d/screen.conf
 %attr(755,root,root) %{_bindir}/screen
 %{_datadir}/screen
 %{_mandir}/man1/*
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/screen.git/commitdiff/c2321e88f4ca5936f333034e37940457d973dc0b



More information about the pld-cvs-commit mailing list