move sockets back to /var/run/screen (#676663)

screen.spec

@@ -3,10 +3,11 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.1.0
-Release: 0.2.20101110git066b098%{?dist}
+Release: 0.3.20101110git066b098%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
+Requires(pre): /usr/sbin/groupadd
 Requires(preun): /sbin/install-info
 Requires(post): /sbin/install-info
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,7 +53,6 @@ support multiple logins on one terminal.
 	--with-pty-mode=0620 \
 	--with-pty-group=$(getent group tty | cut -d : -f 3) \
 	--with-sys-screenrc="%{_sysconfdir}/screenrc" \
-%{!?with_multiuser: --disable-socket-dir} \
 	--with-socket-dir="%{_localstatedir}/run/screen"
 
 # We would like to have braille support.
@@ -83,7 +83,6 @@ cat etc/screenrc >> $RPM_BUILD_ROOT%{_sysconfdir}/screenrc
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pam.d
 install -p -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/screen
 
-%if %{with multiuser}
 # Create the socket dir
 mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/screen
 
@@ -91,9 +90,12 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/screen
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
 cat <<EOF > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/screen.conf
 # screen needs directory in /var/run
-d /var/run/screen 0755 root root
+%if %{with multiuser}
-EOF
+d %{_localstatedir}/run/screen 0755 root root
+%else
+d %{_localstatedir}/run/screen 0775 root screen
 %endif
+EOF
 
 # Remove files from the buildroot which we don't want packaged
 rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -101,6 +103,10 @@ rm -f $RPM_BUILD_ROOT%{_infodir}/dir
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%pre
+/usr/sbin/groupadd -g 84 -r -f screen
+:
+
 %post
 /sbin/install-info %{_infodir}/screen.info.gz %{_infodir}/dir --entry="* screen: (screen).				Terminal multiplexer." &> /dev/null
 :
@@ -119,15 +125,19 @@ fi
 %{_datadir}/screen
 %config(noreplace) %{_sysconfdir}/screenrc
 %config(noreplace) %{_sysconfdir}/pam.d/screen
+%{_sysconfdir}/tmpfiles.d/screen.conf
 %if %{with multiuser}
 %attr(4755,root,root) %{_bindir}/screen
 %attr(755,root,root) %{_localstatedir}/run/screen
-%{_sysconfdir}/tmpfiles.d/screen.conf
 %else
-%attr(755,root,root) %{_bindir}/screen
+%attr(2755,root,screen) %{_bindir}/screen
+%attr(775,root,screen) %{_localstatedir}/run/screen
 %endif
 
 %changelog
+* Tue Feb 10 2011 Miroslav Lichvar <mlichvar@redhat.com> - 4.1.0-0.3.20101110git066b098
+- move sockets back to /var/run/screen (#676663)
+
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.1.0-0.2.20101110git066b098
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild