Accepting request 853291 from Base:System

OBS-URL: https://build.opensuse.org/request/show/853291
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/screen?expand=0&rev=59
This commit is contained in:
Dominique Leuenberger 2021-01-10 18:37:56 +00:00 committed by Git OBS Bridge
commit 66ddc022ed
3 changed files with 29 additions and 59 deletions

View File

@ -1,3 +1,25 @@
-------------------------------------------------------------------
Mon Nov 30 13:38:31 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
- Use %_tmpfilesdir instead of hardcoding a path for
systemd-tmpfiles config files.
- Do not create directories before uninstalling (?) the package.
The /run/(u)screen diretories are created in the %post section.
- Do not ghost package /run/uscreens: the directory is dynamically
created during boot. Of course it would be nice to be able to
identify what package creates this, but for that we should rather
have a rpm/systemd-tmpfiles integration hook. The main problem
with the ghost is the suid flag, which breaks rpm -V. permissions
no longer lists /run/uscreens, so verify_permission cannot apply.
- Add %systemd_ordering: give zypp a hint that screen shall be
installed after systemd, so that systemd-tmpfiles already exists.
-------------------------------------------------------------------
Tue Sep 8 13:30:58 UTC 2020 - Matthias Gerstner <matthias.gerstner@suse.com>
- no longer invoke permissions/chkstat for directory handled by
systemd-tmpfiles (bsc#1171879)
-------------------------------------------------------------------
Thu Feb 06 21:44:38 UTC 2020 - alexander_naumov@opensuse.org

View File

@ -1,42 +1,4 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.12 (GNU/Linux)
mQENBFG23YwBCADmgO2AZ1ZhTdaCyFjGo35lDcqAIZ9HZuthWvELHzPpSz6Q2r7S
BQw1/yaYWrukT78ftpo6VEKIDuss5OMgBNh7CaA4pm2yL39PzhMviz4AppcCHOaw
DTeWkVVgdFPYvnUKRwJ2DTq6kMQz5BFbhTGTerk9d/Akmgc4KBO+Xm+JoNY3bz8V
4PdFFvIIdRXaTQ+AUKrM+J9uizsgaMTXLpkaG2oZiYodpgJk6CQi1Agwsq83PmLV
ASIksO4VZyjNp6Oz/osrDJKjq6btiah3xjoSTjG2SjtOx8201LrNeQp2nCaPNwWs
B6jmomq7dTR4f11n3hy31u8N0PEGPh1PESaXABEBAAG0Hk1pY2FoIENvd2FuIDxt
aWNhaEBjb3dhbi5uYW1lPokBOAQTAQIAIgUCUbbdjAIbAwYLCQgHAwIGFQgCCQoL
BBYCAwECHgECF4AACgkQxxSsoCl9mZJfGAf/Qq3p2itfqOvsvcOo+EzJ+MXW2Tek
HPHt3K1EtApBporSCqsIerIspGTFD2LC/u8PlyjLqZmF/oujuQ69KVA2zqy21DeF
20bk/jkE1VZMBjOXnV0h7hy+0Vvn1GF0LK9JV9YmU7lNeSrnatlIYhQCDo6LqCMI
ZpTlFEdQDDHTGPFkYpvTK7HtrFUQQJnNt/tNArPYrTjgKFww637mPnKYX9KkwGH0
09h0jk8tq48GPOxWO+lTIqu9glPF2faHFgzt2/FB2ZB2vfPOxDIBiGxPcb4npGsK
iU6MohmoWxRoEqi3co9NrOwQ6fZ/ehs2HMxsTMveAT+M/VD4+bIJxQbGB7kBDQRR
tt2MAQgApi75wsaiX+zcUZuJVqgZHZK1HbULJ5AbbbgAdU9X2lBgkcpYNqhFoWa5
iuw83X8YqSY/WZMd8zlc7dS7NH23wRGGOLrPVfnGl0Ufx9p0JNsC9a7bH+6m9jlS
JEoHJXAF5KvMsTvGT9U21H2G1PEWY40LKeOvRDGDV2b6a1jwD5y3M8fUh8Qul01u
AuFaZYoKHDW0QcDj84Il8QwJthRdM0ryy0caFDLoM94K3N9E1uMX+UCm9vVSskz/
xv+bEfKDVSEEcGPxuhHbMXvzSXCJC9fghPSPs3EXnuU4PgLXBSnYJJDDN8DEMFoa
50TgcycdBDlQvuiNA1ZELJunWbKt4wARAQABiQEfBBgBAgAJBQJRtt2MAhsMAAoJ
EMcUrKApfZmSnokIAI1i6dEs2Swmlk2TKB+Q/l20yDjsHt1lrIaNOGl2sXNb8vPY
sf2ARsBVOM6mf9LIxM3UP0+15Rdi2e5bEolXGcvKZPDz/PoZ33oARPVMolGGTUWH
le0yz62yNZRr8ZVfoGbHFxcAVwDyrkxkewXz26kX9Z5Rj3+gm+gSwDfhG87sp84J
8gEh36b9GPjZXlvdvoRYWAHr7qNDlwJzrPXht7NIbaDgLpv/QW2u/WA0zuXgDGEw
XRWUvwdUzxUtUjwiDKy62o7oA31LAPwi480ieEJmRp2c1hZMQxT8vMQtCGcbaEw2
XvrO/mUsw3oHD2Upm1/tfgDL8gWpg3F/8q5DA4A=
=D9qJ
-----END PGP PUBLIC KEY BLOCK-----
GPG keys of Amadeusz Sławiński <amade>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.22 (GNU/Linux)
@ -90,8 +52,7 @@ sBXW+7Q=
=+RA6
-----END PGP PUBLIC KEY BLOCK-----
GPG keys of Alexander Naumov <anaumov>
-----BEGIN PGP PUBLIC KEY BLOCK-----
mQINBFhwK44BEADvLft2wVAF2weMi0d0I4fSLHF9kAqgU2KnIEi2v5fm9TirRJqj

View File

@ -52,6 +52,7 @@ BuildRequires: utempter-devel
BuildRequires: utempter
%endif
Requires: terminfo-base
%systemd_ordering
%description
With this program you can take advantage of the multitasking abilities
@ -98,13 +99,12 @@ chmod 755 %{buildroot}%{_bindir}/screen
mkdir -p %{buildroot}/etc
mkdir -p %{buildroot}/etc/pam.d
mkdir -p %{buildroot}%{_prefix}/lib
mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d
mkdir -p %{buildroot}%{_tmpfilesdir}
mkdir -p %{buildroot}%{rundir}/screens
chmod 755 %{buildroot}%{rundir}/screens
mkdir -p %{buildroot}%{rundir}/uscreens
chmod 1777 %{buildroot}%{rundir}/uscreens
install -m 644 screenrc %{buildroot}%{_sysconfdir}/screenrc
install -m 644 %{SOURCE1} %{buildroot}%{_prefix}/lib/tmpfiles.d
install -m 644 %{SOURCE1} %{buildroot}%{_tmpfilesdir}
install -m 644 %{SOURCE4} %{buildroot}/etc/pam.d/screen
%files
@ -113,30 +113,17 @@ install -m 644 %{SOURCE4} %{buildroot}/etc/pam.d/screen
%config /etc/pam.d/screen
%attr(555,root,root) %{_bindir}/screen
%dir %{_datadir}/screen
%dir %{_prefix}/lib/tmpfiles.d
%{_prefix}/lib/tmpfiles.d/screen.conf
%{_tmpfilesdir}/screen.conf
%{_datadir}/screen/utf8encodings
# Created via aaa_base or systemd on system boot
%ghost %dir %{rundir}/screens
%ghost %dir %{rundir}/uscreens
%{_infodir}/screen.info*%{ext_info}
%{_mandir}/man1/screen.1%{ext_man}
%license COPYING
%post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
%set_permissions /run/uscreens/
%tmpfiles_create /usr/lib/tmpfiles.d/screen.conf
%verifyscript
%verify_permissions -e /run/uscreens/
%tmpfiles_create %{_tmpfilesdir}/screen.conf
%preun
%install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
# Create our dirs immediatly, after a manual package install.
# After a reboot systemd/aaa_base will take care.
test -d %{rundir}/screens || mkdir -m 755 %{rundir}/screens
test -d %{rundir}/uscreens || mkdir -m 1777 %{rundir}/uscreens
%changelog