From 3555290a38dba70796385e6211dae684c60df33771b7ee7b8ad687f88ba499d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Wed, 6 Jul 2011 19:09:31 +0000 Subject: [PATCH] Accepting request 75493 from home:a_jaeger:branches:openSUSE:Factory Use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d. OBS-URL: https://build.opensuse.org/request/show/75493 OBS-URL: https://build.opensuse.org/package/show/Base:System/screen?expand=0&rev=20 --- screen.changes | 5 +++++ screen.spec | 15 ++++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/screen.changes b/screen.changes index 7bafa10..3b786cb 100644 --- a/screen.changes +++ b/screen.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jul 6 08:13:07 UTC 2011 - aj@suse.de + +- Use /usr/lib/tmpfiles.d instead of /etc/tmpfiles.d. + ------------------------------------------------------------------- Mon Jan 31 15:14:38 UTC 2011 - jw@novell.com diff --git a/screen.spec b/screen.spec index 3e3fec2..15ea9cd 100644 --- a/screen.spec +++ b/screen.spec @@ -1,7 +1,7 @@ # -# spec file for package screen (Version 4.0.3) +# spec file for package screen # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2011 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 @@ -31,7 +31,7 @@ Group: System/Console PreReq: %install_info_prereq AutoReqProv: on Version: 4.0.3 -Release: 9 +Release: 10 Summary: A program to allow multiple screens on a VT100/ANSI Terminal Source: %{name}-%{version}.tar.bz2 Source1: screen.conf @@ -80,21 +80,22 @@ rm -f $RPM_BUILD_ROOT/usr/bin/screen mv $RPM_BUILD_ROOT/usr/bin/screen-%version $RPM_BUILD_ROOT/usr/bin/screen chmod 755 $RPM_BUILD_ROOT/usr/bin/screen mkdir -p $RPM_BUILD_ROOT/etc -mkdir -p $RPM_BUILD_ROOT/etc/tmpfiles.d +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 install -m 644 screenrc $RPM_BUILD_ROOT/etc/screenrc -install -m 644 %SOURCE1 $RPM_BUILD_ROOT/etc/tmpfiles.d +install -m 644 %SOURCE1 $RPM_BUILD_ROOT/usr/lib/tmpfiles.d %files %defattr(-,root,root) %config /etc/screenrc %attr(555,root,root) /usr/bin/screen %dir /usr/share/screen -%dir /etc/tmpfiles.d -/etc/tmpfiles.d/screen.conf +%dir /usr/lib/tmpfiles.d +/usr/lib/tmpfiles.d/screen.conf /usr/share/screen/utf8encodings # Created via aaa_base on system boot %ghost %dir /var/run/screens