[packages/cairo] - drop .la files - don't build tests if not running - release 3

qboosh qboosh at pld-linux.org
Sun Mar 17 20:50:14 CET 2019


commit 5028e0d51c0007c688a06066303b9b5807e58f2c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Mar 17 20:56:04 2019 +0100

    - drop .la files
    - don't build tests if not running
    - release 3

 cairo.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/cairo.spec b/cairo.spec
index fa60eea..2d96cf2 100644
--- a/cairo.spec
+++ b/cairo.spec
@@ -29,7 +29,7 @@ Summary:	Cairo - multi-platform 2D graphics library
 Summary(pl.UTF-8):	Cairo - wieloplatformowa biblioteka graficzna 2D
 Name:		cairo
 Version:	1.16.0
-Release:	2
+Release:	3
 License:	LGPL v2.1 or MPL v1.1
 Group:		Libraries
 Source0:	https://www.cairographics.org/releases/%{name}-%{version}.tar.xz
@@ -248,6 +248,10 @@ Dokumentacja API Cairo.
 %patch0 -p1
 %patch1 -p1
 
+%if %{without tests}
+%{__sed} -i -e '/SUBDIRS += boilerplate test perf/d' Makefile.am
+%endif
+
 %build
 %{?with_apidocs:%{__gtkdocize}}
 %{__libtoolize}
@@ -284,6 +288,8 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# obsoleted by pkg-config
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcairo*.la
 # LD_PRELOADable library
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/cairo/libcairo-trace.{la,a}
 # LD_PRELOADable modules(?)
@@ -313,8 +319,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcairo.so
 %attr(755,root,root) %{_libdir}/libcairo-script-interpreter.so
-%{_libdir}/libcairo.la
-%{_libdir}/libcairo-script-interpreter.la
 %{_includedir}/cairo
 %exclude %{_includedir}/cairo/cairo-gobject.h
 %{_pkgconfigdir}/cairo.pc
@@ -357,7 +361,6 @@ rm -rf $RPM_BUILD_ROOT
 %files gobject-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libcairo-gobject.so
-%{_libdir}/libcairo-gobject.la
 %{_includedir}/cairo/cairo-gobject.h
 %{_pkgconfigdir}/cairo-gobject.pc
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/cairo.git/commitdiff/5028e0d51c0007c688a06066303b9b5807e58f2c



More information about the pld-cvs-commit mailing list