diff --git a/.fmf/version b/.fmf/version new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/.fmf/version @@ -0,0 +1 @@ +1 diff --git a/.gitignore b/.gitignore index 2f03bfb..89f6d2c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,7 @@ clog /rabbitmq-c-0.9.0-77e3805.tar.gz /rabbitmq-c-0.10.0-ffe918a.tar.gz /rabbitmq-c-0.11.0-a64c08c.tar.gz +/rabbitmq-c-0.12.0-675afc2.tar.gz +/rabbitmq-c-0.13.0-974d71a.tar.gz +/rabbitmq-c-0.14.0-124722b.tar.gz +/rabbitmq-c-0.15.0-84b81cd.tar.gz diff --git a/librabbitmq.spec b/librabbitmq.spec index 692715f..deafdfa 100644 --- a/librabbitmq.spec +++ b/librabbitmq.spec @@ -1,7 +1,7 @@ # Fedora spec file for librabbitmq # -# Copyright (c) 2012-2021 Remi Collet -# License: CC-BY-SA +# Copyright (c) 2012-2024 Remi Collet +# License: CC-BY-SA-4.0 # http://creativecommons.org/licenses/by-sa/4.0/ # # Please, preserve the changelog entries @@ -9,7 +9,7 @@ %bcond_without tests -%global gh_commit a64c08c68aff34d49a2ac152f04988cd921084f9 +%global gh_commit 84b81cd97a1b5515d3d4b304796680da24c666d8 %global gh_short %(c=%{gh_commit}; echo ${c:0:7}) %global gh_owner alanxz %global gh_project rabbitmq-c @@ -18,23 +18,19 @@ Name: %{libname} Summary: Client library for AMQP -Version: 0.11.0 -Release: 6%{?dist} +Version: 0.15.0 +Release: 3%{?dist} License: MIT URL: https://github.com/alanxz/rabbitmq-c Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}-%{gh_short}.tar.gz -# don't install static library -Patch0: %{gh_project}-static.patch -# fix version for cmake module -Patch1: %{gh_project}-version.patch BuildRequires: gcc -BuildRequires: cmake > 2.8 -BuildRequires: openssl-devel +BuildRequires: cmake >= 3.22 +BuildRequires: openssl-devel >= 1.1.1 # For tools -BuildRequires: popt-devel > 1.14 +BuildRequires: popt-devel >= 1.14 # For man page BuildRequires: xmlto BuildRequires: make @@ -56,7 +52,7 @@ for %{name}. %package tools Summary: Example tools built using the librabbitmq package -Requires: %{name}%{?_isa} = %{version} +Requires: %{name}%{?_isa} = %{version}-%{release} %description tools This package contains example tools built using %{name}. @@ -71,8 +67,6 @@ amqp-publish Publish a message on an AMQP server %prep %setup -q -n %{gh_project}-%{gh_commit} -%patch0 -p1 -%patch1 -p1 # Copy sources to be included in -devel docs. cp -pr examples Examples @@ -84,11 +78,12 @@ sed -e '/test_basic/d' -i tests/CMakeLists.txt %build # static lib required for tests %cmake \ + -DBUILD_TOOLS:BOOL=ON \ -DBUILD_TOOLS_DOCS:BOOL=ON \ %if %{with tests} -DINSTALL_STATIC_LIBS:BOOL=OFF \ %else - -DBUILD_TESTS:BOOL=OFF \ + -DBUILD_TESTING:BOOL=OFF \ -DBUILD_STATIC_LIBS:BOOL=OFF \ %endif -S . @@ -111,9 +106,11 @@ make install DESTDIR="%{buildroot}" %check : check .pc is usable grep @ %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc && exit 1 +grep %{version} %{buildroot}%{_libdir}/pkgconfig/librabbitmq.pc || exit 1 : check cmake files are usable grep static %{buildroot}%{_libdir}/cmake/rabbitmq-c/*.cmake && exit 1 + %if %{with tests} : upstream tests %if 0%{?ctest:1} @@ -127,15 +124,17 @@ make test %files -%license LICENSE-MIT -%{_libdir}/%{libname}.so.%{soname}* +%license LICENSE +%{_libdir}/%{libname}.so.%{soname} +%{_libdir}/%{libname}.so.%{version} %files devel -%doc AUTHORS THANKS TODO *.md +%doc AUTHORS THANKS *.md %doc Examples %{_libdir}/%{libname}.so %{_includedir}/amqp* +%{_includedir}/rabbitmq-c %{_libdir}/pkgconfig/%{libname}.pc %{_libdir}/cmake/rabbitmq-c @@ -146,6 +145,49 @@ make test %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 0.15.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Mon Jan 20 2025 Fedora Release Engineering - 0.15.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Nov 21 2024 Remi Collet - 0.15.0-1 +- update to 0.15.0 + +* Thu Jul 18 2024 Fedora Release Engineering - 0.14.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Tue Mar 26 2024 Remi Collet - 0.14.0-2 +- update to 0.14.0 +- drop upstream patch +- fix rpminspect rpmdeps + +* Thu Jan 25 2024 Fedora Release Engineering - 0.13.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sun Jan 21 2024 Fedora Release Engineering - 0.13.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 0.13.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jun 29 2023 Than Ngo - 0.13.0-2 +- fix security issue, CVE-2023-35789 + +* Mon Feb 6 2023 Remi Collet - 0.13.0-1 +- update to 0.13.0 +- drop patches merged upstream + +* Wed Feb 1 2023 Remi Collet - 0.12.0-1 +- update to 0.12.0 +- add patch to not install the static library, from + https://github.com/alanxz/rabbitmq-c/pull/749 +- add patch to fix version in pkgconfig file, from + https://github.com/alanxz/rabbitmq-c/pull/751 + +* Thu Jan 19 2023 Fedora Release Engineering - 0.11.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 0.11.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild diff --git a/rabbitmq-c-static.patch b/rabbitmq-c-static.patch deleted file mode 100644 index 0315347..0000000 --- a/rabbitmq-c-static.patch +++ /dev/null @@ -1,41 +0,0 @@ -From a8c05cb16afbf852fc584f2c2d31d2f7f0e3a48d Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 1 Apr 2021 11:21:36 +0200 -Subject: [PATCH] add option to install or not the static library - ---- - CMakeLists.txt | 1 + - librabbitmq/CMakeLists.txt | 8 +++++--- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9a29fdd..a7cf8f2c 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -245,6 +245,7 @@ endif() - - option(BUILD_SHARED_LIBS "Build rabbitmq-c as a shared library" ON) - option(BUILD_STATIC_LIBS "Build rabbitmq-c as a static library" ON) -+option(INSTALL_STATIC_LIBS "Install rabbitmq-c static library" ON) - - option(BUILD_EXAMPLES "Build Examples" ON) - option(BUILD_TOOLS "Build Tools (requires POPT Library)" ${POPT_FOUND}) -diff --git a/librabbitmq/CMakeLists.txt b/librabbitmq/CMakeLists.txt -index d8dcd262..72b4a875 100644 ---- a/librabbitmq/CMakeLists.txt -+++ b/librabbitmq/CMakeLists.txt -@@ -154,9 +154,11 @@ if (BUILD_STATIC_LIBS) - set_target_properties(rabbitmq-static PROPERTIES VERSION ${RMQ_VERSION} SOVERSION ${RMQ_SOVERSION} OUTPUT_NAME rabbitmq) - endif (WIN32) - -- install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -- ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -- ) -+ if (INSTALL_STATIC_LIBS) -+ install(TARGETS rabbitmq-static EXPORT "${targets_export_name}" -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ) -+ endif (INSTALL_STATIC_LIBS) - - if (NOT DEFINED RMQ_LIBRARY_TARGET) - set(RMQ_LIBRARY_TARGET rabbitmq-static) diff --git a/rabbitmq-c-version.patch b/rabbitmq-c-version.patch deleted file mode 100644 index 9826170..0000000 --- a/rabbitmq-c-version.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 2a9ae303f7fa7bc115ecb827c1c3c7c9f84558dd Mon Sep 17 00:00:00 2001 -From: Remi Collet -Date: Thu, 1 Apr 2021 14:48:25 +0200 -Subject: [PATCH] Fix #666 bad PACKAGE_VERSION - ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a9a29fd..74364cf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -322,7 +322,7 @@ set(version_config "${CMAKE_CURRENT_BINARY_DIR}/rabbitmq-c-config-version.cmake" - - write_basic_package_version_file( - "${version_config}" -- VERSION ${RMQ_VERSION} -+ VERSION ${VERSION} - COMPATIBILITY AnyNewerVersion) - - configure_package_config_file( --- -2.30.2 - diff --git a/sources b/sources index d54ea82..0b05ed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (rabbitmq-c-0.11.0-a64c08c.tar.gz) = 0e0c77c3ce2de49841b4d2a8745bfdb118fc3bdf924c1f60d8ca168d7a933276f5d86e1d1440c2936859e6a6bddeb77eaa3c59f5f20e998160dde7d57cea4282 +SHA512 (rabbitmq-c-0.15.0-84b81cd.tar.gz) = a3a1e4ac5f9126a905de7f15b0580a3562c626891aa634dd72e96264da1b87107f82ba6b865ba178d228e025c4a1df370c648d30a13d1422710b74b7ba38cbea diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf b/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf new file mode 100644 index 0000000..a7116fe --- /dev/null +++ b/tests/Sanity/Sanity-test-for-librabbitmq/main.fmf @@ -0,0 +1,14 @@ +summary: tests basic functionality +description: '' +contact: Than Ngo +component: + - librabbitmq +test: ./runtest.sh +framework: beakerlib +recommend: + - librabbitmq + - librabbitmq-devel + - objdump +duration: 5m +extra-summary: /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq +extra-task: /CoreOS/librabbitmq/Sanity/Sanity-test-for-librabbitmq diff --git a/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh index 76ed9f6..43816cb 100755 --- a/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh +++ b/tests/Sanity/Sanity-test-for-librabbitmq/runtest.sh @@ -29,7 +29,6 @@ PACKAGES="librabbitmq librabbitmq-devel" # source the test script helpers -. /usr/bin/rhts-environment.sh || exit 1 . /usr/share/beakerlib/beakerlib.sh || exit 1 rlJournalStart @@ -47,7 +46,7 @@ rlJournalStart rlRun "objdump -T $o" 0 "validate the shared objects" done rlRun "head /usr/share/doc/librabbitmq-devel/README.md" 0 "correct form for doc file" - rlRun "head /usr/share/licenses/librabbitmq/LICENSE-MIT" 0 "correct form for doc file" + rlRun "head /usr/share/licenses/librabbitmq/LICENSE" 0 "correct form for doc file" rlPhaseEnd rlPhaseStartCleanup diff --git a/tests/tests.yml b/tests/tests.yml deleted file mode 100644 index 96c2b94..0000000 --- a/tests/tests.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -# Run tests in all contexts -- hosts: localhost - tags: - - classic - roles: - - role: standard-test-beakerlib - tests: - - Sanity - required_packages: - - librabbitmq