From b126f3407c084546dbf53465c41668a280bff7b6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sat, 5 Jan 2019 17:28:17 +0100 Subject: [PATCH] Switch to the meson build system --- gobject-introspection.spec | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index cc38e5d..ef5a4ee 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -14,7 +14,6 @@ Source0: https://download.gnome.org/sources/gobject-introspection/1.59/%{ BuildRequires: gcc BuildRequires: bison BuildRequires: cairo-gobject-devel -BuildRequires: chrpath BuildRequires: flex BuildRequires: fontconfig-devel BuildRequires: freetype-devel @@ -27,6 +26,7 @@ BuildRequires: libXfixes-devel BuildRequires: libXft-devel BuildRequires: libxml2-devel BuildRequires: mesa-libGL-devel +BuildRequires: meson BuildRequires: python3-devel BuildRequires: python3-mako BuildRequires: python3-markdown @@ -54,24 +54,14 @@ Libraries and headers for gobject-introspection %autosetup -p1 %build -%configure --enable-gtk-doc --enable-doctool --with-python=%{__python3} -%make_build +%meson -Ddoctool=true -Dgtk-doc=true -Dpython=%{__python3} +%meson_build %install -%make_install - -# Remove lib64 rpaths -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-compiler -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-generate -chrpath --delete $RPM_BUILD_ROOT%{_bindir}/g-ir-inspect - -# Die libtool, die. -find $RPM_BUILD_ROOT -type f -name "*.la" -print -delete -find $RPM_BUILD_ROOT -type f -name "*.a" -print -delete +%meson_install %files %license COPYING - %{_libdir}/lib*.so.* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/*.typelib @@ -91,6 +81,7 @@ find $RPM_BUILD_ROOT -type f -name "*.a" -print -delete %changelog * Sat Jan 05 2019 Kalev Lember - 1.59.2-1 - Update to 1.59.2 +- Switch to the meson build system * Sun Dec 30 2018 Kalev Lember - 1.58.3-1 - Update to 1.58.3