From f7f685828ae3efa27a4d55c0ddba9aa1abfd279275737ec511430d8f9c598bf8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 23 Feb 2018 08:34:37 +0000 Subject: [PATCH] Accepting request 579223 from home:iznogood:branches:GNOME:Next - Update to version 1.6.2: + Mostly fixes for the Meson build, to ensure it's a bit more idiomatic and conforms to what newer versions of Meson expect from a project. - Do a minor spec clean, use autosetup and license macros. - Stop exporting LANG=C.UTF-8, fixed upstream. - Stop exporting i586 conditional SUSE_ASNEEDED=0, fixed upstream. - Pass explict enable-gtk-doc=true, enable-gobject-types=true, enable-introspection=true, enable-gcc-vector=true, enable-sse2=true and enable-arm-neon=true to meson, ensure we build the features we want. - Following the above, add gtk-doc BuildRequires and package the now built documentation in devel subpackage. - Stop using sed to ensure we are using python3, fixed upstream. - Add fdupes BuildRequires and macro, remove duplicate files. OBS-URL: https://build.opensuse.org/request/show/579223 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/graphene?expand=0&rev=14 --- graphene-1.6.0.tar.gz | 3 --- graphene-1.6.2.tar.gz | 3 +++ graphene.changes | 19 +++++++++++++++++++ graphene.spec | 42 ++++++++++++++++++------------------------ 4 files changed, 40 insertions(+), 27 deletions(-) delete mode 100644 graphene-1.6.0.tar.gz create mode 100644 graphene-1.6.2.tar.gz diff --git a/graphene-1.6.0.tar.gz b/graphene-1.6.0.tar.gz deleted file mode 100644 index 5d7d422..0000000 --- a/graphene-1.6.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:98970f859e452ce421b72726ca727fdf3ac27cb4804b62bfe520157fa46aa2fd -size 183951 diff --git a/graphene-1.6.2.tar.gz b/graphene-1.6.2.tar.gz new file mode 100644 index 0000000..95ff2bd --- /dev/null +++ b/graphene-1.6.2.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4766bc69492a7ec84a0eaaa0a16741d8e7f026fb641aa803e6424158a7caf6d5 +size 184577 diff --git a/graphene.changes b/graphene.changes index c121fbe..6e5ddfe 100644 --- a/graphene.changes +++ b/graphene.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Feb 22 23:34:27 UTC 2018 - bjorn.lie@gmail.com + +- Update to version 1.6.2: + + Mostly fixes for the Meson build, to ensure it's a bit more + idiomatic and conforms to what newer versions of Meson expect + from a project. +- Do a minor spec clean, use autosetup and license macros. +- Stop exporting LANG=C.UTF-8, fixed upstream. +- Stop exporting i586 conditional SUSE_ASNEEDED=0, fixed upstream. +- Pass explict enable-gtk-doc=true, enable-gobject-types=true, + enable-introspection=true, enable-gcc-vector=true, + enable-sse2=true and enable-arm-neon=true to meson, ensure we + build the features we want. +- Following the above, add gtk-doc BuildRequires and package the + now built documentation in devel subpackage. +- Stop using sed to ensure we are using python3, fixed upstream. +- Add fdupes BuildRequires and macro, remove duplicate files. + ------------------------------------------------------------------- Wed Nov 29 12:22:26 UTC 2017 - dimstar@opensuse.org diff --git a/graphene.spec b/graphene.spec index 8aeff33..3538cad 100644 --- a/graphene.spec +++ b/graphene.spec @@ -1,7 +1,7 @@ # # spec file for package graphene # -# Copyright (c) 2017 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 @@ -17,7 +17,7 @@ Name: graphene -Version: 1.6.0 +Version: 1.6.2 Release: 0 Summary: Thin type layer for graphic libraries License: MIT @@ -25,12 +25,14 @@ Group: Development/Languages/C and C++ Url: http://ebassi.github.io/graphene/ Source: https://github.com/ebassi/graphene/archive/%{version}/%{name}-%{version}.tar.gz Source99: baselibs.conf + +BuildRequires: fdupes BuildRequires: gobject-introspection-devel -BuildRequires: meson >= 0.37.0 +BuildRequires: gtk-doc +BuildRequires: meson >= 0.43.1 BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: pkgconfig(gobject-2.0) >= 2.30.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Graphene library provides types and their relative API for affine @@ -76,27 +78,22 @@ quaternions. This subpackage contains the development files for the Graphene library. %prep -%setup -q -# replace usr/bin/env shebang -sed -i "s|/usr/bin/env python|/usr/bin/python3|" src/identfilter.py -sed -i "s|--identifier-filter-cmd=python|--identifier-filter-cmd=python3|" src/meson.build +%autosetup %build -# meson errors out without a utf8 LANG set -# https://github.com/mesonbuild/meson/issues/1085 -export LANG=C.UTF-8 -M_OPTIONS="" -%ifarch i586 -# on i586, the compiler drops 'libm' and then g-ir-scanner fails to resolve it -# See gh#ebassie/graphene#82 -export SUSE_ASNEEDED=0 -M_OPTIONS="-Denable-sse2=false" -%endif -%meson $M_OPTIONS +%meson \ + -D enable-gtk-doc=true \ + -D enable-gobject-types=true \ + -D enable-introspection=true \ + -D enable-gcc-vector=true \ + -D enable-sse2=true \ + -D enable-arm-neon=true \ + %{nil} %meson_build %install %meson_install +%fdupes %{buildroot}%{_libdir}/pkgconfig %check %meson_test @@ -105,20 +102,17 @@ M_OPTIONS="-Denable-sse2=false" %postun -n libgraphene-1_0-0 -p /sbin/ldconfig %files -n libgraphene-1_0-0 -%defattr(-,root,root) -%doc LICENSE +%license LICENSE %{_libdir}/libgraphene-1.0.so.* %files -n typelib-1_0-Graphene-1_0 -%defattr(-,root,root) %{_libdir}/girepository-1.0/Graphene-1.0.typelib %files -n libgraphene-devel -%defattr(-,root,root) +%doc %{_datadir}/gtk-doc/html/* %{_includedir}/graphene-1.0/ %{_prefix}/lib/installed-tests/ %{_libdir}/libgraphene-1.0.so - %{_libdir}/pkgconfig/graphene-1.0.pc %{_libdir}/pkgconfig/graphene-gobject-1.0.pc %dir %{_libdir}/graphene-1.0