- updated to 1.80.0; added bootstrap bcond for glib 2.78->2.80 transition

diff --git a/gobject-introspection.spec b/gobject-introspection.spec
index 0055356e1ae273360f030b2de5a2992bfade6591..4719aa3d3029b9d91d33c901527baeaf79ac4666 100644 (file)
--- a/gobject-introspection.spec
+++ b/gobject-introspection.spec
@@ -2,27 +2,30 @@
 # Conditional build:
 %bcond_without cairo           # cairo support
 %bcond_without apidocs         # API documentation
+%bcond_with    bootstrap       # bootstrap from glib < 2.80
 
 Summary:       Introspection for GObject libraries
 Summary(pl.UTF-8):     Obserwacja bibliotek GObject
 Name:          gobject-introspection
-Version:       1.78.1
+Version:       1.80.0
 Release:       1
-License:       LGPL v2+ (giscanner) and GPL v2+ (tools)
+License:       LGPL v2+ (libraries, giscanner) and GPL v2+ (tools)
 Group:         Libraries
-Source0:       https://download.gnome.org/sources/gobject-introspection/1.78/%{name}-%{version}.tar.xz
-# Source0-md5: da2677e6b9c91b33c036d2233a96cec3
+Source0:       https://download.gnome.org/sources/gobject-introspection/1.80/%{name}-%{version}.tar.xz
+# Source0-md5: 003cc22c45be5edf91911050bbcfbde6
+Source1:       https://download.gnome.org/sources/glib/2.80/glib-2.80.0.tar.xz
+# Source1-md5: 3a51e2803ecd22c2dadcd07d9475ebe3
 URL:           https://wiki.gnome.org/Projects/GObjectIntrospection
 BuildRequires: automake
 BuildRequires: bison
 %{?with_cairo:BuildRequires:   cairo-gobject-devel}
 BuildRequires: flex
 BuildRequires: gcc >= 5:3.2
-BuildRequires: glib2-devel >= 1:2.78.0
+%{!?with_bootstrap:BuildRequires:      glib2-devel >= 1:2.80.0}
 BuildRequires: glibc-misc
 %{?with_apidocs:BuildRequires: gtk-doc >= 1.19}
-BuildRequires: libffi-devel >= 3.0.0
-BuildRequires: meson >= 0.60.0
+BuildRequires: libffi-devel >= 7:3.4
+BuildRequires: meson >= 1.2.0
 BuildRequires: ninja >= 1.5
 BuildRequires: pkgconfig
 BuildRequires: python3 >= 1:3.6
@@ -36,7 +39,8 @@ BuildRequires:        rpmbuild(macros) >= 1.752
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 BuildRequires: zlib-devel
-Requires:      glib2 >= 1:2.78.0
+Requires:      glib2 >= 1:2.80.0
+Requires:      libffi >= 7:3.4
 Obsoletes:     gobject-introspection-libs < %{version}-%{release}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -51,8 +55,8 @@ Summary:      Header files for gobject-introspection library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki gobject-introspection
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
-Requires:      glib2-devel >= 1:2.78.0
-Requires:      libffi-devel >= 3.0.0
+Requires:      glib2-devel >= 1:2.80.0
+Requires:      libffi-devel >= 7:3.4
 Requires:      python3-Mako
 Requires:      python3-modules >= 1:3.6
 # for ldd
@@ -81,7 +85,11 @@ gobject-introspection API documentation.
 Dokumentacja API gobject-introspection.
 
 %prep
-%setup -q
+%setup -q %{?with_bootstrap:-a1}
+
+%if %{with bootstrap}
+%{__mv} glib-2.80.0 subprojects/glib
+%endif
 
 %{__sed} -i -e "s,^giscannerdir[[:space:]]*=[[:space:]]*.*,giscannerdir='%{py3_sitedir}/giscanner'," giscanner/meson.build
 %{__sed} -i -e '/python_cmd =/ s,/usr/bin/env python@0@,/usr/bin/python@0@,' tools/meson.build
@@ -101,6 +109,21 @@ rm -rf $RPM_BUILD_ROOT
 %py3_comp $RPM_BUILD_ROOT%{py3_sitedir}
 %py3_ocomp $RPM_BUILD_ROOT%{py3_sitedir}
 
+%if %{with bootstrap}
+%{__rm} $RPM_BUILD_ROOT%{_bindir}/{gapplication,gdbus*,gi-*,gio*,glib-*,gobject-*,gresource,gsettings,gtester*}
+%{__rm} -r $RPM_BUILD_ROOT%{_includedir}/{gio-unix-2.0,glib-2.0}
+%{__rm} $RPM_BUILD_ROOT%{_libexecdir}/gio-launch-desktop
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/lib{gio,girepository,glib,gmodule,gobject,gthread}-2.0.*
+%{__rm} -r $RPM_BUILD_ROOT%{_libdir}/{gio,glib-2.0}
+%{__rm} $RPM_BUILD_ROOT%{_pkgconfigdir}/{gio,gio-unix,girepository,glib,gmodule,gmodule-export,gmodule-no-export,gobject,gthread}-2.0.pc
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gdb/auto-load/usr/%{_lib}/lib{glib,gobject}-2.0.*
+%{__rm} $RPM_BUILD_ROOT%{_datadir}/gettext/its/gschema.*
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/glib-2.0
+%{__rm} $RPM_BUILD_ROOT%{_aclocaldir}/{glib-2.0,glib-gettext,gsettings}.m4
+%{__rm} $RPM_BUILD_ROOT%{bash_compdir}/{gapplication,gdbus,gio,gresource,gsettings}
+%{__rm} $RPM_BUILD_ROOT%{_localedir}/*/LC_MESSAGES/glib20.mo
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -109,7 +132,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc NEWS README.rst TODO
+%doc COPYING NEWS README.rst
 %attr(755,root,root) %{_libdir}/libgirepository-1.0.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libgirepository-1.0.so.1
 %dir %{_libdir}/girepository-1.0
@@ -117,10 +140,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/girepository-1.0/DBusGLib-1.0.typelib
 %{_libdir}/girepository-1.0/GIRepository-2.0.typelib
 %{_libdir}/girepository-1.0/GL-1.0.typelib
-%{_libdir}/girepository-1.0/GLib-2.0.typelib
-%{_libdir}/girepository-1.0/GModule-2.0.typelib
-%{_libdir}/girepository-1.0/GObject-2.0.typelib
-%{_libdir}/girepository-1.0/Gio-2.0.typelib
 %{_libdir}/girepository-1.0/Vulkan-1.0.typelib
 %{_libdir}/girepository-1.0/cairo-1.0.typelib
 %{_libdir}/girepository-1.0/fontconfig-2.0.typelib
@@ -154,10 +173,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gir-1.0/DBusGLib-1.0.gir
 %{_datadir}/gir-1.0/GIRepository-2.0.gir
 %{_datadir}/gir-1.0/GL-1.0.gir
-%{_datadir}/gir-1.0/GLib-2.0.gir
-%{_datadir}/gir-1.0/GModule-2.0.gir
-%{_datadir}/gir-1.0/GObject-2.0.gir
-%{_datadir}/gir-1.0/Gio-2.0.gir
 %{_datadir}/gir-1.0/Vulkan-1.0.gir
 %{_datadir}/gir-1.0/cairo-1.0.gir
 %{_datadir}/gir-1.0/fontconfig-2.0.gir