pool/screen
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 230175 from home:a_jaeger:FactoryFix

Browse Source 
Use /run instead of /var/run

OBS-URL: https://build.opensuse.org/request/show/230175
OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=50
This commit is contained in:
Michael Schröder 2014-04-15 11:04:27 +00:00 committed by Git OBS Bridge
parent be806c5948
commit 497dd8f73b
3 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
screen.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
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 Fri Sep 13 15:17:12 CEST 2013 - mls@suse.de

4
screen.conf
View File

@ -1,4 +1,4 @@
# Screen needs some files in /var/run: # Screen needs some files in /var/run:
d /var/run/screens 0755 root root - d /run/screens 0755 root root -
d /var/run/uscreens 1777 root root - d /run/uscreens 1777 root root -

20
screen.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package screen # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -75,7 +75,7 @@ Documentation: man page
%build %build
CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \ CFLAGS="-DMAXWIN=1000 $RPM_OPT_FLAGS" %configure --prefix=/usr --infodir=%{_infodir} \
--mandir=%{_mandir} \ --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-sys-screenrc=/etc/screenrc \
--with-pty-group=5 \ --with-pty-group=5 \
--enable-use-locale \ --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/etc
mkdir -p $RPM_BUILD_ROOT/usr/lib mkdir -p $RPM_BUILD_ROOT/usr/lib
mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d mkdir -p $RPM_BUILD_ROOT/usr/lib/tmpfiles.d
mkdir -p $RPM_BUILD_ROOT/var/run/screens mkdir -p $RPM_BUILD_ROOT/run/screens
chmod 755 $RPM_BUILD_ROOT/var/run/screens chmod 755 $RPM_BUILD_ROOT/run/screens
mkdir -p $RPM_BUILD_ROOT/var/run/uscreens mkdir -p $RPM_BUILD_ROOT/run/uscreens
chmod 1777 $RPM_BUILD_ROOT/var/run/uscreens chmod 1777 $RPM_BUILD_ROOT/run/uscreens
install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc
install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d 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/lib/tmpfiles.d/screen.conf
/usr/share/screen/utf8encodings /usr/share/screen/utf8encodings
# Created via aaa_base or systemd on system boot # Created via aaa_base or systemd on system boot
%ghost %dir /var/run/screens %ghost %dir /run/screens
%ghost %dir /var/run/uscreens %ghost %dir /run/uscreens
%doc %{_infodir}/screen.info*.gz %doc %{_infodir}/screen.info*.gz
%doc %{_mandir}/man1/screen.1.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. # Create our dirs immediatly, after a manual package install.
# After a reboot systemd/aaa_base will take care. # After a reboot systemd/aaa_base will take care.
test -d /var/run/screens || mkdir -m 755 /var/run/screens test -d /run/screens || mkdir -m 755 /run/screens
test -d /var/run/uscreens || mkdir -m 1777 /var/run/uscreens test -d /run/uscreens || mkdir -m 1777 /run/uscreens
%postun %postun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz