diff --git a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch index 7db3460..44dfcd9 100644 --- a/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch +++ b/0001-Use-CreateFile-on-Win32-to-make-sure-g_unlink-always.patch @@ -1,12 +1,12 @@ -diff -rupN --no-dereference glib-2.63.6/gio/tests/org.gtk.test.gschema.override.orig glib-2.63.6-new/gio/tests/org.gtk.test.gschema.override.orig ---- glib-2.63.6/gio/tests/org.gtk.test.gschema.override.orig 2020-02-24 16:07:12.000000000 +0100 -+++ glib-2.63.6-new/gio/tests/org.gtk.test.gschema.override.orig 1970-01-01 01:00:00.000000000 +0100 +diff -rupN --no-dereference glib-2.64.0/gio/tests/org.gtk.test.gschema.override.orig glib-2.64.0-new/gio/tests/org.gtk.test.gschema.override.orig +--- glib-2.64.0/gio/tests/org.gtk.test.gschema.override.orig 2020-02-27 17:12:52.000000000 +0100 ++++ glib-2.64.0-new/gio/tests/org.gtk.test.gschema.override.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,2 +0,0 @@ -[org.gtk.test.per-desktop:GNOME-Classic] -desktop = "GNOME Classic" -diff -rupN --no-dereference glib-2.63.6/gio/tests/org.gtk.test.gschema.xml.orig glib-2.63.6-new/gio/tests/org.gtk.test.gschema.xml.orig ---- glib-2.63.6/gio/tests/org.gtk.test.gschema.xml.orig 2020-02-24 16:07:12.000000000 +0100 -+++ glib-2.63.6-new/gio/tests/org.gtk.test.gschema.xml.orig 1970-01-01 01:00:00.000000000 +0100 +diff -rupN --no-dereference glib-2.64.0/gio/tests/org.gtk.test.gschema.xml.orig glib-2.64.0-new/gio/tests/org.gtk.test.gschema.xml.orig +--- glib-2.64.0/gio/tests/org.gtk.test.gschema.xml.orig 2020-02-27 17:12:52.000000000 +0100 ++++ glib-2.64.0-new/gio/tests/org.gtk.test.gschema.xml.orig 1970-01-01 01:00:00.000000000 +0100 @@ -1,222 +0,0 @@ - - @@ -230,9 +230,9 @@ diff -rupN --no-dereference glib-2.63.6/gio/tests/org.gtk.test.gschema.xml.orig - - - -diff -rupN --no-dereference glib-2.63.6/glib/gstdio.c glib-2.63.6-new/glib/gstdio.c ---- glib-2.63.6/glib/gstdio.c 2020-02-24 16:07:12.000000000 +0100 -+++ glib-2.63.6-new/glib/gstdio.c 2020-02-25 15:16:49.970829597 +0100 +diff -rupN --no-dereference glib-2.64.0/glib/gstdio.c glib-2.64.0-new/glib/gstdio.c +--- glib-2.64.0/glib/gstdio.c 2020-02-27 17:12:52.000000000 +0100 ++++ glib-2.64.0-new/glib/gstdio.c 2020-03-06 21:49:35.176138954 +0100 @@ -1036,6 +1036,11 @@ g_open (const gchar *filename, int mode) { diff --git a/mingw-glib2.spec b/mingw-glib2.spec index 8ba111f..25fca6a 100644 --- a/mingw-glib2.spec +++ b/mingw-glib2.spec @@ -8,7 +8,7 @@ %global __python %{__python3} Name: mingw-glib2 -Version: 2.63.6 +Version: 2.64.0 Release: 1%{?dist} Summary: MinGW Windows GLib2 library @@ -131,37 +131,37 @@ Static version of the MinGW Windows GLib2 library. # and -DGOBJECT_STATIC_COMPILATION to their CFLAGS to avoid compile failures # Drop the folder which was temporary used for installing the static bits -rm -f $RPM_BUILD_ROOT/%{mingw32_libdir}/charset.alias -rm -f $RPM_BUILD_ROOT/%{mingw64_libdir}/charset.alias +rm -f %{buildroot}/%{mingw32_libdir}/charset.alias +rm -f %{buildroot}/%{mingw64_libdir}/charset.alias # Drop the GDB helper files as we can't use the native Fedora GDB to debug Win32 programs -rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gdb -rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gdb +rm -rf %{buildroot}%{mingw32_datadir}/gdb +rm -rf %{buildroot}%{mingw64_datadir}/gdb # Remove the gtk-doc documentation and manpages which duplicate Fedora native -rm -rf $RPM_BUILD_ROOT%{mingw32_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/gtk-doc +rm -rf %{buildroot}%{mingw32_mandir} +rm -rf %{buildroot}%{mingw32_datadir}/gtk-doc -rm -rf $RPM_BUILD_ROOT%{mingw64_mandir} -rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/gtk-doc +rm -rf %{buildroot}%{mingw64_mandir} +rm -rf %{buildroot}%{mingw64_datadir}/gtk-doc # Bash-completion files aren't interesting for mingw -rm -rf $RPM_BUILD_ROOT%{mingw32_datadir}/bash-completion -rm -rf $RPM_BUILD_ROOT%{mingw64_datadir}/bash-completion +rm -rf %{buildroot}%{mingw32_datadir}/bash-completion +rm -rf %{buildroot}%{mingw64_datadir}/bash-completion # The .def files are also of no use to other binaries -rm -f $RPM_BUILD_ROOT%{mingw32_libdir}/*.def -rm -f $RPM_BUILD_ROOT%{mingw64_libdir}/*.def +rm -f %{buildroot}%{mingw32_libdir}/*.def +rm -f %{buildroot}%{mingw64_libdir}/*.def # The gdbus-codegen pieces are already in the native glib2 package -rm -f $RPM_BUILD_ROOT%{mingw32_bindir}/gdbus-codegen -rm -rf $RPM_BUILD_ROOT%{mingw32_libdir}/gdbus-2.0 +rm -f %{buildroot}%{mingw32_bindir}/gdbus-codegen +rm -rf %{buildroot}%{mingw32_libdir}/gdbus-2.0 -rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/gdbus-codegen -rm -rf $RPM_BUILD_ROOT%{mingw64_libdir}/gdbus-2.0 +rm -f %{buildroot}%{mingw64_bindir}/gdbus-codegen +rm -rf %{buildroot}%{mingw64_libdir}/gdbus-2.0 # Drop all .la files -find $RPM_BUILD_ROOT -name "*.la" -delete +find %{buildroot} -name "*.la" -delete %mingw_find_lang glib20 @@ -270,6 +270,9 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog +* Fri Mar 06 2020 Sandro Mani - 2.64.0-1 +- Update to 2.64.0 + * Tue Feb 25 2020 Sandro Mani - 2.63.6-1 - Update to 2.63.6 diff --git a/sources b/sources index e0a8edb..ffbaaea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glib-2.63.6.tar.xz) = 287b27429da19f048e48379410094cff8a71a26c3ed90be4f338c384fb7fb196c468d11299bb422405e68d501905e3767d2a83ce0ae313ef837e020fb3ca1f88 +SHA512 (glib-2.64.0.tar.xz) = d843d26e265529677d3eb1bf342c8c39dea47455a32588285583be6ea77214c532b9246523c458f3b2a01bbd1a6c73761fa0fef5fe6f4a5cea6c885d27b53510