Compare commits

...

No commits in common. "c9s" and "c8" have entirely different histories.
c9s ... c8

11 changed files with 17 additions and 175 deletions

View File

@ -1 +0,0 @@
1

5
.gitignore vendored
View File

@ -1,4 +1 @@
/libverto-0.2.6.tar.gz SOURCES/libverto-0.3.2.tar.gz
/libverto-0.3.0.tar.gz
/libverto-0.3.1.tar.gz
/libverto-0.3.2.tar.gz

1
.libverto.metadata Normal file
View File

@ -0,0 +1 @@
75faff55d9d1b06413612e6f2826fdd9adb73e33 SOURCES/libverto-0.3.2.tar.gz

View File

@ -2,29 +2,23 @@
Name: libverto Name: libverto
Version: 0.3.2 Version: 0.3.2
Release: 4%{?dist} Release: 2%{?dist}
Summary: Main loop abstraction library Summary: Main loop abstraction library
License: MIT License: MIT
URL: %{homepage} URL: %{homepage}
Source0: %{homepage}/releases/download/%{version}/%{name}-%{version}.tar.gz Source0: %{homepage}/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: %{name}-tests
%global common_dependencies() %{expand: BuildRequires: autoconf
%1: autoconf BuildRequires: automake
%1: automake BuildRequires: libtool
%1: libtool BuildRequires: make
%1: gcc
%1: make
%1: redhat-rpm-config
}
%{common_dependencies BuildRequires} BuildRequires: glib2-devel
BuildRequires: libevent-devel
BuildRequires: libev-devel
BuildRequires: git BuildRequires: git
BuildRequires: glib2-devel
BuildRequires: libevent-devel
BuildRequires: libev-devel
Obsoletes: libverto-tevent < 0.3.0-2 Obsoletes: libverto-tevent < 0.3.0-2
Obsoletes: libverto-tevent-devel < 0.3.0-2 Obsoletes: libverto-tevent-devel < 0.3.0-2
@ -109,20 +103,6 @@ developing applications that use %{name}-libev.
This package provides %{name}-module-base since it supports io, timeout This package provides %{name}-module-base since it supports io, timeout
and signal. and signal.
%package tests
Summary: Test sources for %{name} build
Requires: %{name}-devel%{?_isa} = %{version}-%{release}
Requires: %{name}-glib%{?_isa} = %{version}-%{release}
Requires: %{name}-libev%{?_isa} = %{version}-%{release}
Requires: %{name}-libevent%{?_isa} = %{version}-%{release}
%{common_dependencies Requires}
%description tests
FOR TESTING PURPOSE ONLY
Test sources for %{name} build, with pre-defined compilation parameters
%prep %prep
%autosetup -S git %autosetup -S git
@ -141,22 +121,6 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
%ldconfig_scriptlets libevent %ldconfig_scriptlets libevent
%ldconfig_scriptlets libev %ldconfig_scriptlets libev
# Generate tests launching script
sed -e 's|{{ name }}|%{name}|g' \
-e 's|{{ version }}|%{version}|g' \
-e 's|{{ release }}|%{release}|g' \
-e 's|{{ libdir }}|%{_libdir}|g' \
-e 's|{{ arch }}|%{_arch}|g' \
-i %{SOURCE1}
mkdir -p $RPM_BUILD_ROOT%{_libexecdir}
install -pm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_libexecdir}/%{name}-tests-%{_arch}
# Copy files from build folder to system data folder
make mostlyclean
rm -rf .git .gitignore src/.libs
install -pdm 755 $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}
cp -r * $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/
%files %files
%{!?_licensedir:%global license %%doc} %{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
@ -193,48 +157,14 @@ cp -r * $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/
%{_libdir}/%{name}-libev.so %{_libdir}/%{name}-libev.so
%{_libdir}/pkgconfig/%{name}-libev.pc %{_libdir}/pkgconfig/%{name}-libev.pc
%files tests
%{_libexecdir}/%{name}-tests-%{_arch}
%{_datarootdir}/%{name}-tests/%{_arch}
%changelog %changelog
* Fri Mar 21 2025 Julien Rische <jrische@redhat.com> - 0.3.2-4 * Wed Jun 29 2022 Julien Rische <jrische@redhat.com> - 0.3.2-1
- Add dedicated tests sub-package - New upstream release (0.3.2)
- Resolves: rhbz#2100916
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.2-3 * Wed Mar 20 2019 Robbie Harwood <rharwood@redhat.com> - 0.3.0-6
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Add gating
Related: rhbz#1991688 - Resolves: #1682288
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.3.2-2
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
* Mon Mar 15 2021 Robbie Harwood <rharwood@redhat.com> - 0.3.2-1
- New upstream version (0.3.2)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* 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
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.3.0-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Mon Feb 19 2018 Robbie Harwood <rharwood@redhat.com> - 0.3.0-5 * Mon Feb 19 2018 Robbie Harwood <rharwood@redhat.com> - 0.3.0-5
- Rebuild due to libevent soname bump - Rebuild due to libevent soname bump
@ -327,4 +257,3 @@ cp -r * $RPM_BUILD_ROOT%{_datarootdir}/%{name}-tests/%{_arch}/
* Mon Aug 15 2011 Nathaniel McCallum <npmccallum@redhat.com> - 0.1-1 * Mon Aug 15 2011 Nathaniel McCallum <npmccallum@redhat.com> - 0.1-1
- Initial release - Initial release

View File

@ -1,26 +0,0 @@
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,6 +0,0 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tests.functional}

