Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/libverto.git#4ddc4ce3f40d763d56337ebf486921dc8481ca20
This commit is contained in:
DistroBaker 2021-01-22 20:26:54 +00:00
parent a73e8adbe3
commit 78893bf7f6
2 changed files with 47 additions and 22 deletions

View File

@ -0,0 +1,26 @@
From b6f0579cfd44a7e5b84b8239663a56f346acfc47 Mon Sep 17 00:00:00 2001
From: Robbie Harwood <rharwood@redhat.com>
Date: Fri, 1 Sep 2017 15:59:49 -0400
Subject: [PATCH] Work around libev not being c89-compliant
(cherry picked from commit c57599d7039d2435c306830b2edae999c462befb)
[rharwood@redhat.com: Remove travis files]
---
configure.ac | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure.ac b/configure.ac
index 09ee123..b7b5908 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,8 +7,8 @@ m4_ifdef([AC_USE_SYSTEM_EXTENSIONS],
[AC_USE_SYSTEM_EXTENSIONS],
[AC_GNU_SOURCE])
-AC_PROG_CC_C89
-for flag in -std=c89 -Wall -Wextra; do
+AC_PROG_CC_C99
+for flag in -Wall -Wextra; do
AC_TRY_COMPILE([], [return 0;], [CFLAGS="$CFLAGS $flag"],)
done

View File

@ -1,21 +1,24 @@
%global homepage https://github.com/latchset/libverto
Name: libverto
Version: 0.3.1
Release: 1%{?dist}
Release: 2%{?dist}
Summary: Main loop abstraction library
License: MIT
URL: https://github.com/latchset/libverto
Source0: %{url}/releases/download/%{version}/%{name}-%{version}.tar.gz
URL: %{homepage}
Source0: %{homepage}/releases/download/%{version}/%{name}-%{version}.tar.gz
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: glib2-devel
BuildRequires: libevent-devel
BuildRequires: libtool
BuildRequires: make
%if !0%{?rhel}
BuildRequires: glib2-devel
BuildRequires: libevent-devel
BuildRequires: libev-devel
%endif
BuildRequires: git
Obsoletes: libverto-tevent < 0.3.0-2
Obsoletes: libverto-tevent-devel < 0.3.0-2
@ -77,7 +80,6 @@ Requires: %{name}-devel%{?_isa} = %{version}-%{release}
The %{name}-libevent-devel package contains libraries and header files for
developing applications that use %{name}-libevent.
%if !0%{?rhel}
%package libev
Summary: libev module for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release}
@ -100,30 +102,29 @@ developing applications that use %{name}-libev.
This package provides %{name}-module-base since it supports io, timeout
and signal.
%endif
%prep
%autosetup -p1
%autosetup -S git
%build
autoreconf -fiv
%configure --disable-static
%{make_build}
%configure --disable-static --without-tevent
make %{?_smp_mflags}
%install
%{make_install}
find $RPM_BUILD_ROOT -name '*.la' -delete
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%ldconfig_scriptlets
%ldconfig_scriptlets glib
%ldconfig_scriptlets libevent
%if !0%{?rhel}
%ldconfig_scriptlets libev
%endif
%files
%{!?_licensedir:%global license %%doc}
%license COPYING
%doc AUTHORS NEWS README
%doc AUTHORS ChangeLog NEWS README
%{_libdir}/%{name}.so.*
%files devel
@ -148,7 +149,6 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_libdir}/%{name}-libevent.so
%{_libdir}/pkgconfig/%{name}-libevent.pc
%if !0%{?rhel}
%files libev
%{_libdir}/%{name}-libev.so.*
@ -156,12 +156,11 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
%{_includedir}/verto-libev.h
%{_libdir}/%{name}-libev.so
%{_libdir}/pkgconfig/%{name}-libev.pc
%endif
%changelog
* Sun Jan 17 2021 Peter Robinson <pbrobinson@fedoraproject.org> - 0.3.1-1
- Update to 0.3.1
- Spec file cleanups
* Fri Jan 22 2021 Robbie Harwood <rharwood@redhat.com> - 0.3.1-2
- New upstream version (0.3.1)
- Drop tevent goo and RHEL conditionals
* Tue Sep 15 2020 Robbie Harwood <rharwood@redhat.com> - 0.3.0-11
- Rebuild for libevent soname bump