diff --git a/libvirt-glib-1.0.0.tar.gz b/libvirt-glib-1.0.0.tar.gz deleted file mode 100644 index 1cabebd..0000000 Binary files a/libvirt-glib-1.0.0.tar.gz and /dev/null differ diff --git a/libvirt-glib-4.0.0-cast-align.patch b/libvirt-glib-4.0.0-cast-align.patch new file mode 100644 index 0000000..666baba --- /dev/null +++ b/libvirt-glib-4.0.0-cast-align.patch @@ -0,0 +1,12 @@ +diff -rup libvirt-glib-4.0.0.orig/meson.build libvirt-glib-4.0.0.new/meson.build +--- libvirt-glib-4.0.0.orig/meson.build 2021-02-15 12:23:04.609036200 +0000 ++++ libvirt-glib-4.0.0.new/meson.build 2021-02-15 14:50:24.838971022 +0000 +@@ -175,8 +175,6 @@ cc_flags += [ + '-Wbuiltin-declaration-mismatch', + '-Wbuiltin-macro-redefined', + '-Wcannot-profile', +- '-Wcast-align', +- '-Wcast-align=strict', + '-Wcast-function-type', + '-Wchar-subscripts', + '-Wclobbered', diff --git a/libvirt-glib-4.0.0.tar.xz b/libvirt-glib-4.0.0.tar.xz new file mode 100644 index 0000000..0120455 Binary files /dev/null and b/libvirt-glib-4.0.0.tar.xz differ diff --git a/libvirt-glib.spec b/libvirt-glib.spec index fb4084a..3f3c073 100644 --- a/libvirt-glib.spec +++ b/libvirt-glib.spec @@ -1,11 +1,14 @@ Name: libvirt-glib -Version: 1.0.0 -Release: 8 +Version: 4.0.0 +Release: 1 Summary: libvirt glib integration for events License: LGPLv2+ URL: http://libvirt.org/ -Source0: ftp://libvirt.org/libvirt/glib/%{name}-%{version}.tar.gz -BuildRequires: glib2-devel >= 2.36.0 libvirt-devel >= 1.1.1 gobject-introspection-devel libxml2-devel libtool vala-tools intltool +Source0: https://libvirt.org/sources/glib/%{name}-%{version}.tar.xz +BuildRequires: glib2-devel >= 2.48.0 libvirt-devel >= 1.2.8 gobject-introspection-devel +BuildRequires: libxml2-devel >= 2.9.1 vala gettext gtk-doc meson +Patch0: libvirt-glib-4.0.0-cast-align.patch + Provides: libvirt-gconfig libvirt-gobject Obsoletes: libvirt-gconfig libvirt-gobject @@ -24,30 +27,27 @@ This package provides development header files and libraries for integration bet %prep -%setup -q +%autosetup -p1 %build -%configure --enable-introspection -%make_build +%meson -Drpath=disabled -Dintrospection=enabled +%meson_build %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -rm -f $RPM_BUILD_ROOT%{_libdir}/libvirt-g*a +%meson_install + +%delete_la_and_a %find_lang %{name} %check -if ! make %{?_smp_mflags} check; then - cat tests/test-suite.log || true - exit 1 -fi +%meson_test %ldconfig_post %ldconfig_postun %files -f %{name}.lang -%doc README COPYING AUTHORS ChangeLog NEWS +%doc README COPYING AUTHORS NEWS %{_libdir}/libvirt-g*-1.0.so.* %{_libdir}/girepository-1.0/LibvirtG*-1.0.typelib @@ -63,5 +63,10 @@ fi %{_datadir}/vala/vapi/libvirt-g* %changelog +* Wed Jun 30 2021 weijin deng - 4.0.0-1 +- Upgrade to 4.0.0 +- Use meson rebuild +- Add libvirt-glib-4.0.0-cast-align.patch + * Sat Nov 30 2019 chenzhenyu - 1.0.0-8 - Package init