View File

@ -1,29 +0,0 @@
#!/bin/sh -eux
export RPM_PACKAGE_NAME={{ name }}
export RPM_PACKAGE_VERSION={{ version }}
export RPM_PACKAGE_RELEASE={{ release }}
export RPM_ARCH={{ arch }}
export RPM_BUILD_NCPUS="$(getconf _NPROCESSORS_ONLN)"
testdir="$(mktemp -d)"
# Will remove the temporary test directory when the script terminates
# (even if stopped by an exit signal)
trap "rm -rf ${testdir}" EXIT
build_flags="$(eval "echo $(rpm --eval '%{_smp_mflags}')")"
mkdir "${testdir}/{{ name }}-tests"
cp -rp /usr/share/{{ name }}-tests/{{ arch }} "${testdir}/{{ name }}-tests/"
autoreconf -fiv "${testdir}/{{ name }}-tests/{{ arch }}"
mkdir -p "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs"
ln -s {{ libdir }}/libverto.so "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/"
ln -s {{ libdir }}/libverto.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/"
ln -s {{ libdir }}/libverto-glib.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/"
ln -s {{ libdir }}/libverto-libev.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/"
ln -s {{ libdir }}/libverto-libevent.so.1.0.0 "${testdir}/{{ name }}-tests/{{ arch }}/src/.libs/"
make -C "${testdir}/{{ name }}-tests/{{ arch }}/tests/" $build_flags check-TESTS

View File

@ -1,5 +0,0 @@
summary: Tests
discover:
how: fmf
execute:
how: tmt

View File

@ -1 +0,0 @@
SHA512 (libverto-0.3.2.tar.gz) = 342f20f83b8f674230fefba013505e1339dab0022e5e232c39d6763e4307088fa290b5a8e83f588e97142f5c4d190b1430288750e45f37a5fe4174d84ef85fc1

View File

@ -1,10 +0,0 @@
summary: Simple smoke test
contact: Anuja More <amore@redhat.com>
component:
- libverto
require:
- libverto-tests
test: ./runtest.sh
duration: 25m
enabled: true
extra-summary: tmt convert test

View File

@ -1,7 +0,0 @@
#!/bin/sh -eux
rc=0
for test_exec in /usr/libexec/libverto-tests-*
do
"$test_exec" || rc=1
done
exit $rc