From e595baac1902f3cd6da54c0a50fe0e4e5fc0a6ed Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Mon, 8 Sep 2014 11:48:35 +0200 Subject: [PATCH] Update to 4.18 While I'm at it, start using %license as well. --- .gitignore | 1 + ...libev-4.18-Modernize-the-configure.ac.patch | 18 ++++++++---------- ...ev-4.18-Respect-the-CFLAGS-if-defined.patch | 16 +++++++--------- libev.spec | 14 +++++++++----- sources | 2 +- 5 files changed, 26 insertions(+), 25 deletions(-) rename libev-4.15-Modernize-the-configure.ac.patch => libev-4.18-Modernize-the-configure.ac.patch (57%) rename libev-4.15-Respect-the-CFLAGS-if-defined.patch => libev-4.18-Respect-the-CFLAGS-if-defined.patch (58%) diff --git a/.gitignore b/.gitignore index cf3ca58..301a801 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ libev-3.9.tar.gz /libev-4.04.tar.gz /libev-4.11.tar.gz /libev-4.15.tar.gz +/libev-4.18.tar.gz diff --git a/libev-4.15-Modernize-the-configure.ac.patch b/libev-4.18-Modernize-the-configure.ac.patch similarity index 57% rename from libev-4.15-Modernize-the-configure.ac.patch rename to libev-4.18-Modernize-the-configure.ac.patch index b6e9cc8..de9eb92 100644 --- a/libev-4.15-Modernize-the-configure.ac.patch +++ b/libev-4.18-Modernize-the-configure.ac.patch @@ -1,35 +1,33 @@ -From c681304443714aabf4ede3682074dd95a6ee6a5c Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 8 Sep 2013 09:39:25 +0400 -Subject: [PATCH 2/3] Modernize the configure.ac +From 7100cc6ca79ba4c2ede57142e159d2127040baba Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Mon, 8 Sep 2014 11:34:50 +0200 +Subject: [PATCH] Modernize the configure.ac Without it, Automake 1.13 and above will refuse it. See the details for AM_INIT_AUTOMAKE at: http://www.gnu.org/software/automake/manual/automake.html#Public-Macros - -Signed-off-by: Igor Gnatenko --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index f0c6d2b..aa83142 100644 +index a35d1c1..6c07ae3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,10 +1,10 @@ -AC_INIT -+AC_INIT([libev], [4.15]) ++AC_INIT([libev], [4.18]) orig_CFLAGS="$CFLAGS" AC_CONFIG_SRCDIR([ev_epoll.c]) --AM_INIT_AUTOMAKE(libev,4.15) dnl also update ev.h! +-AM_INIT_AUTOMAKE(libev,4.18) dnl also update ev.h! +AM_INIT_AUTOMAKE AC_CONFIG_HEADERS([config.h]) AM_MAINTAINER_MODE -- -1.8.3.1 +2.1.0 diff --git a/libev-4.15-Respect-the-CFLAGS-if-defined.patch b/libev-4.18-Respect-the-CFLAGS-if-defined.patch similarity index 58% rename from libev-4.15-Respect-the-CFLAGS-if-defined.patch rename to libev-4.18-Respect-the-CFLAGS-if-defined.patch index 7ec368e..e1572b6 100644 --- a/libev-4.15-Respect-the-CFLAGS-if-defined.patch +++ b/libev-4.18-Respect-the-CFLAGS-if-defined.patch @@ -1,21 +1,19 @@ -From 288dcead638c2c5597c6ce150d16bd5de6e1ff85 Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 8 Sep 2013 09:40:30 +0400 -Subject: [PATCH 3/3] Respect the CFLAGS if defined +From 89ae305e74de5a1ba8af59fdcae2a8f2f6ca8a79 Mon Sep 17 00:00:00 2001 +From: Mathieu Bridon +Date: Mon, 8 Sep 2014 11:36:07 +0200 +Subject: [PATCH] Respect the CFLAGS if defined https://bugzilla.redhat.com/show_bug.cgi?id=908096 - -Signed-off-by: Igor Gnatenko --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index aa83142..3a8164b 100644 +index 6c07ae3..dfd6db8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,13 +1,13 @@ - AC_INIT([libev], [4.15]) + AC_INIT([libev], [4.18]) -orig_CFLAGS="$CFLAGS" - @@ -31,5 +29,5 @@ index aa83142..3a8164b 100644 dnl Supply default CFLAGS, if not specified -- -1.8.3.1 +2.1.0 diff --git a/libev.spec b/libev.spec index dda57c9..4236cd8 100644 --- a/libev.spec +++ b/libev.spec @@ -3,16 +3,16 @@ Name: libev Summary: High-performance event loop/event model with lots of features -Version: 4.15 -Release: 5%{?dist} +Version: 4.18 +Release: 1%{?dist} License: BSD or GPLv2+ URL: http://software.schmorp.de/pkg/libev.html Source0: http://dist.schmorp.de/libev/Attic/%{name}-%{version}.tar.gz BuildRequires: autoconf automake libtool -Patch0: libev-4.15-Modernize-the-configure.ac.patch -Patch1: libev-4.15-Respect-the-CFLAGS-if-defined.patch +Patch0: libev-4.18-Modernize-the-configure.ac.patch +Patch1: libev-4.18-Respect-the-CFLAGS-if-defined.patch %description Libev is modeled (very loosely) after libevent and the Event Perl @@ -85,7 +85,8 @@ install -p -m 0644 Changes ev.pod LICENSE README %{inst_srcdir} %files -%doc Changes LICENSE README +%license LICENSE +%doc Changes README %{_libdir}/%{name}.so.4 %{_libdir}/%{name}.so.4.0.0 @@ -103,6 +104,9 @@ install -p -m 0644 Changes ev.pod LICENSE README %{inst_srcdir} %changelog +* Mon Sep 08 2014 Mathieu Bridon - 4.18-1 +- Update to 4.18. + * Sun Aug 17 2014 Fedora Release Engineering - 4.15-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index 19081b3..a808366 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3a73f247e790e2590c01f3492136ed31 libev-4.15.tar.gz +e7baceb8e2a74cb29deb1e39d1fcf966 libev-4.18.tar.gz