metalefty/xrdp-next
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Require openssl in posttrans phase.

Browse Source 
Move conditional restart to posttrans phase.
This commit is contained in:
Bojan Smojver 2017-02-21 05:15:28 +11:00
parent 7271948d04
commit 2d35ec095a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
xrdp.spec
View File

@ -4,7 +4,7 @@ Summary: Open source remote desktop protocol (RDP) server
Name: xrdp Name: xrdp
Epoch: 1 Epoch: 1
Version: 0.9.1 Version: 0.9.1
Release: 4%{?dist} Release: 5%{?dist}
License: ASL 2.0 License: ASL 2.0
Group: Applications/Internet Group: Applications/Internet
URL: http://www.xrdp.org/ URL: http://www.xrdp.org/
@ -34,9 +34,9 @@ Requires: tigervnc-server-minimal
Requires(post): systemd Requires(post): systemd
Requires(post): systemd-sysv Requires(post): systemd-sysv
Requires(post): openssl Requires(posttrans): openssl
Requires(preun): systemd Requires(preun): systemd
Requires(postun): systemd Requires(posttrans): systemd
%package devel %package devel
@ -89,9 +89,6 @@ if [ $1 -eq 0 ]; then
systemctl stop xrdp.service > /dev/null 2>&1 || : systemctl stop xrdp.service > /dev/null 2>&1 || :
fi fi
%postun
%systemd_postun_with_restart xrdp.service
%triggerun -- xrdp < 0.6.0-1 %triggerun -- xrdp < 0.6.0-1
systemd-sysv-convert --save xrdp >/dev/null 2>&1 ||: systemd-sysv-convert --save xrdp >/dev/null 2>&1 ||:
@ -120,6 +117,8 @@ fi
chmod 400 %{_sysconfdir}/xrdp/cert.pem chmod 400 %{_sysconfdir}/xrdp/cert.pem
chmod 400 %{_sysconfdir}/xrdp/key.pem chmod 400 %{_sysconfdir}/xrdp/key.pem
systemctl try-restart xrdp.service >/dev/null 2>&1 || :
%files %files
%doc COPYING *.txt %doc COPYING *.txt
@ -184,6 +183,10 @@ chmod 400 %{_sysconfdir}/xrdp/key.pem
%{_libdir}/pkgconfig/xrdp.pc %{_libdir}/pkgconfig/xrdp.pc
%changelog %changelog
* Tue Feb 21 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-5
- Require openssl in posttrans phase
- Move conditional restart to posttrans phase
* Mon Feb 20 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-4 * Mon Feb 20 2017 Bojan Smojver <bojan@rexurive.com> - 1:0.9.1-4
- Move key/cert generation to posttrans stage - Move key/cert generation to posttrans stage