Accepting request 263706 from home:rmilasan:branches:X11:RemoteDesktop

- Fix generation of rsakeys.ini
- Fix failed builds on older releases.

OBS-URL: https://build.opensuse.org/request/show/263706
OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=3

xrdp.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Dec  1 12:01:00 UTC 2014 - rmilasan@suse.com
+
+- Fix generation of rsakeys.ini
+- Fix failed builds on older releases.
+
 -------------------------------------------------------------------
 Mon Jun  9 13:27:30 UTC 2014 - cyberorg@opensuse.org
 

xrdp.spec

@@ -16,7 +16,7 @@
 #
 
 
-%if 0%{?suse_version} >= 1220
+%if 0%{?suse_version} >= 1310
 %define with_systemd 1
 %else
 %define with_systemd 0 
@@ -113,7 +113,6 @@ rm -r %{buildroot}%{_initrddir}
 install -d %{buildroot}%{_localstatedir}/adm/fillup-templates
 install %{SOURCE1} %{buildroot}%{_localstatedir}/adm/fillup-templates/sysconfig.%{name}
 install %{SOURCE2} %{buildroot}%{_datadir}/%{name}/
-touch %{buildroot}%{_sysconfdir}/%{name}/rsakeys.ini
 
 # remove libtool cruft
 find %{buildroot}%{_libdir}/%{name} -name *.la -delete
@@ -142,10 +141,10 @@ find %{buildroot}%{_libdir}/%{name} -name *.la -delete
 %fillup_and_insserv
 %endif
 # generate a keypair used to perform authentication to the remote client
-if ! [[ -e %{_sysconfdir}/%{name}/rsakeys.ini ]]; then
-    xrdp-keygen xrdp
-    if ! [[ $? == 0 ]]; then
-        echo "Could not generate rsakeys.ini, please check manually!"
+if [ ! -e %{_sysconfdir}/%{name}/rsakeys.ini ]; then
+    xrdp-keygen xrdp %{_sysconfdir}/%{name}/rsakeys.ini
+    if [ $? -eq 0 ]; then
+	echo "Could not generate rsakeys.ini, please check manually!"
     fi
 fi