pool/xrdp
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 544644 from home:RBrownSUSE:branches:X11:RemoteDesktop

Browse Source 
Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468)

OBS-URL: https://build.opensuse.org/request/show/544644
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=29
This commit is contained in:
Tomáš Chvátal 2017-11-24 07:06:56 +00:00 committed by Git OBS Bridge
parent 202c37b715
commit de0e9751b2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
xrdp.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Nov 23 13:36:58 UTC 2017 - rbrown@suse.com
- Replace references to /var/adm/fillup-templates with new
%_fillupdir macro (boo#1069468)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 28 04:19:45 UTC 2017 - fezhang@suse.com Thu Sep 28 04:19:45 UTC 2017 - fezhang@suse.com

11
xrdp.spec
View File

@ -16,6 +16,11 @@
# #
#Compat macro for new _fillupdir macro introduced in Nov 2017
%if ! %{defined _fillupdir}
%define _fillupdir /var/adm/fillup-templates
%endif
%define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services
Name: xrdp Name: xrdp
Version: 0.9.4 Version: 0.9.4
@ -116,8 +121,8 @@ find %{buildroot} -name '*.a' -delete
find %{buildroot} -type f -name "*.la" -delete -print find %{buildroot} -type f -name "*.la" -delete -print
mkdir -p %{buildroot}/%{_fwdefdir} mkdir -p %{buildroot}/%{_fwdefdir}
install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/xrdp install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/xrdp
mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates mkdir -p %{buildroot}/%{_fillupdir}
install -m 644 %{SOURCE4} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.xrdp install -m 644 %{SOURCE4} %{buildroot}/%{_fillupdir}/sysconfig.xrdp
mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp
install -m 755 %{SOURCE5} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop install -m 755 %{SOURCE5} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop
@ -196,7 +201,7 @@ exit 0
%config(noreplace) %{_sysconfdir}/xrdp/ %config(noreplace) %{_sysconfdir}/xrdp/
%ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini %ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini
%config %{_localstatedir}/adm/fillup-templates/sysconfig.xrdp %config %{_fillupdir}/sysconfig.xrdp
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)