- updated to 0.10.0

[packages/xrdp.git] / xrdp.spec

diff --git a/xrdp.spec b/xrdp.spec
index a1f54d9db3ff554f3477dd9e7c9497c5e670aa95..96c71dab7fd953d54813c08d89ab4077603f1507 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
-Version:       0.9.15
+Version:       0.10.0
 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: e5396685a0b07900975c9a7e9b8dd6dc
+# Source0-md5: 2221e0a307fbf553d6d99416496525ab
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD
@@ -20,10 +20,12 @@ 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: nasm
 BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: opus-devel
 BuildRequires: pam-devel
@@ -37,14 +39,15 @@ Requires(post,preun):       /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(pre): /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
-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:      rc-scripts
 Requires:      xinitrc-ng
+Obsoletes:     xrdp-libs < 0.10
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -64,22 +67,10 @@ klientami protokołu rdp Microsoftu.
 
 xrdp używa jako backendu Xvnc lub X11rdp.
 
-%package libs
-Summary:       xrdp shared libraries
-Summary(pl.UTF-8):     Biblioteki współdzielone xrdp
-Group:         Libraries
-
-%description libs
-xrdp shared libraries.
-
-%description libs -l pl.UTF-8
-Biblioteki współdzielone xrdp.
-
 %package devel
 Summary:       Header files for xrdp libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek xrdp
 Group:         Development/Libraries
-Requires:      %{name}-libs = %{version}-%{release}
 
 %description devel
 Header files for xrdp libraries.
@@ -110,11 +101,17 @@ install %{SOURCE4} README.TLD.pl
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-cd librfxcodec
+cd libpainter
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+cd ../librfxcodec
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -124,12 +121,18 @@ cd ..
 %configure \
        --enable-fdkaac \
        --enable-fuse \
+       --enable-ipv6 \
        --enable-mp3lame \
        --enable-opus \
        --enable-pam-config=redhat \
+       --enable-painter \
        --enable-pixman \
-       --enable-tjpeg
-%{__make} V=1
+       --disable-silent-rules \
+       --enable-tjpeg \
+       --enable-vsock \
+       --with-imlib2
+
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -172,14 +175,10 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post  libs -p /sbin/ldconfig
-%postun        libs -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
-%doc *.txt
-%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
@@ -197,6 +196,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_sysconfdir}/xrdp/reconnectwm.sh
 %attr(755,root,root) %{_sysconfdir}/xrdp/startwm.sh
 %attr(755,root,root) %{_bindir}/xrdp-dis
+%attr(755,root,root) %{_bindir}/xrdp-dumpfv1
 %attr(755,root,root) %{_bindir}/xrdp-genkeymap
 %attr(755,root,root) %{_bindir}/xrdp-keygen
 %attr(755,root,root) %{_bindir}/xrdp-sesadmin
@@ -207,24 +207,33 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/xrdp
 %attr(755,root,root) %{_libdir}/xrdp/libcommon.so*
 %attr(755,root,root) %{_libdir}/xrdp/libmc.so*
-%attr(755,root,root) %{_libdir}/xrdp/libscp.so*
+%attr(755,root,root) %{_libdir}/xrdp/libipm.so*
+%attr(755,root,root) %{_libdir}/xrdp/libsesman.so*
+%attr(755,root,root) %{_libdir}/xrdp/libtoml.so*
 %attr(755,root,root) %{_libdir}/xrdp/libvnc.so*
 %attr(755,root,root) %{_libdir}/xrdp/libxrdp.so*
 %attr(755,root,root) %{_libdir}/xrdp/libxrdpapi.so*
 %attr(755,root,root) %{_libdir}/xrdp/libxup.so*
+%dir %{_prefix}/libexec/xrdp
+%attr(755,root,root) %{_prefix}/libexec/xrdp/waitforx
+%attr(755,root,root) %{_prefix}/libexec/xrdp/xrdp-sesexec
 %dir %{_datadir}/xrdp
 %{_datadir}/xrdp/ad24b.bmp
 %{_datadir}/xrdp/ad256.bmp
 %{_datadir}/xrdp/cursor0.cur
 %{_datadir}/xrdp/cursor1.cur
 %{_datadir}/xrdp/sans-10.fv1
+%{_datadir}/xrdp/sans-18.fv1
 %{_datadir}/xrdp/xrdp24b.bmp
 %{_datadir}/xrdp/xrdp256.bmp
 %{_datadir}/xrdp/xrdp_logo.bmp
+%{_datadir}/xrdp/xrdp_logo.png
+%{_datadir}/xrdp/README.logo
 %{_mandir}/man1/xrdp-dis.1*
 %{_mandir}/man5/sesman.ini.5*
 %{_mandir}/man5/xrdp.ini.5*
 %{_mandir}/man8/xrdp-chansrv.8*
+%{_mandir}/man8/xrdp-dumpfv1.8*
 %{_mandir}/man8/xrdp-genkeymap.8*
 %{_mandir}/man8/xrdp-keygen.8*
 %{_mandir}/man8/xrdp-sesadmin.8*
@@ -232,17 +241,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/xrdp-sesrun.8*
 %{_mandir}/man8/xrdp.8*
 
-%files libs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpainter.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libpainter.so.0
-%attr(755,root,root) %{_libdir}/librfxencode.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/librfxencode.so.0
-
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpainter.so
-%attr(755,root,root) %{_libdir}/librfxencode.so
 %{_includedir}/ms-*.h
 %{_includedir}/painter.h
 %{_includedir}/rfxcodec_common.h