Accepting request 509680 from X11:RemoteDesktop

1

OBS-URL: https://build.opensuse.org/request/show/509680
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xrdp?expand=0&rev=8

_service

@@ -1,15 +0,0 @@
-<services>
-  <service name="tar_scm" mode="disabled">
-    <param name="scm">git</param>
-    <param name="url">https://github.com/neutrinolabs/xrdp.git</param>
-    <param name="filename">xrdp</param>
-    <param name="versionprefix">0.9.0~git</param>
-    <param name="versionformat">%ct.%h</param>
-    <param name="changesgenerate">enable</param>
-  </service>
-  <service name="recompress" mode="disabled">
-    <param name="file">*.tar</param>
-    <param name="compression">gz</param>
-  </service>
-  <service name="set_version" mode="disabled"/>
-</services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-            <param name="url">https://github.com/neutrinolabs/xrdp.git</param>
-          <param name="changesrevision">f4224615c97668236826d115fa37b6ce805bea96</param></service></servicedata>

xrdp-0.9.2.tar.gz.asc

@@ -0,0 +1,10 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEcBAABCAAGBQJY3KSxAAoJEIrTLQQzex8YLpkH/iZFGqlJ4oDEGmHPoXWfzEzJ
+v1cmAWB8W/BOFBX+Dn+azQUustwzqIDIobUDGOq2tNdqqcTNYtpLCjvPXtfk5k6e
+1+AozCBJMv3XmpUiADJlib6eIumD6slXUMw8Uf6Riq2a6R/NNnd597+EASKjQw2I
+mJ+n4opjUcM0uVi3VVmxRjWiaECxSIvl6ApVYJV55LHGM5QXqVK5ZsxfFDTimThl
+/fs3dLRwQYmLkC3cwImZgyXglcmXsku4ndAlYXsE+RI9R7JOM2vp3WhP7euaKjQn
+LHsA3gr8i0YpAd2bfP6X5Z6tFtB8gd+q4epfvMwue0Jy18KwMs6zB4s1BGZxvng=
+=rrTq
+-----END PGP SIGNATURE-----

xrdp.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jul 11 16:58:40 UTC 2017 - fezhang@suse.com
+
+- Drop _service and _servicedata: not needed for stable releases
+- Add source verification
+  + Add xrdp-0.9.2.tar.gz.asc
+  + Add xrdp.keyring, from the signer Idan Freiberg (@speidy on
+    github)
+
 -------------------------------------------------------------------
 Sun Jun 25 16:56:29 UTC 2017 - fezhang@suse.com
 

xrdp.keyring

