Accepting request 336472 from home:cyberorg:branches:X11:RemoteDesktop

- fix rsakeys generation test 

- remove pam patch, using the one provided by the package 

- fetch new tarball version 1420692256
- fixes boo #944739
- Split patch into more patches with descriptive names
- Add Requires: xorg-x11-Xvnc

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

xrdp.spec

@@ -23,7 +23,7 @@
 %endif
 
 Name:           xrdp
-Version:        0.9.0git.1401423964
+Version:        0.9.0git.1420692256 
 Release:        0
 Summary:        An open source RDP server
 License:        Apache-2.0
@@ -33,8 +33,10 @@ Source0:        %{name}-%{version}.tar.xz
 Source1:        sysconfig.%{name}
 Source2:        openSUSE.bmp
 Source100:      %{name}-rpmlintrc
+# PATCH-FIX-SUSE -- get rid of implicit-definitions warning
+Patch0:         %{name}-implicit-definitions.patch
 # PATCH-FIX-SUSE -- Adjust default settings to openSUSE standards
-Patch0:         %{name}-get-it-working.patch
+Patch1:         %{name}-default-config.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fuse-devel
@@ -45,6 +47,7 @@ BuildRequires:  pkg-config
 BuildRequires:  libX11-devel
 BuildRequires:  libXfixes-devel
 BuildRequires:  libXrandr-devel
+Requires:  	xorg-x11-Xvnc
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %if 0%{?with_systemd} == 1
@@ -68,6 +71,7 @@ Microsoft's own terminal server / remote desktop clients.
 cp sesman/sesman.ini sesman/sesman.ini.example
 cp xrdp/xrdp.ini xrdp/xrdp.ini.example
 %patch0 -p1
+%patch1 -p1
 
 %build
 ./bootstrap
@@ -97,7 +101,6 @@ cp xrdp/xrdp.ini xrdp/xrdp.ini.example
 %{__make} install DESTDIR=%{buildroot}
 
 %if 0%{?with_systemd} == 1
-rm -r %{buildroot}%{_initrddir}
 %if 0%{?suse_version} >= 1230
 %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}
 %{__ln_s} %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}-sesman
@@ -113,7 +116,7 @@ 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}/
-
+install instfiles/pam.d/xrdp-sesman.other %{buildroot}%{_sysconfdir}/pam.d/%{name}-sesman
 # remove libtool cruft
 find %{buildroot}%{_libdir}/%{name} -name *.la -delete
 
@@ -143,7 +146,7 @@ find %{buildroot}%{_libdir}/%{name} -name *.la -delete
 # generate a keypair used to perform authentication to the remote client
 if [ ! -e %{_sysconfdir}/%{name}/rsakeys.ini ]; then
     xrdp-keygen xrdp %{_sysconfdir}/%{name}/rsakeys.ini
-    if [ $? -eq 0 ]; then
+    if [ $? != 0 ]; then
 	echo "Could not generate rsakeys.ini, please check manually!"
     fi
 fi
@@ -163,16 +166,12 @@ exit 0
 %files
 %defattr(-, root, root, -)
 %doc COPYING sesman/sesman.ini.example xrdp/xrdp.ini.example
-%config %{_sysconfdir}/default/%{name}
 %config %{_sysconfdir}/pam.d/%{name}-sesman
 %dir %{_sysconfdir}/%{name}
-%config %{_sysconfdir}/%{name}/km-0407.ini
-%config %{_sysconfdir}/%{name}/km-0409.ini
-%config %{_sysconfdir}/%{name}/km-040c.ini
-%config %{_sysconfdir}/%{name}/km-0410.ini
-%config %{_sysconfdir}/%{name}/km-0419.ini
-%config %{_sysconfdir}/%{name}/km-041d.ini
-%config %{_sysconfdir}/%{name}/km-0816.ini
+%dir %{_sysconfdir}/%{name}/pulse
+%config %{_sysconfdir}/%{name}/pulse/default.pa
+%config %{_sysconfdir}/%{name}/km-*.ini
+%config %{_sysconfdir}/%{name}/xrdp_keyboard.ini
 %ghost %config(noreplace) %{_sysconfdir}/%{name}/rsakeys.ini
 %config(noreplace) %{_sysconfdir}/%{name}/sesman.ini
 %config(noreplace) %{_sysconfdir}/%{name}/startwm.sh