- updated to 0.10.1, partial PLD merge

diff --git a/xrdp.spec b/xrdp.spec
index 96c71dab7fd953d54813c08d89ab4077603f1507..dae3fd60f03fe636e1c4be3057a1dfb11c3fe5b3 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.10.0
-Release:       1
+Version:       0.10.1
+Release:       2
 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: 2221e0a307fbf553d6d99416496525ab
+# Source0-md5: 65edae2e80bcaa9b8fa6b8abd60fbe0e
 Source1:       %{name}.init
 Source2:       %{name}.pamd
 Source3:       %{name}.README.TLD
@@ -20,11 +20,12 @@ URL:                http://xrdp.org/
 BuildRequires: autoconf >= 2.65
 BuildRequires: automake >= 1:1.7.2
 BuildRequires: fdk-aac-devel >= 0.1.0
+BuildRequires: freetype-devel >= 1:2.8.0
 BuildRequires: imlib2-devel >= 1.4.5
 BuildRequires: lame-libs-devel
 BuildRequires: libfuse-devel >= 2.6
 BuildRequires: libjpeg-turbo-devel
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 BuildRequires: nasm
 BuildRequires: openssl-devel >= 0.9.8
 BuildRequires: opus-devel
@@ -41,6 +42,7 @@ Requires(pre):        /usr/bin/getgid
 Requires(pre): /usr/sbin/groupadd
 Requires:      /usr/bin/Xvnc
 Requires:      fdk-aac >= 0.1.0
+Requires:      freetype >= 1:2.8.0
 Requires:      imlib2 >= 1.4.5
 Requires:      libfuse >= 2.6
 Requires:      openssl >= 0.9.8
@@ -71,6 +73,7 @@ xrdp używa jako backendu Xvnc lub X11rdp.
 Summary:       Header files for xrdp libraries
 Summary(pl.UTF-8):     Pliki nagłówkowe bibliotek xrdp
 Group:         Development/Libraries
+Obsoletes:     xrdp-static < 0.10.1-2
 
 %description devel
 Header files for xrdp libraries.
@@ -78,18 +81,6 @@ Header files for xrdp libraries.
 %description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek xrdp.
 
-%package static
-Summary:       Static xrdp libraries
-Summary(pl.UTF-8):     Statyczne biblioteki xrdp
-Group:         Development/Libraries
-Requires:      %{name}-devel = %{version}-%{release}
-
-%description static
-Static xrdp libraries.
-
-%description static -l pl.UTF-8
-Statyczne biblioteki xrdp.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -130,6 +121,7 @@ cd ..
        --disable-silent-rules \
        --enable-tjpeg \
        --enable-vsock \
+       --with-freetype2 \
        --with-imlib2
 
 %{__make}
@@ -199,6 +191,7 @@ rm -rf $RPM_BUILD_ROOT
 %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-mkfv1
 %attr(755,root,root) %{_bindir}/xrdp-sesadmin
 %attr(755,root,root) %{_bindir}/xrdp-sesrun
 %attr(755,root,root) %{_sbindir}/xrdp
@@ -214,9 +207,11 @@ rm -rf $RPM_BUILD_ROOT
 %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
+%if "%{_libexecdir}" != "%{_libdir}"
+%dir %{_libexecdir}/xrdp
+%endif
+%attr(755,root,root) %{_libexecdir}/xrdp/waitforx
+%attr(755,root,root) %{_libexecdir}/xrdp/xrdp-sesexec
 %dir %{_datadir}/xrdp
 %{_datadir}/xrdp/ad24b.bmp
 %{_datadir}/xrdp/ad256.bmp
@@ -236,6 +231,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/xrdp-dumpfv1.8*
 %{_mandir}/man8/xrdp-genkeymap.8*
 %{_mandir}/man8/xrdp-keygen.8*
+%{_mandir}/man8/xrdp-mkfv1.8*
 %{_mandir}/man8/xrdp-sesadmin.8*
 %{_mandir}/man8/xrdp-sesman.8*
 %{_mandir}/man8/xrdp-sesrun.8*
@@ -243,6 +239,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(644,root,root,755)
+%{_libdir}/libpainter.a
+%{_libdir}/librfxencode.a
 %{_includedir}/ms-*.h
 %{_includedir}/painter.h
 %{_includedir}/rfxcodec_common.h
@@ -255,8 +253,3 @@ rm -rf $RPM_BUILD_ROOT
 %{_pkgconfigdir}/libpainter.pc
 %{_pkgconfigdir}/rfxcodec.pc
 %{_pkgconfigdir}/xrdp.pc
-
-%files static
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libpainter.a
-%attr(755,root,root) %{_libdir}/librfxencode.a