[pixman] Enable make check but don't (currently) fail the build on failure, Include COPYING as per packaging

Peter Robinson pbrobinson at fedoraproject.org
Fri Jul 11 11:41:08 UTC 2014


commit a19fcdfa29036e1bb410a4826e14d61197338d88
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Fri Jul 11 12:41:19 2014 +0100

    Enable make check but don't (currently) fail the build on failure, Include COPYING as per packaging guidelines, Minor spec cleanups

 0001-Fix-the-SSSE3-CPUID-detection.patch |   30 ------------------------------
 pixman.spec                              |   19 +++++++++++++------
 sources                                  |    3 ---
 3 files changed, 13 insertions(+), 39 deletions(-)
---
diff --git a/pixman.spec b/pixman.spec
index 3155563..925f94c 100644
--- a/pixman.spec
+++ b/pixman.spec
@@ -3,7 +3,7 @@
 
 Name:           pixman
 Version:        0.32.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Pixel manipulation library
 
 Group:          System Environment/Libraries
@@ -15,9 +15,8 @@ URL:            http://cgit.freedesktop.org/pixman/
 # if no revision specified, makes a new one from HEAD.
 Source0:	http://xorg.freedesktop.org/archive/individual/lib/%{name}-%{version}.tar.bz2
 Source1:	make-pixman-snapshot.sh
-Patch0:		0001-Fix-the-SSSE3-CPUID-detection.patch
 
-BuildRequires:  automake autoconf libtool pkgconfig
+BuildRequires:  automake autoconf libtool
 
 %description
 Pixman is a pixel manipulation library for X and cairo.
@@ -45,17 +44,20 @@ make %{?_smp_mflags} V=1
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
+
+find %{buildroot} -type f -name "*.la" -delete
+
+%check
+make check %{?_smp_mflags} V=1 ||:
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
 %files
-%defattr(-,root,root,-)
+%doc COPYING
 %{_libdir}/libpixman-1*.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %dir %{_includedir}/pixman-1
 %{_includedir}/pixman-1/pixman.h
 %{_includedir}/pixman-1/pixman-version.h
@@ -63,6 +65,11 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
 %{_libdir}/pkgconfig/pixman-1.pc
 
 %changelog
+* Fri Jul 11 2014 Peter Robinson <pbrobinson at fedoraproject.org> 0.32.6-2
+- Enable make check but don't (currently) fail the build on failure
+- Include COPYING as per packaging guidelines
+- Minor spec cleanups
+
 * Sun Jul 06 2014 Soren Sandmann <soren.sandmann at gmail.com> 0.32.6-1
 - pixman 0.32.6
 - drop SSSE3 patch
diff --git a/sources b/sources
index b7e8421..d1f111f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1 @@
-11b7e062e20ae40e49c2871dd9f82b0b  pixman-0.30.0.tar.bz2
-b347a6a44e5d3e7fdba644877250ce44  pixman-0.31.2.tar.bz2
-1b8314aff2a29c921f79efdbf07a0887  pixman-0.32.0.tar.bz2
 8a9e8f14743a39cf303803f369c1f344  pixman-0.32.6.tar.bz2


More information about the scm-commits mailing list