From 65a501c5e5475a7d266c3a99da0ead358e81f98e Mon Sep 17 00:00:00 2001 From: zhuchunyi Date: Wed, 6 Nov 2019 19:08:51 +0800 Subject: [PATCH] update code --- gobject-introspection.spec | 40 +++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/gobject-introspection.spec b/gobject-introspection.spec index 310fbb5..699fe7f 100644 --- a/gobject-introspection.spec +++ b/gobject-introspection.spec @@ -4,14 +4,15 @@ Name: gobject-introspection Version: 1.58.0 -Release: 3 +Release: 4 Summary: Introspection system for GObject-based libraries License: GPLv2+, LGPLv2+, MIT URL: https://wiki.gnome.org/Projects/GObjectIntrospection Source0: https://download.gnome.org/sources/gobject-introspection/1.58/%{name}-%{version}.tar.xz -BuildRequires: gcc bison cairo-gobject-devel chrpath flex fontconfig-devel freetype-devel gettext glib2-devel >= %{glib2_version} gtk-doc libffi-devel libX11-devel libXfixes-devel libXft-devel libxml2-devel mesa-libGL-devel python3-devel python3-mako python3-markdown +BuildRequires: gcc bison cairo-gobject-devel chrpath flex fontconfig-devel freetype-devel gettext glib2-devel >= %{glib2_version} +BuildRequires: gtk-doc libffi-devel libX11-devel libXfixes-devel libXft-devel libxml2-devel mesa-libGL-devel python3-devel python3-mako python3-markdown Requires: glib2%{?_isa} >= %{glib2_version} @@ -30,27 +31,21 @@ Requires: python3-mako %description devel Libraries and headers for gobject-introspection -%package help -Summary: Manuals for gobject-introspection - -%description help -Manuals for gobject-introspection +%package_help %prep %autosetup -p1 %build %configure --enable-gtk-doc --enable-doctool --with-python=%{__python3} -%make_build OPTIMIZE="%{optflags}" +%make_build %install -rm -rf $RPM_BUILD_ROOT %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 +%chrpath_delete + +%delete_la_and_a %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT" @@ -68,23 +63,24 @@ fi %{_libdir}/lib*.so.* %dir %{_libdir}/girepository-1.0 %{_libdir}/girepository-1.0/*.typelib -%{_libdir}/* -%exclude %{_prefix}/src -%exclude %{_libdir}/*.{a,la} -%exclude %{_libdir}/%{name}/giscanner/*.{a,la} %files devel +%{_bindir}/g-ir-* %{_libdir}/lib*.so %{_libdir}/gobject-introspection/ %{_libdir}/pkgconfig/* -%{_includedir}/* -%{_bindir}/g-ir-* - -%files help %{_datadir}/gir-1.0 %{_datadir}/gobject-introspection-1.0/ %{_datadir}/aclocal/introspection.m4 -%{_mandir}/man1/*.gz %{_datadir}/gtk-doc/html/gi/ +%{_includedir}/* + +%files help +%{_mandir}/man1/*.gz %changelog +* Tue Oct 29 2019 openEuler Buildteam - 1.58.0-4 +- fix provides for main package and devel + +* Mon Oct 14 2019 openEuler Buildteam - 1.58.0-3 +- Package init