From 3e3a199683a4cd9e6bde5c41f02940adbefcff6f97561b04cca86fa79fbdd66f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Mar 2018 13:58:51 +0000 Subject: [PATCH] Accepting request 581349 from GNOME:Next spec-cleaner OBS-URL: https://build.opensuse.org/request/show/581349 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/pixman?expand=0&rev=95 --- pixman.changes | 5 +++++ pixman.spec | 15 ++++++--------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/pixman.changes b/pixman.changes index c30ad23..5ed4cb1 100644 --- a/pixman.changes +++ b/pixman.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 28 16:38:27 UTC 2018 - dimstar@opensuse.org + +- Modernize spec-file by calling spec-cleaner + ------------------------------------------------------------------- Fri Apr 15 21:23:20 UTC 2016 - mgorse@suse.com diff --git a/pixman.spec b/pixman.spec index 6b30afb..6c27a7c 100644 --- a/pixman.spec +++ b/pixman.spec @@ -1,7 +1,7 @@ # # spec file for package pixman # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,13 +22,12 @@ Release: 0 Summary: Pixel manipulation library License: MIT Group: System/Libraries -Url: http://xorg.freedesktop.org/ +URL: http://xorg.freedesktop.org/ Source: http://cairographics.org/releases/%{name}-%{version}.tar.gz Source99: baselibs.conf # PATCH-FIX-UPSTREAM pixman-private-correct-include.patch zaitor@opensuse.org -- pixman-private: include only in C code Patch0: pixman-private-correct-include.patch BuildRequires: pkgconfig -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description Pixman is a pixel manipulation library for X and cairo. @@ -57,7 +56,7 @@ Pixman is a pixel manipulation library for X and cairo. # # For now: disable neon on all ARMv6/7 %configure \ -%ifarch %arm +%ifarch %{arm} --disable-arm-iwmmxt \ --disable-arm-neon \ %endif @@ -68,20 +67,18 @@ Pixman is a pixel manipulation library for X and cairo. make V=1 %{?_smp_mflags} %install -%makeinstall +%make_install rm %{buildroot}%{_libdir}/libpixman-1.la %post -n libpixman-1-0 -p /sbin/ldconfig - %postun -n libpixman-1-0 -p /sbin/ldconfig %files -n libpixman-1-0 -%defattr(-,root,root) -%doc COPYING +%license COPYING + %{_libdir}/libpixman-1.so.* %files -n libpixman-1-0-devel -%defattr(-,root,root) %{_includedir}/pixman-1 %{_libdir}/libpixman-1.so %{_libdir}/pkgconfig/pixman-1.pc