- updated to 0.9.25.1, partial PLD merge

diff --git a/linker.patch b/linker.patch
deleted file mode 100644 (file)
index 5811c67..0000000
--- a/linker.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- xrdp-0.9.19/xrdpapi/Makefile.am~   2020-06-26 11:13:58.000000000 +0000
-+++ xrdp-0.9.19/xrdpapi/Makefile.am    2022-03-22 05:56:04.471233246 +0000
-@@ -13,3 +13,6 @@
- libxrdpapi_la_SOURCES = \
-   xrdpapi.c \
-   xrdpapi.h
-+
-+libxrdpapi_la_LIBADD = \
-+  $(top_builddir)/common/libcommon.la

diff --git a/xrdp.spec b/xrdp.spec
index 1dcdae5f5802a8fea4d3227a997b7ee1ab92d4dd..aea575b2d8b9b15db068f1bed7e8b401427168dd 100644 (file)
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,13 +1,13 @@
 Summary:       Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp
 Summary:       Remote desktop server
 Summary(pl.UTF-8):     Serwer remote desktop
 Name:          xrdp

-Version:       0.9.19
+Version:       0.9.25.1

 Release:       1
 License:       Apache v2.0
 Group:         X11/Applications/Networking
 #Source0Download: https://github.com/neutrinolabs/xrdp/releases
 Source0:       https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz
 Release:       1
 License:       Apache v2.0
 Group:         X11/Applications/Networking
 #Source0Download: https://github.com/neutrinolabs/xrdp/releases
 Source0:       https://github.com/neutrinolabs/xrdp/releases/download/v%{version}/%{name}-%{version}.tar.gz

-# Source0-md5: 2e60a2e874f95723a4cdd0b466bbe7e4
+# Source0-md5: f30ad85ce78c8542d4f7b03c28c8815f

 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD


@@ -16,15 +16,16 @@ Source5:    startwm.sh
 Patch0:                config.patch
 Patch1:                quiet.patch
 Patch2:                x32.patch
 Patch0:                config.patch
 Patch1:                quiet.patch
 Patch2:                x32.patch

-Patch3:                linker.patch

 URL:           http://xrdp.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.7.2
 BuildRequires: fdk-aac-devel >= 0.1.0
 URL:           http://xrdp.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.7.2
 BuildRequires: fdk-aac-devel >= 0.1.0

+BuildRequires: imlib2-devel >= 1.4.5

 BuildRequires: lame-libs-devel
 BuildRequires: libfuse-devel >= 2.6
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libtool
 BuildRequires: lame-libs-devel
 BuildRequires: libfuse-devel >= 2.6
 BuildRequires: libjpeg-turbo-devel
 BuildRequires: libtool

+BuildRequires: nasm

 BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: opus-devel
 BuildRequires: pam-devel
 BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: opus-devel
 BuildRequires: pam-devel


@@ -41,6 +42,7 @@ Requires(pre):        /usr/sbin/groupadd
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /usr/bin/Xvnc
 Requires:      fdk-aac >= 0.1.0
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /usr/bin/Xvnc
 Requires:      fdk-aac >= 0.1.0

+Requires:      imlib2 >= 1.4.5

 Requires:      libfuse >= 2.6
 Requires:      openssl >= 0.9.8
 Requires:      pixman >= 0.1.0
 Requires:      libfuse >= 2.6
 Requires:      openssl >= 0.9.8
 Requires:      pixman >= 0.1.0


@@ -105,18 +107,23 @@ Statyczne biblioteki xrdp.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1

-%patch3 -p1

 
 install %{SOURCE3} README.TLD
 install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}
 
 install %{SOURCE3} README.TLD
 install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}

-%{__aclocal}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd libpainter
+%{__libtoolize}
+%{__aclocal} -I m4

 %{__autoconf}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %{__autoheader}
 %{__automake}

-cd librfxcodec
+cd ../librfxcodec

 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}


@@ -126,16 +133,18 @@ cd ..
 %configure \
        --enable-fdkaac \
        --enable-fuse \
 %configure \
        --enable-fdkaac \
        --enable-fuse \

+       --enable-ipv6 \

        --enable-mp3lame \
        --enable-opus \
        --enable-pam-config=redhat \
        --enable-mp3lame \
        --enable-opus \
        --enable-pam-config=redhat \

+       --enable-painter \

        --enable-pixman \
        --enable-pixman \

+       --disable-silent-rules \

        --enable-tjpeg \
        --enable-tjpeg \

-       --enable-painter \
-       --enable-ipv6 \

        --enable-vsock \
        --enable-vsock \

-       --with-imlib2="yes"
-%{__make} V=1
+       --with-imlib2
+
+%{__make}

 
 %install
 rm -rf $RPM_BUILD_ROOT
 
 %install
 rm -rf $RPM_BUILD_ROOT


@@ -183,8 +192,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
 
 %files
 %defattr(644,root,root,755)

-%doc README.TLD
-%doc README.TLD.pl
+%doc COPYING NEWS.md README.md README.TLD
+%lang(pl) %doc README.TLD.pl

 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.sesman
 %attr(640,root,root) /etc/pam.d/xrdp-sesman
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/sesman
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.sesman
 %attr(640,root,root) /etc/pam.d/xrdp-sesman