Don't show path of non-existing libtool file

This commit is contained in:
Marek Kasik 2016-08-22 15:08:48 +02:00
parent 9a81147af8
commit 928ba6125d
2 changed files with 19 additions and 1 deletions

View File

@ -0,0 +1,11 @@
--- freetype-2.6.5/builds/unix/freetype-config.in
+++ freetype-2.6.5/builds/unix/freetype-config.in
@@ -158,7 +154,7 @@ fi
if test "$echo_libtool" = "yes" ; then
convlib="libfreetype.la"
- echo ${SYSROOT}$libdir/$convlib
+ #echo ${SYSROOT}$libdir/$convlib
fi
# EOF

View File

@ -7,7 +7,7 @@
Summary: A free and portable font rendering engine
Name: freetype
Version: 2.6.5
Release: 1%{?dist}
Release: 2%{?dist}
License: (FTL or GPLv2+) and BSD and MIT and Public Domain and zlib with acknowledgement
Group: System Environment/Libraries
URL: http://www.freetype.org
@ -29,6 +29,8 @@ Patch88: freetype-multilib.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=1161963
Patch92: freetype-2.5.3-freetype-config-prefix.patch
Patch93: freetype-2.6.5-libtool.patch
BuildRequires: libX11-devel
BuildRequires: libpng-devel
BuildRequires: zlib-devel
@ -90,6 +92,8 @@ popd
%patch92 -p1 -b .freetype-config-prefix
%patch93 -p1 -b .libtool
%build
%configure --disable-static \
@ -204,6 +208,9 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
%{_mandir}/man1/*
%changelog
* Mon Aug 22 2016 Marek Kasik <mkasik@redhat.com> - 2.6.5-2
- Don't show path of non-existing libtool file
* Wed Jul 13 2016 Marek Kasik <mkasik@redhat.com> - 2.6.5-1
- Update to 2.6.5
- Resolves: #1355743