diff --git a/.gitignore b/.gitignore index 11d3a72..5d9332b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/libaio-0.3.110.tar.gz +SOURCES/libaio-0.3.112.tar.gz diff --git a/.libaio.metadata b/.libaio.metadata index c2df56c..9415abc 100644 --- a/.libaio.metadata +++ b/.libaio.metadata @@ -1 +1 @@ -f8f6ed15f22e528f6f415939b07854539e3360e4 SOURCES/libaio-0.3.110.tar.gz +bf91f82cc48528c672c752536d121e4a08f4c3e0 SOURCES/libaio-0.3.112.tar.gz diff --git a/SOURCES/libaio-install-to-destdir-slash-usr.patch b/SOURCES/libaio-install-to-destdir-slash-usr.patch deleted file mode 100644 index 914c958..0000000 --- a/SOURCES/libaio-install-to-destdir-slash-usr.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up libaio-0.3.110/src/Makefile.orig libaio-0.3.110/src/Makefile ---- libaio-0.3.110/src/Makefile.orig 2014-03-05 09:32:55.683632263 -0500 -+++ libaio-0.3.110/src/Makefile 2014-03-05 09:34:05.836297667 -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/SOURCES/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch b/SOURCES/libaio-remove-nostartfiles-nostdlib-from-build-flags.patch deleted file mode 100644 index d37f4ff..0000000 --- a/SOURCES/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.110/src/Makefile -+++ libaio-0.3.110/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/SPECS/libaio.spec b/SPECS/libaio.spec index bdff680..770efdd 100644 --- a/SPECS/libaio.spec +++ b/SPECS/libaio.spec @@ -1,13 +1,10 @@ Name: libaio -Version: 0.3.110 -Release: 12%{?dist} +Version: 0.3.112 +Release: 1%{?dist} Summary: Linux-native asynchronous I/O access library License: LGPLv2+ Group: System Environment/Libraries -Source: https://fedorahosted.org/releases/l/i/libaio/libaio-0.3.110.tar.gz - -Patch1: libaio-install-to-destdir-slash-usr.patch -Patch2: libaio-remove-nostartfiles-nostdlib-from-build-flags.patch +Source: https://releases.pagure.org/libaio/%{name}-%{version}.tar.gz %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -31,10 +28,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 @@ -54,8 +47,8 @@ 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} \ - includedir=%{_includedir} install +make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr libdir=/%{_libdir} \ + includedir=%{_includedir} find %{buildroot} -name '*.a' -exec rm -f {} ';' @@ -70,6 +63,11 @@ find %{buildroot} -name '*.a' -exec rm -f {} ';' %attr(0755,root,root) %{usrlibdir}/libaio.so %changelog +* Mon Jun 3 2019 Jeff Moyer - 0.3.112-1.el8 +- rebase to 0.3.112 + - main feature: async poll support +- Resolves: rhbz#1645556 + * Wed Sep 26 2018 Jeff Moyer - 0.3.110-12.el8 - Pass in the distro-provided CFLAGS and LFLAGS. (Jeff Moyer) - Get rid of -nostartfiles -nostdlib (Jeff Moyer)