diff --git a/.gitignore b/.gitignore index 4b38e15..5e48fef 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,5 @@ libaio-0.3.109.tar.gz /libaio-0.3.110.tar.gz /libaio-0.3.111.tar.gz +/libaio-0.3.112.tar.gz +/libaio-0.3.112.tar.gz.sha512sum diff --git a/libaio-install-to-destdir-slash-usr.patch b/libaio-install-to-destdir-slash-usr.patch deleted file mode 100644 index aebc175..0000000 --- a/libaio-install-to-destdir-slash-usr.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libaio-0.3.111/src/Makefile.orig libaio-0.3.111/src/Makefile ---- libaio-0.3.111/src/Makefile.orig 2018-03-06 17:24:47.000000000 -0500 -+++ libaio-0.3.111/src/Makefile 2018-03-07 10:44:49.148004447 -0500 -@@ -53,11 +53,11 @@ $(libname): $(libaio_sobjs) libaio.map - $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) - - install: $(all_targets) -- install -D -m 644 libaio.h $(includedir)/libaio.h -- install -D -m 644 libaio.a $(libdir)/libaio.a -- install -D -m 755 $(libname) $(libdir)/$(libname) -- ln -sf $(libname) $(libdir)/$(soname) -- ln -sf $(libname) $(libdir)/libaio.so -+ install -D -m 644 libaio.h $(destdir)$(includedir)/libaio.h -+ install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a -+ install -D -m 755 $(libname) $(destdir)$(usrlibdir)/$(libname) -+ ln -sf $(libname) $(destdir)$(usrlibdir)/$(soname) -+ ln -sf $(libname) $(destdir)$(usrlibdir)/libaio.so - - $(libaio_objs): libaio.h - diff --git a/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch b/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch deleted file mode 100644 index 2f79681..0000000 --- a/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index eadb336..5911c81 100644 ---- libaio-0.3.111/src/Makefile -+++ libaio-0.3.111/src/Makefile -@@ -3,7 +3,7 @@ includedir=$(prefix)/include - libdir=$(prefix)/lib - - CFLAGS ?= -g -fomit-frame-pointer -O2 --CFLAGS += -nostdlib -nostartfiles -Wall -I. -fPIC -+CFLAGS += -Wall -I. -fPIC - SO_CFLAGS=-shared $(CFLAGS) - L_CFLAGS=$(CFLAGS) - LINK_FLAGS= diff --git a/libaio.spec b/libaio.spec index eeb691e..551ca3e 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,12 +1,9 @@ Name: libaio -Version: 0.3.111 -Release: 22%{?dist} +Version: 0.3.112 +Release: 1%{?dist} Summary: Linux-native asynchronous I/O access library License: LGPL-2.0-or-later -Source: http://releases.pagure.org/libaio/libaio-0.3.111.tar.gz - -Patch1: libaio-install-to-destdir-slash-usr.patch -Patch2: libaio-remove-nostartfiles-nostdlib-from-build-flags.patch +Source: https://codeberg.org/jmoyer/libaio/releases/download/libaio-0.3.112/libaio-0.3.112.tar.gz BuildRequires: gcc BuildRequires: make @@ -32,10 +29,6 @@ for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). %prep %setup -q -a 0 -%patch1 -p0 -b .install-to-destdir-slash-usr -%patch1 -p1 -b .install-to-destdir-slash-usr -%patch2 -p0 -b .nostdlib -%patch2 -p1 -b .nostdlib mv %{name}-%{version} compat-%{name}-%{version} %build @@ -58,7 +51,7 @@ cd compat-%{name}-%{version} install -D -m 755 src/libaio.so.1.0.0 \ $RPM_BUILD_ROOT/%{usrlibdir}/libaio.so.1.0.0 cd .. -make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ +make DESTDIR=$RPM_BUILD_ROOT prefix=/usr libdir=%{_libdir} \ includedir=%{_includedir} install find %{buildroot} -name '*.a' -delete @@ -74,6 +67,10 @@ find %{buildroot} -name '*.a' -delete %attr(0755,root,root) %{usrlibdir}/libaio.so %changelog +* Tue Jul 07 2026 Jeff Moyer - 0.3.112-1 +- Rebase to 0.3.112 to pull in async poll support. +- Resolves: RHEL-192961 + * Wed Dec 11 2024 Jeff Moyer - 0.3.111-22 - Bump release to trigger new test run. - Resolves: RHEL-70741 diff --git a/sources b/sources index 95f97e6..ba9cc9f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libaio-0.3.111.tar.gz) = 440f2b62f99ca2e72ffc8c2c04b4779a1a7cf24a8ba2a30b34d18b4ee77630a2078610fe8c435559f81a5c3bfa93049bd53d77464a0da8267833fbde3f40ceeb +SHA512 (libaio-0.3.112.tar.gz) = 5f984529c9f747a6c82f1e4457fc0832bb1fc299ae6e700f2ac5a8ea7b9bfc6ea1e75809728cc115a020cff6685ed1f4e38c6aeacc1ea98dfccce04dd19dafaa