diff --git a/screen.changes b/screen.changes index 2db8803..aaa01c7 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Tue Apr 15 14:27:09 UTC 2014 - aj@suse.com + +- Fix comment. + +------------------------------------------------------------------- +Tue Apr 15 10:04:14 UTC 2014 - aj@suse.com + +- Use /run instead of /var/run. + ------------------------------------------------------------------- Fri Sep 13 15:17:12 CEST 2013 - mls@suse.de diff --git a/screen.conf b/screen.conf index 92c5a1c..0719931 100644 --- a/screen.conf +++ b/screen.conf @@ -1,4 +1,4 @@ -# Screen needs some files in /var/run: -d /var/run/screens 0755 root root - -d /var/run/uscreens 1777 root root - +# Screen needs some files in /run: +d /run/screens 0755 root root - +d /run/uscreens 1777 root root - diff --git a/screen.spec b/screen.spec index 4976248..94e9a5a 100644 --- a/screen.spec +++ b/screen.spec @@ -1,7 +1,7 @@ # # spec file for package screen # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -75,7 +75,7 @@ Documentation: man page %build CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ --mandir=%{_mandir} \ - --with-socket-dir='(eff_uid ? "/var/run/uscreens" : "/var/run/screens")' \ + --with-socket-dir='(eff_uid ? "/run/uscreens" : "/run/screens")' \ --with-sys-screenrc=/etc/screenrc \ --with-pty-group=5 \ --enable-use-locale \ @@ -92,10 +92,10 @@ chmod 755 $RPM_BUILD_ROOT/usr/bin/screen mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d -mkdir -p $RPM_BUILD_ROOT/var/run/screens -chmod 755 $RPM_BUILD_ROOT/var/run/screens -mkdir -p $RPM_BUILD_ROOT/var/run/uscreens -chmod 1777 $RPM_BUILD_ROOT/var/run/uscreens +mkdir -p $RPM_BUILD_ROOT/run/screens +chmod 755 $RPM_BUILD_ROOT/run/screens +mkdir -p $RPM_BUILD_ROOT/run/uscreens +chmod 1777 $RPM_BUILD_ROOT/run/uscreens install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d @@ -108,8 +108,8 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/screen.conf /usr/share/screen/utf8encodings # Created via aaa_base or systemd on system boot -%ghost %dir /var/run/screens -%ghost %dir /var/run/uscreens +%ghost %dir /run/screens +%ghost %dir /run/uscreens %doc %{_infodir}/screen.info*.gz %doc %{_mandir}/man1/screen.1.gz @@ -118,8 +118,8 @@ install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d # Create our dirs immediatly, after a manual package install. # After a reboot systemd/aaa_base will take care. -test -d /var/run/screens || mkdir -m 755 /var/run/screens -test -d /var/run/uscreens || mkdir -m 1777 /var/run/uscreens +test -d /run/screens || mkdir -m 755 /run/screens +test -d /run/uscreens || mkdir -m 1777 /run/uscreens %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz