X-Git-Url: https://git.tld-linux.org/?a=blobdiff_plain;ds=sidebyside;f=xrdp.spec;h=a1f54d9db3ff554f3477dd9e7c9497c5e670aa95;hb=HEAD;hp=15d527b47db3254f20c23d47c7e66319219e3bb0;hpb=c1ce194b640288fb6c5c6d201154637d1293efa2;p=packages%2Fxrdp.git

diff --git a/xrdp.spec b/xrdp.spec
index 15d527b..96c71da 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -1,12 +1,13 @@
 Summary:	Remote desktop server
 Summary(pl.UTF-8):	Serwer remote desktop
 Name:		xrdp
-Version:	0.9.7
-Release:	2
-License:	GPL
+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:	5f8074a7bed8b45d43ef028748a86755
+# Source0-md5:	2221e0a307fbf553d6d99416496525ab
 Source1:	%{name}.init
 Source2:	%{name}.pamd
 Source3:	%{name}.README.TLD
@@ -14,22 +15,39 @@ Source4:	%{name}.README.TLD.pl
 Source5:	startwm.sh
 Patch0:		config.patch
 Patch1:		quiet.patch
-URL:		http://www.xrdp.org/
-BuildRequires:	autoconf
-BuildRequires:	automake
-BuildRequires:	freerdp-devel
+Patch2:		x32.patch
+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:	openssl-devel
+BuildRequires:	nasm
+BuildRequires:	openssl-devel >= 0.9.8
+BuildRequires:	opus-devel
 BuildRequires:	pam-devel
+BuildRequires:	pixman-devel >= 0.1.0
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.268
-Requires:	xrdp-libs = %{version}-%{release}
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXfixes-devel
+BuildRequires:	xorg-lib-libXrandr-devel
 Requires(post,preun):	/sbin/chkconfig
+Requires(postun):	/usr/sbin/groupdel
+Requires(pre):	/usr/bin/getgid
+Requires(pre):	/usr/sbin/groupadd
 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
-Requires(postun):       /usr/sbin/groupdel
-Requires(pre):  /usr/bin/getgid
-Requires(pre):  /usr/sbin/groupadd
+Obsoletes:	xrdp-libs < 0.10
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -49,78 +67,93 @@ klientami protokołu rdp Microsoftu.
 
 xrdp używa jako backendu Xvnc lub X11rdp.
 
-%package -n xrdp-libs
-Summary:        xrdp shared libraries
-Summary(pl.UTF-8):      Biblioteki współdzielone xrdp
-Group:          Libraries
-Requires(post,postun):	/sbin/ldconfig
+%package devel
+Summary:	Header files for xrdp libraries
+Summary(pl.UTF-8):	Pliki nagłówkowe bibliotek xrdp
+Group:		Development/Libraries
 
-%description -n xrdp-libs
-xrdp shared libraries.
-
-%description -n xrdp-libs -l pl.UTF-8
-Biblioteki współdzielone xrdp.
-
-%package -n xrdp-devel
-Summary:        Header files for xrdp libraries
-Summary(pl.UTF-8):      Pliki nagłówkowe bibliotek xrdp
-Group:          Development/Libraries
-Requires:       xrdp-libs = %{version}-%{release}
-
-%description -n xrdp-devel
+%description devel
 Header files for xrdp libraries.
 
-%description -n xrdp-devel -l pl.UTF-8
+%description devel -l pl.UTF-8
 Pliki nagłówkowe bibliotek xrdp.
 
-%package -n xrdp-static
-Summary:        Static xrdp libraries
-Summary(pl.UTF-8):      Statyczne biblioteki xrdp
-License:        LGPL v2.1
-Group:          Development/Libraries
-Requires:       xrdp-devel = %{version}-%{release}
+%package static
+Summary:	Static xrdp libraries
+Summary(pl.UTF-8):	Statyczne biblioteki xrdp
+Group:		Development/Libraries
+Requires:	%{name}-devel = %{version}-%{release}
 
-%description -n xrdp-static
+%description static
 Static xrdp libraries.
 
-%description -n xrdp-static -l pl.UTF-8
+%description static -l pl.UTF-8
 Statyczne biblioteki xrdp.
 
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 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}
+cd ../librfxcodec
+%{__libtoolize}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
+cd ..
 %configure \
-	--enable-freerdp1
+	--enable-fdkaac \
+	--enable-fuse \
+	--enable-ipv6 \
+	--enable-mp3lame \
+	--enable-opus \
+	--enable-pam-config=redhat \
+	--enable-painter \
+	--enable-pixman \
+	--disable-silent-rules \
+	--enable-tjpeg \
+	--enable-vsock \
+	--with-imlib2
+
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{%{name},pam.d,rc.d/init.d,security}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/%{name},/etc/{pam.d,rc.d/init.d,security}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rc.d/init.d/xrdp
-install %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/sesman
-%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
-%{__ln} -s sesman $RPM_BUILD_ROOT%{_sysconfdir}/pam.d/xrdp-sesman
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la}
-%{__rm} -f $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
-install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/xrdp/startwm.sh
-
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/xrdp
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/sesman
+%{__rm} $RPM_BUILD_ROOT/etc/pam.d/xrdp-sesman
+%{__ln_s} sesman $RPM_BUILD_ROOT/etc/pam.d/xrdp-sesman
 :> $RPM_BUILD_ROOT/etc/security/blacklist.sesman
 
+%{__rm} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/startwm.sh
+install %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/startwm.sh
+
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/%{name}/lib*.{a,la}
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib*.la
+
 %pre
 %groupadd -g 183 xrdp
 
@@ -142,14 +175,10 @@ fi
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post	-n xrdp-libs -p /sbin/ldconfig
-%postun	-n xrdp-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
@@ -167,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
@@ -177,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*
@@ -202,15 +241,9 @@ 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) %{_libdir}/librfxencode.so.*.*
-
 %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
 %{_includedir}/rfxcodec_decode.h