[packages/xrdp] - versioned imlib dependency, don't hide individual autotools calls behind autoreconf

qboosh qboosh at pld-linux.org
Sat Sep 17 21:22:51 CEST 2022


commit 0a3433c85511cc5797afdcd89f3ecc6642472a0d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Sep 17 21:23:10 2022 +0200

    - versioned imlib dependency, don't hide individual autotools calls behind autoreconf

 xrdp.spec | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)
---
diff --git a/xrdp.spec b/xrdp.spec
index 6fc8065..9f37f19 100644
--- a/xrdp.spec
+++ b/xrdp.spec
@@ -20,7 +20,7 @@ URL:		http://xrdp.org/
 BuildRequires:	autoconf >= 2.65
 BuildRequires:	automake >= 1:1.7.2
 BuildRequires:	fdk-aac-devel >= 0.1.0
-BuildRequires:	imlib2-devel
+BuildRequires:	imlib2-devel >= 1.4.5
 BuildRequires:	lame-libs-devel
 BuildRequires:	libfuse-devel >= 2.6
 BuildRequires:	libjpeg-turbo-devel
@@ -44,6 +44,7 @@ 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
@@ -114,21 +115,39 @@ install %{SOURCE3} README.PLD
 install %{SOURCE4} README.PLD.pl
 
 %build
-autoreconf -fv
+%{__libtoolize}
+%{__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-fdkaac \
 	--enable-fuse \
+	--enable-ipv6 \
 	--enable-mp3lame \
 	--enable-opus \
 	--enable-pam-config=redhat \
+	--enable-painter \
 	--enable-pixman \
+	--disable-silent-rules \
 	--enable-tjpeg \
-	--enable-painter \
-	--enable-ipv6 \
 	--enable-vsock \
-	--with-imlib2="yes"
+	--with-imlib2
 
-%{__make} V=1
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -179,9 +198,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING NEWS.md README.md
-%doc README.PLD
-%doc README.PLD.pl
+%doc COPYING NEWS.md README.md README.PLD
+%lang(pl) %doc README.PLD.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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xrdp.git/commitdiff/0a3433c85511cc5797afdcd89f3ecc6642472a0d



More information about the pld-cvs-commit mailing list