@@ -0,0 +1,34 @@
+pub   2048R/337B1F18 2016-09-19 [expires: 2018-09-19]
+uid       [ unknown] Idan Freiberg <speidy@gmail.com>
+sub   2048R/F0F5E810 2016-09-19
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v2
+
+mQENBFffatABCACyxGHiFciZU7ljj/vHgmuNOPzWKaVxvvhWnV9OZhg/CBcMqqIQ
+UPZyHG4mjWZ88TRgjHTP9rFgYPNa7Mdla4Up0nN0dYWfmlwNAXOzVILKuonn+XR/
+pWv4H4ln0UywKDxHDw342F2Tqu7AkmqBE99woiHLdojhZfPGMt8w/9RjBqUXlWjF
+9oQIFd9R37uyjY54ADJv6gxUg1EelMnK33TEL8IfsK/f2mzS7KQLCu4HZtPyMNUa
+8n7irUYncrZTwu7/ouJ+v3w0i82Sw+Y4VnqYKkHjk5TwWmqq6EzSPUBtU3/wiUcj
+xyxwednw9sI6TBOtlmMo1pFpWbX4oi0tJ4QZABEBAAG0IElkYW4gRnJlaWJlcmcg
+PHNwZWlkeUBnbWFpbC5jb20+iQE/BBMBCAApAhsDBwsJCAcDAgEGFQgCCQoLBBYC
+AwECHgECF4AFAlffbVcFCQPCpUAACgkQitMtBDN7HxhAWwf/YVDSawHMEPG/mMZP
+xVVsrej/M6GitvxU1Fqan5pr5jTBsTz3zuJ8vi2lcPU07tSjixNbtYvXW5mK18BJ
+9mYtrYnqXSQYoFG1lXPJaOxiv0hmGlQfkq9CJK0esGrmiq7gKBUDiGh7BDtURz7g
+qqMuSWSGD6I4tV0qjh1D+4KnA1eYX8mtnKtxg0+gXub17/NNK4yNdIkD4gQ/oLYB
+P5FvvgaHhqWLJA4JcC+GwLT9BeavqreeK1QkcbMKosfCbNK+IwPisAtSwyAJ8AIt
+gT+q3LTr9ESt2eQkhtQhXV6l2BI9HkTYgImxMRBS8IeLV/kHK7IvFm4ZA50ICHpc
+3EINPbkBDQRX32rQAQgA0E+7rkf3U+cLyWJlGsC9+37cYliBgGjBglt+w95qDzyx
+Qs0lYeol4x+ApsgopyQWDqWlDhOc0UpqURz101nH7YvUyItFpg96lkc9xoilarXi
+79zbRrEgtyLRIEjEOu84B3SYggVsGryMS1WMN52GAIXzNwZ07rWLVMY3gW3VOCby
+erLjSWAo0nAbmU8KXPlzjQFsAwUaHeKS6EhY3ZFLlu6iJJG1Mu12vzOHhZ0NG2KP
+BhvURwibP9l5TJvqs6qqgaGR+bo1KXtB2NrgE9FXvlLcyNy/mUMeoooJtErC+ceh
+rTuCisQmTN2k9/lhF/W5dpwV42nOEbx/Xj9ApQYUNwARAQABiQEfBBgBCAAJBQJX
+32rQAhsMAAoJEIrTLQQzex8YaF8H/1GLMz1vxCwfQN5f1qCKQIMXmPyxUxujjPX6
+SaQ1AJ1n5hyXZQblA+rQpuSpXn4o7y2w4+Vytz6Z5sfF1lcX4WJPIaiskEzUKJu1
+lP7Vqu3A1C9q8Qc2ixQrVwGHLC1kzJggYqn6UdYezYPYoDA0YlAEpVdPZ2ks8ERR
+JpXlP/fvu3F8gR+1GeZCU77fncrpZhaxW9Qt189eHFKT1tVS0wkbg0Bfslx9SlPJ
+zEWgPS2aqENxNOXl7ZLUyvfUp+yf1ZCBYJbWzXNfQkq5EBc3hvGTCwrxOn/HDGas
+TCO7hF2ZpkgNUYyi1x9HW5CK4fO9jz6eg3iB7q1eXee6hQRnlHs=
+=3XXn
+-----END PGP PUBLIC KEY BLOCK-----

xrdp.spec

@@ -24,11 +24,13 @@ Summary:        Remote desktop protocol (RDP) server
 License:        Apache-2.0 and GPL-2.0+
 Group:          System/X11/Utilities
 Url:            https://github.com/neutrinolabs/xrdp
-Source0:        https://github.com/neutrinolabs/xrdp/releases/download/v0.9.2/xrdp-%{version}.tar.gz
+Source0:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Source1:        xrdp.fw
+Source1:        https://github.com/neutrinolabs/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz.asc
-Source2:        sysconfig.xrdp
+Source2:        xrdp.keyring
-Source3:        force_stop
+Source3:        xrdp.fw
-Source4:        openSUSE.bmp
+Source4:        sysconfig.xrdp
+Source5:        force_stop
+Source6:        openSUSE.bmp
 Source100:      %{name}-rpmlintrc
 # PATCH-FIX-OPENSUSE xrdp-pam.patch - hfiguiere@novell.com refreshed by ftake@geeko.jp
 Patch1:         xrdp-pam.patch
@@ -121,13 +123,13 @@ make %{?_smp_mflags} DESTDIR=%{buildroot} install
 find %{buildroot} -name '*.a' -delete
 find %{buildroot} -type f -name "*.la" -delete -print
 mkdir -p %{buildroot}/%{_fwdefdir}
-install -m 644 %{SOURCE1} %{buildroot}/%{_fwdefdir}/xrdp
+install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/xrdp
 mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates
-install -m 644 %{SOURCE2} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.xrdp
+install -m 644 %{SOURCE4} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.xrdp
 mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp
-install -m 755 %{SOURCE3} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop
+install -m 755 %{SOURCE5} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop
 %if 0%{?is_opensuse}
-install %{SOURCE4} %{buildroot}%{_datadir}/%{name}/
+install %{SOURCE6} %{buildroot}%{_datadir}/%{name}/
 %endif
 
 ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp