Accepting request 509702 from home:zhangxiaofei:branches:X11:RemoteDesktop
- Drop xrdp-openSUSE-logo.patch and openSUSE.bmp: not really necessary OBS-URL: https://build.opensuse.org/request/show/509702 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=21
This commit is contained in:
parent
09be0e0a18
commit
c0feafb82d
2
.gitattributes
vendored
2
.gitattributes
vendored
@ -21,5 +21,3 @@
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
## Specific LFS patterns
|
||||
openSUSE.bmp filter=lfs diff=lfs merge=lfs -text
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ab42b5fc6b70b8369f947569a5b704bffd8c6b61b212506f35ed8847577c8b85
|
||||
size 100854
|
@ -1,23 +0,0 @@
|
||||
From: Fuminobu TAKEYAMA <ftake@geeko.jp>
|
||||
Date: Mon, 01 May 2017 08:19:06 +0000
|
||||
Subject: [PATCH] change logo in login dialog for openSUSE
|
||||
|
||||
refresh the patch from Felix Zhang
|
||||
|
||||
---
|
||||
xrdp/xrdp.ini | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/xrdp/xrdp.ini b/xrdp/xrdp.ini
|
||||
index cb6d7c36..0f5b1def 100644
|
||||
--- a/xrdp/xrdp.ini
|
||||
+++ b/xrdp/xrdp.ini
|
||||
@@ -88,7 +88,7 @@ ls_bg_color=dedede
|
||||
|
||||
; logo
|
||||
; full path to bmp-file or file in shared folder
|
||||
-ls_logo_filename=
|
||||
+ls_logo_filename=/usr/share/xrdp/openSUSE.bmp
|
||||
ls_logo_x_pos=55
|
||||
ls_logo_y_pos=50
|
||||
|
@ -1,11 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Jul 11 16:58:40 UTC 2017 - fezhang@suse.com
|
||||
|
||||
- Drop _service and _servicedata: not needed for stable releases
|
||||
- Add source verification
|
||||
- Add source verification:
|
||||
+ Add xrdp-0.9.2.tar.gz.asc
|
||||
+ Add xrdp.keyring, from the signer Idan Freiberg (@speidy on
|
||||
github)
|
||||
- Drop _service and _servicedata: not needed for stable releases
|
||||
- Drop xrdp-openSUSE-logo.patch and openSUSE.bmp: not really
|
||||
necessary
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jun 25 16:56:29 UTC 2017 - fezhang@suse.com
|
||||
|
@ -30,7 +30,6 @@ Source2: xrdp.keyring
|
||||
Source3: xrdp.fw
|
||||
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
|
||||
@ -50,8 +49,6 @@ Patch13: xrdp-bsc965647-allow-admin-choose-desktop.patch
|
||||
Patch14: xrdp-fate318398-change-expired-password.patch
|
||||
# PATCH-FEATURE-SLE xrdp-fate319683-allow-vnc-resizing.patch fate#319683 bsc#948062 - fezhang@suse.com -- allow resizing in VNC sessions
|
||||
Patch15: xrdp-fate319683-allow-vnc-resizing.patch
|
||||
# PATCH-FIX-OPENSUSE xrdp-openSUSE-logo.patch - fezhang@suse.com -- use openSUSE logo in login dialog
|
||||
Patch21: xrdp-openSUSE-logo.patch
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: automake
|
||||
BuildRequires: fdupes
|
||||
@ -108,8 +105,6 @@ This package contains libraries for the JPEG2000 codec for RDP.
|
||||
%patch13 -p1
|
||||
%patch14 -p1
|
||||
%patch15 -p1
|
||||
%else
|
||||
%patch21 -p1
|
||||
%endif
|
||||
|
||||
%build
|
||||
@ -128,9 +123,6 @@ mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates
|
||||
install -m 644 %{SOURCE4} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.xrdp
|
||||
mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp
|
||||
install -m 755 %{SOURCE5} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop
|
||||
%if 0%{?is_opensuse}
|
||||
install %{SOURCE6} %{buildroot}%{_datadir}/%{name}/
|
||||
%endif
|
||||
|
||||
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp
|
||||
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcxrdp-sesman
|
||||
|
Loading…
Reference in New Issue
Block a user