From f672eb728ee8104de4f556f18059ca285c2a75c9 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Fri, 26 Jun 2020 11:15:46 +0200 Subject: [PATCH 01/34] new version 4.1.5 --- .gitignore | 1 + sources | 2 +- zeromq-ada-autoinit_fix.patch | 20 ----------------- zeromq-ada-fedora.patch | 31 +++++++++++++++++++++----- zeromq-ada-libdir.patch | 41 +++++++++++++++-------------------- zeromq-ada-nogpr.patch | 41 ----------------------------------- zeromq-ada.spec | 37 ++++++++++++++++--------------- 7 files changed, 66 insertions(+), 107 deletions(-) delete mode 100644 zeromq-ada-autoinit_fix.patch delete mode 100644 zeromq-ada-nogpr.patch diff --git a/.gitignore b/.gitignore index 86a5686..06c843b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /zeromq-ada-4.24032011git.tar.gz /zeromq-ada-24032011git.tar.gz +/zeromq-ada.tar.gz diff --git a/sources b/sources index fe8d94c..ae4c73a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8639a6c26094b7e2b6389c93b9263be0 zeromq-ada-24032011git.tar.gz +SHA512 (zeromq-ada.tar.gz) = b2a857f77a0d3173b0b57978c2525c99c577512bd80928c8443f8f11a00193c6c0a7301a9c4ee9199338a616c40860917b5194e79f42c90f4bd838cde3ff2222 diff --git a/zeromq-ada-autoinit_fix.patch b/zeromq-ada-autoinit_fix.patch deleted file mode 100644 index e5351a7..0000000 --- a/zeromq-ada-autoinit_fix.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/zmq.gpr.inst b/zmq.gpr.inst -index 3988421..61e3c44 100644 ---- a/zmq.gpr.inst -+++ b/zmq.gpr.inst -@@ -12,6 +12,15 @@ project Zmq is - case ZMQ_Kind is - when "relocatable" => - for Library_Kind use "dynamic"; -+ for Library_Auto_Init use "True"; -+ for Library_Interface use ("ZMQ", -+ "ZMQ.contexts", -+ "ZMQ.devices", -+ "ZMQ.messages", -+ "ZMQ.sockets", -+ "ZMQ.low_level", -+ "ZMQ.Utilities", -+ "ZMQ.Utilities.Memory_Streams"); - end case; - - end Zmq; diff --git a/zeromq-ada-fedora.patch b/zeromq-ada-fedora.patch index 58931c0..2f03768 100644 --- a/zeromq-ada-fedora.patch +++ b/zeromq-ada-fedora.patch @@ -1,16 +1,26 @@ ---- a/zmq.gpr.inst 2011-03-24 11:32:40.517715004 +0300 -+++ b/zmq.gpr.inst 2011-03-24 11:34:56.185715007 +0300 -@@ -1,16 +1,15 @@ +diff --git a/zmq.gpr.inst b/zmq.gpr.inst +index 748cab2..1667469 100644 +--- a/zmq.gpr.inst ++++ b/zmq.gpr.inst +@@ -29,22 +29,21 @@ + -- covered by the GNU Public License. -- + -- -- + ------------------------------------------------------------------------------ +-with "libzmq.gpr"; +with "directories"; - project Zmq is - for Languages use ("Ada"); ++ + project ZMQ is +- For Languages use ("Ada", "Makefile", "Python"); ++ For Languages use ("Ada"); - type ZMQ_Kind_Type is ("static", "relocatable"); - ZMQ_Kind : ZMQ_Kind_Type := external ("LIBRARY_TYPE", "static"); + type ZMQ_Kind_Type is ("relocatable"); + ZMQ_Kind : ZMQ_Kind_Type := external ("LIBRARY_TYPE", "relocatable"); + Version := "4.0.1"; for Library_Name use "zmqAda"; + for Library_Version use "lib" & project'Library_Name & ".so." & Version; - for Library_Dir use "../zmq/" & ZMQ_Kind; - for Source_Dirs use ("../../include/zmq"); + for Library_Dir use Directories.Libdir & "/zmq/" & ZMQ_Kind; @@ -21,4 +31,15 @@ - for Library_Kind use "static"; when "relocatable" => for Library_Kind use "dynamic"; + for Library_Auto_Init use "True"; +@@ -57,5 +56,10 @@ project ZMQ is + "ZMQ.Utilities", + "ZMQ.Utilities.Memory_Streams"); end case; ++ ++ package Linker is ++ for Linker_Options use ("-lzmq", "-lsodium"); ++ end Linker; ++ + end ZMQ; + diff --git a/zeromq-ada-libdir.patch b/zeromq-ada-libdir.patch index a8d6ac3..264be6c 100644 --- a/zeromq-ada-libdir.patch +++ b/zeromq-ada-libdir.patch @@ -1,33 +1,28 @@ ---- a/Makefile 2011-02-26 19:34:31.335034992 +0300 -+++ b/Makefile 2011-02-26 19:34:39.443035001 +0300 -@@ -8,7 +8,6 @@ - ADA_PROJECT_DIR ?= ${PREFIX}/lib/gnat - GNATMAKE = gnatmake ${GNATFLAGS} -p -f -R +diff --git a/Makefile b/Makefile +index 7c75354..0e76efb 100644 +--- a/Makefile ++++ b/Makefile +@@ -31,7 +31,6 @@ Makefile.config: configure + GNATMAKE = gprbuild ${GNATFLAGS} -p -f -R + compile: - ${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=static - ${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=relocatable + ${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=relocatable uninstall: ---- a/Makefile 2011-04-29 10:13:33.387320003 +0400 -+++ b/Makefile 2011-04-29 10:16:21.389320017 +0400 -@@ -29,6 +29,7 @@ +@@ -46,6 +45,7 @@ install: compile uninstall + + cp -f src/zmq.ad* ${DESTDIR}/${PREFIX}/include/zmq + cp -f src/zmq-*.ad* ${DESTDIR}/${PREFIX}/include/zmq ++ cp -f src/gen/* ${DESTDIR}/${PREFIX}/include/zmq + chmod -w ${DESTDIR}/${PREFIX}/include/zmq/*.ad? + # (cd ${DESTDIR}/${PREFIX}/lib; for i in `find -name lib*.so*`; do ln -s $$i ; done)s + cp zmq.gpr.inst ${DESTDIR}/${ADA_PROJECT_DIR}/zmq.gpr +@@ -53,6 +53,7 @@ install: compile uninstall mkdir -p ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada cp examples/zmq-examples*.ad* ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada cp examples/zmq-examples.gpr.inst ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada/zmq-examples.gpr + cd ${DESTDIR}/${LIBDIR}/ && ln -s zmq/relocatable/libzmqAda.so* . - all: compile install samples: - - -## Usr move ---- a/Makefile 2012-09-23 20:15:19.594222947 +0400 -+++ b/Makefile 2012-09-23 20:15:33.392222537 +0400 -@@ -1,6 +1,6 @@ - - ifndef PREFIX -- PREFIX=$(dir $(shell dirname `which gnatls`)) -+ PREFIX=/usr - endif - LIBDIR ?= ${PREFIX}/lib - DESTDIR ?= + ${GNATMAKE} -P examples/zmq-examples.gpr diff --git a/zeromq-ada-nogpr.patch b/zeromq-ada-nogpr.patch deleted file mode 100644 index b012c5c..0000000 --- a/zeromq-ada-nogpr.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff --git a/zmq.gpr b/zmq.gpr -index 4c4eebd..9337f21 100644 ---- a/zmq.gpr -+++ b/zmq.gpr -@@ -59,12 +59,7 @@ project ZMQ is - - "zmq-utilities.ads", - "zmq-utilities-memory_streams.adb", -- "zmq-utilities-memory_streams.ads", -- -- -- "Makefile", -- -- "README", -- -- "zmq.gpr.inst", -- "zmq.gpr" -+ "zmq-utilities-memory_streams.ads" - ); - case ZMQ_Kind is - when "static" => - -diff --git a/zmq.gpr b/zmq.gpr -index 9337f21..a3d92d4 100644 ---- a/zmq.gpr -+++ b/zmq.gpr -@@ -85,17 +85,10 @@ project ZMQ is - Compiler'Default_Switches ("ada") & ("-gnaty-M"); -- Since this file is autogenerated. - end Compiler; - -- package Naming is -- for Body_Suffix("Project File") use ".gpr"; -- end naming; - package Make is - for Makefile use project'Project_dir & "Makefile"; - end Make; - ---- package Check is ---- for Default_Switches ("ada") use ("-rules", "-from=" & Project'Project_Dir & "/zmq.rules"); ---- end Check; -- - package Ide is - for Vcs_Kind use "git"; - end Ide; diff --git a/zeromq-ada.spec b/zeromq-ada.spec index bab363f..0d7afb1 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -1,24 +1,23 @@ %define debug_package %{nil} +%global git_commit fca30bb86f41e24d878c32ce399500f195513400 +%global git_date 20200330 + +%global git_short_commit %(echo %{git_commit} | cut -c -8) +%global git_suffix %{git_date}git%{git_short_commit} Name: zeromq-ada -Version: 2.1.0 -Release: 30.24032011git%{?dist} +Version: 4.1.5 +Release: 1.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org -## Source from github. for get source use -## git clone https://landgraf@github.com/landgraf/zeromq-Ada.git -## tar -czvf zeromq-ada-2.24032011.tar.gz zeromq-Ada -Source0: %{name}-24032011git.tar.gz +Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-%{version}.tar.gz ## Use shared libs instead static Patch0: %{name}-libdir.patch ## Use directories.gpr Patch1: %{name}-fedora.patch -## https://github.com/persan/zeromq-Ada/issues/10 -Patch2: %{name}-autoinit_fix.patch -Patch3: %{name}-nogpr.patch BuildRequires: fedora-gnat-project-common >= 2 zeromq-devel >= 2.1 -BuildRequires: chrpath gcc-gnat gprbuild +BuildRequires: chrpath gcc-gnat gprbuild Requires: zeromq >= 2.1 # gcc-gnat only available on these: ExclusiveArch: %{GPRbuild_arches} @@ -31,25 +30,26 @@ Summary: Devel package for Ada binding for zeromq License: GPLv2+ Requires: fedora-gnat-project-common >= 2 Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: zeromq >= 2.1 +Requires: zeromq-devel >= 2.1 %description devel %{summary} %prep -%setup -q -n zeromq-Ada +%setup -q -n zeromq-Ada-%{git_commit} %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%patch3 -p1 +touch Makefile.config +cp -v libsodium.gpr.in libsodium.gpr +cp -v libzmq.gpr.in libzmq.gpr %build -make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" GNATMAKE="gprbuild -p -R %{GNAT_optflags}" +make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" GNATMAKE="gprbuild -p -R %{GNAT_optflags}" PREFIX=/usr ## for tests aunit needed %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_DIR=%{_GNAT_project_dir} GNATFLAGS="%{GNAT_optflags}" +make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_DIR=%{_GNAT_project_dir} GNATFLAGS="%{GNAT_optflags}" PREFIX=/usr rm -f %{buildroot}/%{_libdir}/zmq/static/libzmqAda.a rm -rf %{buildroot}/%{_libdir}/zmq/static chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} @@ -57,7 +57,7 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %ldconfig_scriptlets %files -%doc README COPYING +%doc README.md COPYING %dir %{_libdir}/zmq %dir %{_libdir}/zmq/relocatable %{_libdir}/zmq/relocatable/libzmqAda.so.%{version} @@ -75,6 +75,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Wed Jun 17 2020 Max Reznik - 4.1.5-1.git +- Update to 4.1.5 + * Fri Jan 31 2020 Fedora Release Engineering - 2.1.0-30.24032011git - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 62cd5a89206bee074c6616e7c9541e54ddf87d5e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 15:22:01 +0000 Subject: [PATCH 02/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 0d7afb1..817fcc4 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 1.git%{?dist} +Release: 2.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -75,6 +75,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 4.1.5-2.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jun 17 2020 Max Reznik - 4.1.5-1.git - Update to 4.1.5 From 8a793aa2ee2beba8f1fd1e56fe7fd6f2b5f0fef4 Mon Sep 17 00:00:00 2001 From: Pavel Zhukov Date: Wed, 9 Dec 2020 12:23:24 +0100 Subject: [PATCH 03/34] Rebuild with new lignat --- .gitignore | 1 + sources | 2 +- zeromq-ada.spec | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 06c843b..8c7bbd5 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /zeromq-ada-4.24032011git.tar.gz /zeromq-ada-24032011git.tar.gz /zeromq-ada.tar.gz +/zeromq-ada-4.1.5.tar.gz diff --git a/sources b/sources index ae4c73a..6195a24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeromq-ada.tar.gz) = b2a857f77a0d3173b0b57978c2525c99c577512bd80928c8443f8f11a00193c6c0a7301a9c4ee9199338a616c40860917b5194e79f42c90f4bd838cde3ff2222 +SHA512 (zeromq-ada-4.1.5.tar.gz) = c18fa9537eceda1a747890b671d6a0704ce24afe19087f410b40e082a20b4357c0ac3d8ef3ff3a004cc2591b98fb38ddfe6b69838dda914e582d09ad1fb912f0 diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 817fcc4..808c612 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 2.git%{?dist} +Release: 3.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -75,6 +75,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Wed Dec 9 2020 Pavel Zhukov - 4.1.5-3.git +- Rebuild with new libgnat + * Wed Jul 29 2020 Fedora Release Engineering - 4.1.5-2.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 4957293174025d5bfac0a63dd07ebaa5d0f64e3d Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Sat, 9 Jan 2021 01:52:19 +0000 Subject: [PATCH 04/34] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- zeromq-ada.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 808c612..1424105 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -16,6 +16,7 @@ Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-% Patch0: %{name}-libdir.patch ## Use directories.gpr Patch1: %{name}-fedora.patch +BuildRequires: make BuildRequires: fedora-gnat-project-common >= 2 zeromq-devel >= 2.1 BuildRequires: chrpath gcc-gnat gprbuild Requires: zeromq >= 2.1 From b476be44148abab17325f5d61adc70b447a50324 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:41:00 +0000 Subject: [PATCH 05/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 1424105..34df63c 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 3.git%{?dist} +Release: 4.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 4.1.5-4.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Dec 9 2020 Pavel Zhukov - 4.1.5-3.git - Rebuild with new libgnat From 409038b5bb61af51dc1f4ae8d3cbe2a5bc05e8c4 Mon Sep 17 00:00:00 2001 From: Max Reznik Date: Fri, 21 May 2021 16:27:27 +0000 Subject: [PATCH 06/34] rebuilt with gcc-11.1.1-1 --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 34df63c..32283ef 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 4.git%{?dist} +Release: 5.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Fri May 21 2021 Max Reznik - 4.1.5-5.git +- rebuilt with gcc-11.1.1-1 + * Thu Jan 28 2021 Fedora Release Engineering - 4.1.5-4.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a1fc9350c81c230515a16d82e945c8276dfd3cc9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 22:16:48 +0000 Subject: [PATCH 07/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 32283ef..7ae40f3 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 5.git%{?dist} +Release: 6.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 4.1.5-6.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Max Reznik - 4.1.5-5.git - rebuilt with gcc-11.1.1-1 From c7792bc6714cc5cab469f98c167cb64a24fd19ad Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:50:25 +0000 Subject: [PATCH 08/34] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 7ae40f3..1b10785 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 6.git%{?dist} +Release: 7.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 4.1.5-7.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Fri Jul 23 2021 Fedora Release Engineering - 4.1.5-6.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 7963c621d3910688a82b8b075c55124d47f493f8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:54:03 +0000 Subject: [PATCH 09/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 1b10785..267becd 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 7.git%{?dist} +Release: 8.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 4.1.5-8.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Sat Jan 22 2022 Fedora Release Engineering - 4.1.5-7.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 00a4cf445736d4361b18453550b1a1f1f17e13c7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 08:14:38 +0000 Subject: [PATCH 10/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 267becd..965d430 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 8.git%{?dist} +Release: 9.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 4.1.5-9.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Sat Jul 23 2022 Fedora Release Engineering - 4.1.5-8.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 68fbd14d68a1beb639b48990361f979dcf4fc464 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:40:15 +0000 Subject: [PATCH 11/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 965d430..84224bd 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 9.git%{?dist} +Release: 10.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 4.1.5-10.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Sat Jan 21 2023 Fedora Release Engineering - 4.1.5-9.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From f405eb69f7f51c346be9c19f3b2f2c90b511b867 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Thu, 5 Oct 2023 10:08:23 +0200 Subject: [PATCH 12/34] rebuild for new libsodium --- zeromq-ada.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 84224bd..13cf457 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 10.git%{?dist} +Release: 11.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -37,8 +37,8 @@ Requires: zeromq-devel >= 2.1 %{summary} %prep %setup -q -n zeromq-Ada-%{git_commit} -%patch0 -p1 -%patch1 -p1 +%patch -P0 -p1 +%patch -P1 -p1 touch Makefile.config cp -v libsodium.gpr.in libsodium.gpr cp -v libzmq.gpr.in libzmq.gpr @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Thu Oct 05 2023 Remi Collet - 4.1.5-11.git +- rebuild for new libsodium + * Sat Jul 22 2023 Fedora Release Engineering - 4.1.5-10.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From e42b569b056ada1280dd3a555d7ec737abd4bded Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 11:04:54 +0000 Subject: [PATCH 13/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 13cf457..8520f83 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 11.git%{?dist} +Release: 12.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 4.1.5-12.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Thu Oct 05 2023 Remi Collet - 4.1.5-11.git - rebuild for new libsodium From b2f13080926bf445ccbffe748da200ef20deca20 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:50:59 +0000 Subject: [PATCH 14/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 8520f83..b11b5c1 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 12.git%{?dist} +Release: 13.git%{?dist} Summary: Ada binding for zeromq License: GPLv2+ URL: http://zeromq.org @@ -76,6 +76,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 4.1.5-13.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Sat Jan 27 2024 Fedora Release Engineering - 4.1.5-12.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From cb4a0c1f79949abcfb12532954a243b7f5adc6f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Fri, 26 Jul 2024 04:04:21 +0200 Subject: [PATCH 15/34] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- zeromq-ada.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index b11b5c1..7d954fe 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,9 +7,10 @@ Name: zeromq-ada Version: 4.1.5 -Release: 13.git%{?dist} +Release: 14.git%{?dist} Summary: Ada binding for zeromq -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: http://zeromq.org Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-%{version}.tar.gz ## Use shared libs instead static @@ -28,7 +29,8 @@ Ada bindings for zeromq %package devel Summary: Devel package for Ada binding for zeromq -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later Requires: fedora-gnat-project-common >= 2 Requires: %{name}%{?_isa} = %{version}-%{release} Requires: zeromq-devel >= 2.1 @@ -76,6 +78,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Fri Jul 26 2024 Miroslav Suchý - 4.1.5-14.git +- convert license to SPDX + * Sat Jul 20 2024 Fedora Release Engineering - 4.1.5-13.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 219a9b4634c86da609f0a997770d57427395ff23 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:44:47 +0000 Subject: [PATCH 16/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 7d954fe..334611c 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 14.git%{?dist} +Release: 15.git%{?dist} Summary: Ada binding for zeromq # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -78,6 +78,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 4.1.5-15.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Fri Jul 26 2024 Miroslav Suchý - 4.1.5-14.git - convert license to SPDX From 2d047f5e45983e369f3c8bf4f1ba480643f9d188 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 21:17:41 +0000 Subject: [PATCH 17/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 334611c..8b5faca 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -7,7 +7,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 15.git%{?dist} +Release: 16.git%{?dist} Summary: Ada binding for zeromq # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -78,6 +78,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sun Jan 19 2025 Fedora Release Engineering - 4.1.5-15.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 982f6dd3e4a51bbcc9ee985cf8024990c8fd00e8 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:06:01 +0200 Subject: [PATCH 18/34] Remove debug package creation opt-out --- zeromq-ada.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 8b5faca..6337071 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -1,4 +1,3 @@ -%define debug_package %{nil} %global git_commit fca30bb86f41e24d878c32ce399500f195513400 %global git_date 20200330 @@ -7,7 +6,7 @@ Name: zeromq-ada Version: 4.1.5 -Release: 16.git%{?dist} +Release: 17.git%{?dist} Summary: Ada binding for zeromq # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later @@ -78,6 +77,9 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %{_datadir}/zmq/* %changelog +* Fri Jan 09 2026 Dennis van Raaij - 4.1.5-17.git +- Removed debug package creation opt-out. + * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild @@ -173,7 +175,7 @@ chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} - Use GNAT_arches rather than an explicit list * Sun Apr 20 2014 Pavel Zhukov - 2.1.0-13.24032011git -- Rebuild with new GCC +- Rebuild with new GCC * Sun Mar 02 2014 Pavel Zhukov - 2.1.0-12.24032011git - Fix library finalization. https://github.com/persan/zeromq-Ada/issues/10 From 24275de9b9d368993278a0dd40ac3b6a52bc2eb8 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:08:30 +0200 Subject: [PATCH 19/34] Remove useless %ldconfig_scriptlets --- zeromq-ada.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 6337071..b4f767a 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -56,7 +56,6 @@ rm -f %{buildroot}/%{_libdir}/zmq/static/libzmqAda.a rm -rf %{buildroot}/%{_libdir}/zmq/static chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} -%ldconfig_scriptlets %files %doc README.md COPYING From 42040bac4ae7d446996eb5104fa0c808a6455f36 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:21:56 +0200 Subject: [PATCH 20/34] Remove unnecessary use of chrpath --- zeromq-ada.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index b4f767a..87a41d0 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -16,9 +16,10 @@ Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-% Patch0: %{name}-libdir.patch ## Use directories.gpr Patch1: %{name}-fedora.patch + +BuildRequires: gcc-gnat gprbuild BuildRequires: make BuildRequires: fedora-gnat-project-common >= 2 zeromq-devel >= 2.1 -BuildRequires: chrpath gcc-gnat gprbuild Requires: zeromq >= 2.1 # gcc-gnat only available on these: ExclusiveArch: %{GPRbuild_arches} @@ -54,7 +55,6 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_DIR=%{_GNAT_project_dir} GNATFLAGS="%{GNAT_optflags}" PREFIX=/usr rm -f %{buildroot}/%{_libdir}/zmq/static/libzmqAda.a rm -rf %{buildroot}/%{_libdir}/zmq/static -chrpath --delete %{buildroot}%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} %files From 21cad67a8dd35c5c319b4992e213c17d659195f4 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 23:27:53 +0200 Subject: [PATCH 21/34] Update the URL --- zeromq-ada.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 87a41d0..bbdc9ed 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -10,7 +10,7 @@ Release: 17.git%{?dist} Summary: Ada binding for zeromq # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: http://zeromq.org +URL: https://zeromq.org Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-%{version}.tar.gz ## Use shared libs instead static Patch0: %{name}-libdir.patch From 1729460926aae6ebba88efdba1564bae77df9c0b Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:27:53 +0200 Subject: [PATCH 22/34] Update to 4.1.5, Git revision c9a0e98 (Nov 17, 2025) --- .gitignore | 1 + sources | 2 +- zeromq-ada.spec | 32 ++++++++++++++++---------------- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index 8c7bbd5..8a0074d 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /zeromq-ada-24032011git.tar.gz /zeromq-ada.tar.gz /zeromq-ada-4.1.5.tar.gz +/zeromq-ada-c9a0e98.tar.gz diff --git a/sources b/sources index 6195a24..dac16ef 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (zeromq-ada-4.1.5.tar.gz) = c18fa9537eceda1a747890b671d6a0704ce24afe19087f410b40e082a20b4357c0ac3d8ef3ff3a004cc2591b98fb38ddfe6b69838dda914e582d09ad1fb912f0 +SHA512 (zeromq-ada-c9a0e98.tar.gz) = 6b86be70c39ed30d4862374cee15fc7ba946ff4b9a773d0157cfcde1dadf255008b31bc9dfcc586b7f27e2c0f8fd3e3783c41aa40759648286f1d85f4be93a9a diff --git a/zeromq-ada.spec b/zeromq-ada.spec index bbdc9ed..f5a9262 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -1,17 +1,19 @@ -%global git_commit fca30bb86f41e24d878c32ce399500f195513400 -%global git_date 20200330 +# Upstream source information. +%global upstream_owner persan +%global upstream_name zeromq-Ada +%global upstream_version 4.1.5 +%global upstream_commit_date 20251117 +%global upstream_commit c9a0e984b673ee61cbf86819c300d7d54f563fea +%global upstream_shortcommit %(c=%{upstream_commit}; echo ${c:0:7}) -%global git_short_commit %(echo %{git_commit} | cut -c -8) -%global git_suffix %{git_date}git%{git_short_commit} - -Name: zeromq-ada -Version: 4.1.5 -Release: 17.git%{?dist} +Name: zeromq-ada +Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} +Release: 1%{?dist} Summary: Ada binding for zeromq # Automatically converted from old format: GPLv2+ - review is highly recommended. License: GPL-2.0-or-later -URL: https://zeromq.org -Source0: https://github.com/persan/zeromq-Ada/archive/%{git_commit}/%{name}-%{version}.tar.gz +URL: https://zeromq.org +Source0: https://github.com/%{upstream_owner}/%{upstream_name}/archive/%{upstream_commit}.tar.gz#/%{name}-%{upstream_shortcommit}.tar.gz ## Use shared libs instead static Patch0: %{name}-libdir.patch ## Use directories.gpr @@ -38,11 +40,8 @@ Requires: zeromq-devel >= 2.1 %description devel %{summary} %prep -%setup -q -n zeromq-Ada-%{git_commit} -%patch -P0 -p1 -%patch -P1 -p1 +%autosetup -C -p1 touch Makefile.config -cp -v libsodium.gpr.in libsodium.gpr cp -v libzmq.gpr.in libzmq.gpr %build @@ -61,7 +60,7 @@ rm -rf %{buildroot}/%{_libdir}/zmq/static %doc README.md COPYING %dir %{_libdir}/zmq %dir %{_libdir}/zmq/relocatable -%{_libdir}/zmq/relocatable/libzmqAda.so.%{version} +%{_libdir}/zmq/relocatable/libzmqAda.so.%{upstream_version} %{_libdir}/libzmqAda.so.* @@ -76,8 +75,9 @@ rm -rf %{buildroot}/%{_libdir}/zmq/static %{_datadir}/zmq/* %changelog -* Fri Jan 09 2026 Dennis van Raaij - 4.1.5-17.git +* Fri Jan 09 2026 Dennis van Raaij - 4.1.5^git20251117.c9a0e98-1 - Removed debug package creation opt-out. +- Updated to Git revision c9a0e98 (Nov 17, 2025). * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 11bf7e690c5fb3e2c0812ffe75fa51cc9277bbcb Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:28:10 +0200 Subject: [PATCH 23/34] Update SPDX license expression --- zeromq-ada.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index f5a9262..457425f 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -10,8 +10,11 @@ Name: zeromq-ada Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} Release: 1%{?dist} Summary: Ada binding for zeromq -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later + +License: MIT +# According to the upstream commit history, the license of this library was +# changed to MIT on Apr 8, 2021 (upstream commit 651ca44). + URL: https://zeromq.org Source0: https://github.com/%{upstream_owner}/%{upstream_name}/archive/%{upstream_commit}.tar.gz#/%{name}-%{upstream_shortcommit}.tar.gz ## Use shared libs instead static @@ -31,8 +34,11 @@ Ada bindings for zeromq %package devel Summary: Devel package for Ada binding for zeromq -# Automatically converted from old format: GPLv2+ - review is highly recommended. -License: GPL-2.0-or-later +License: MIT AND GPL-2.0-or-later WITH GNAT-exception +# The license is MIT except for: +# - libzmq.gpr.in : GPLv2+ with GNAT runtime exception +# - zmq.gpr.inst : GPLv2+ with GNAT runtime exception +# - zmq.gpr : GPLv2+ with GNAT runtime exception Requires: fedora-gnat-project-common >= 2 Requires: %{name}%{?_isa} = %{version}-%{release} Requires: zeromq-devel >= 2.1 @@ -78,6 +84,7 @@ rm -rf %{buildroot}/%{_libdir}/zmq/static * Fri Jan 09 2026 Dennis van Raaij - 4.1.5^git20251117.c9a0e98-1 - Removed debug package creation opt-out. - Updated to Git revision c9a0e98 (Nov 17, 2025). +- Updated the SPDX license expression. * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 188d8acb55ab5b73ead45d9be5a2872376b0550d Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:37:41 +0200 Subject: [PATCH 24/34] Remove version requirement on zeromq and fedora-gnat-project-common All Fedora releases that are currently supported contain a version of ZeroMQ >= 2.1 and verion of fedora-gnat-project-common >= 2. --- zeromq-ada.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 457425f..271a833 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -24,8 +24,11 @@ Patch1: %{name}-fedora.patch BuildRequires: gcc-gnat gprbuild BuildRequires: make -BuildRequires: fedora-gnat-project-common >= 2 zeromq-devel >= 2.1 -Requires: zeromq >= 2.1 +BuildRequires: fedora-gnat-project-common +BuildRequires: zeromq-devel + +Requires: zeromq + # gcc-gnat only available on these: ExclusiveArch: %{GPRbuild_arches} @@ -39,9 +42,9 @@ License: MIT AND GPL-2.0-or-later WITH GNAT-exception # - libzmq.gpr.in : GPLv2+ with GNAT runtime exception # - zmq.gpr.inst : GPLv2+ with GNAT runtime exception # - zmq.gpr : GPLv2+ with GNAT runtime exception -Requires: fedora-gnat-project-common >= 2 Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: zeromq-devel >= 2.1 +Requires: fedora-gnat-project-common +Requires: zeromq-devel %description devel %{summary} From 7d4a2efc8493a1bf88c2285d8a81cddb37f9f18b Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:44:34 +0200 Subject: [PATCH 25/34] Simplify the build and installation --- ...tcoll-core-dependency-to-zmq-example.patch | 18 ++++++ zeromq-ada-fedora.patch | 45 ------------- zeromq-ada-libdir.patch | 28 -------- zeromq-ada-remove-unnecessary-languages.patch | 11 ++++ zeromq-ada.spec | 64 ++++++++++++------- 5 files changed, 69 insertions(+), 97 deletions(-) create mode 100644 zeromq-ada-add-gnatcoll-core-dependency-to-zmq-example.patch delete mode 100644 zeromq-ada-fedora.patch delete mode 100644 zeromq-ada-libdir.patch create mode 100644 zeromq-ada-remove-unnecessary-languages.patch diff --git a/zeromq-ada-add-gnatcoll-core-dependency-to-zmq-example.patch b/zeromq-ada-add-gnatcoll-core-dependency-to-zmq-example.patch new file mode 100644 index 0000000..7f8397a --- /dev/null +++ b/zeromq-ada-add-gnatcoll-core-dependency-to-zmq-example.patch @@ -0,0 +1,18 @@ +--- a/examples/zmq-examples.gpr.inst ++++ b/examples/zmq-examples.gpr.inst +@@ -1,4 +1,6 @@ + with "zmq.gpr"; ++with "gnatcoll_core.gpr"; ++ + project ZMQ.Examples is + + for Main use ("zmq-examples-client.adb", +@@ -10,7 +12,7 @@ + for Exec_Dir use "."; + + package Compiler is +- for Default_Switches ("ada") use ("-g", "-O2", "-gnatf", "-gnat05"); ++ for Default_Switches ("ada") use ("-g", "-O2", "-gnatf"); + end Compiler; + + package Binder is diff --git a/zeromq-ada-fedora.patch b/zeromq-ada-fedora.patch deleted file mode 100644 index 2f03768..0000000 --- a/zeromq-ada-fedora.patch +++ /dev/null @@ -1,45 +0,0 @@ -diff --git a/zmq.gpr.inst b/zmq.gpr.inst -index 748cab2..1667469 100644 ---- a/zmq.gpr.inst -+++ b/zmq.gpr.inst -@@ -29,22 +29,21 @@ - -- covered by the GNU Public License. -- - -- -- - ------------------------------------------------------------------------------ --with "libzmq.gpr"; -+with "directories"; -+ - project ZMQ is -- For Languages use ("Ada", "Makefile", "Python"); -+ For Languages use ("Ada"); - -- type ZMQ_Kind_Type is ("static", "relocatable"); -- ZMQ_Kind : ZMQ_Kind_Type := external ("LIBRARY_TYPE", "static"); -+ type ZMQ_Kind_Type is ("relocatable"); -+ ZMQ_Kind : ZMQ_Kind_Type := external ("LIBRARY_TYPE", "relocatable"); - Version := "4.0.1"; - - for Library_Name use "zmqAda"; - for Library_Version use "lib" & project'Library_Name & ".so." & Version; -- for Library_Dir use "../zmq/" & ZMQ_Kind; -- for Source_Dirs use ("../../include/zmq"); -+ for Library_Dir use Directories.Libdir & "/zmq/" & ZMQ_Kind; -+ for Source_Dirs use (Directories.Includedir & "/zmq"); - for Externally_Built use "True"; - case ZMQ_Kind is -- when "static" => -- for Library_Kind use "static"; - when "relocatable" => - for Library_Kind use "dynamic"; - for Library_Auto_Init use "True"; -@@ -57,5 +56,10 @@ project ZMQ is - "ZMQ.Utilities", - "ZMQ.Utilities.Memory_Streams"); - end case; -+ -+ package Linker is -+ for Linker_Options use ("-lzmq", "-lsodium"); -+ end Linker; -+ - end ZMQ; - diff --git a/zeromq-ada-libdir.patch b/zeromq-ada-libdir.patch deleted file mode 100644 index 264be6c..0000000 --- a/zeromq-ada-libdir.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/Makefile b/Makefile -index 7c75354..0e76efb 100644 ---- a/Makefile -+++ b/Makefile -@@ -31,7 +31,6 @@ Makefile.config: configure - GNATMAKE = gprbuild ${GNATFLAGS} -p -f -R - - compile: -- ${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=static - ${GNATMAKE} -P zmq.gpr -XLIBRARY_TYPE=relocatable - - uninstall: -@@ -46,6 +45,7 @@ install: compile uninstall - - cp -f src/zmq.ad* ${DESTDIR}/${PREFIX}/include/zmq - cp -f src/zmq-*.ad* ${DESTDIR}/${PREFIX}/include/zmq -+ cp -f src/gen/* ${DESTDIR}/${PREFIX}/include/zmq - chmod -w ${DESTDIR}/${PREFIX}/include/zmq/*.ad? - # (cd ${DESTDIR}/${PREFIX}/lib; for i in `find -name lib*.so*`; do ln -s $$i ; done)s - cp zmq.gpr.inst ${DESTDIR}/${ADA_PROJECT_DIR}/zmq.gpr -@@ -53,6 +53,7 @@ install: compile uninstall - mkdir -p ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada - cp examples/zmq-examples*.ad* ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada - cp examples/zmq-examples.gpr.inst ${DESTDIR}/${PREFIX}/share/zmq/examples/Ada/zmq-examples.gpr -+ cd ${DESTDIR}/${LIBDIR}/ && ln -s zmq/relocatable/libzmqAda.so* . - - samples: - ${GNATMAKE} -P examples/zmq-examples.gpr diff --git a/zeromq-ada-remove-unnecessary-languages.patch b/zeromq-ada-remove-unnecessary-languages.patch new file mode 100644 index 0000000..f4fb8be --- /dev/null +++ b/zeromq-ada-remove-unnecessary-languages.patch @@ -0,0 +1,11 @@ +--- a/zmq.gpr ++++ b/zmq.gpr +@@ -31,7 +31,7 @@ + ------------------------------------------------------------------------------ + with "libzmq.gpr"; + project ZMQ is +- for Languages use ("Ada", "Makefile", "Python"); ++ for Languages use ("Ada"); + + type ZMQ_Kind_Type is ("static", "relocatable"); + ZMQ_Kind : ZMQ_Kind_Type := external ("LIBRARY_TYPE", "static"); diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 271a833..0a38dc2 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -17,13 +17,16 @@ License: MIT URL: https://zeromq.org Source0: https://github.com/%{upstream_owner}/%{upstream_name}/archive/%{upstream_commit}.tar.gz#/%{name}-%{upstream_shortcommit}.tar.gz -## Use shared libs instead static -Patch0: %{name}-libdir.patch -## Use directories.gpr -Patch1: %{name}-fedora.patch + +# [Fedora-specific] Remove Python and Makefile languages from the ZMQ +# GPRbuild-file. Both languages are used only during the development of the +# bindings/library and are of no relevance to the user of the bindings. +Patch: %{name}-remove-unnecessary-languages.patch + +# [Fedora-specific] Indicate that the examples depend on GNATcoll Core. +Patch: %{name}-add-gnatcoll-core-dependency-to-zmq-example.patch BuildRequires: gcc-gnat gprbuild -BuildRequires: make BuildRequires: fedora-gnat-project-common BuildRequires: zeromq-devel @@ -50,44 +53,57 @@ Requires: zeromq-devel %{summary} %prep %autosetup -C -p1 -touch Makefile.config -cp -v libzmq.gpr.in libzmq.gpr + +# Work with the GPRbuild-project to be used by users of the Ada bindings. +rm examples/zmq-examples.gpr +cp --preserve=timestamp examples/zmq-examples.gpr.inst \ + examples/zmq-examples.gpr + +# libzmq.gpr is needed by zmq.gpr. +cp libzmq.gpr.in libzmq.gpr %build -make %{?_smp_mflags} GNATFLAGS="%{GNAT_optflags}" GNATMAKE="gprbuild -p -R %{GNAT_optflags}" PREFIX=/usr -## for tests aunit needed +# Build the library. +gprbuild %{GPRbuild_flags} -XLIBRARY_TYPE=relocatable -P zmq.gpr %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} LIBDIR=%{_libdir} ADA_PROJECT_DIR=%{_GNAT_project_dir} GNATFLAGS="%{GNAT_optflags}" PREFIX=/usr -rm -f %{buildroot}/%{_libdir}/zmq/static/libzmqAda.a -rm -rf %{buildroot}/%{_libdir}/zmq/static + +# Install the library. +%{GPRinstall} -XLIBRARY_TYPE=relocatable -P zmq.gpr + +# Fix up the symlink. +ln --symbolic --force libzmqAda.so.%{upstream_version} \ + %{buildroot}%{_libdir}/libzmqAda.so + +# Copy the examples. +mkdir --parents %{buildroot}%{_pkgdocdir}/examples +cp --preserve=timestamps examples/zmq-examples*.ad* \ + %{buildroot}%{_pkgdocdir}/examples +cp --preserve=timestamps examples/zmq-examples.gpr \ + %{buildroot}%{_pkgdocdir}/examples %files %doc README.md COPYING -%dir %{_libdir}/zmq -%dir %{_libdir}/zmq/relocatable -%{_libdir}/zmq/relocatable/libzmqAda.so.%{upstream_version} -%{_libdir}/libzmqAda.so.* +%{_libdir}/libzmqAda.so.%{upstream_version} %files devel -%{_libdir}/zmq/relocatable/libzmqAda.so -%{_libdir}/libzmqAda.so -%dir %{_includedir}/zmq/ -%{_includedir}/zmq/*.adb -%{_includedir}/zmq/*.ads %{_GNAT_project_dir}/zmq.gpr -%{_libdir}/zmq/relocatable/*.ali -%{_datadir}/zmq/* +%{_includedir}/%{name} +%dir %{_libdir}/%{name} +%attr(444,-,-) %{_libdir}/%{name}/*.ali +%{_libdir}/libzmqAda.so +%{_pkgdocdir}/examples + %changelog * Fri Jan 09 2026 Dennis van Raaij - 4.1.5^git20251117.c9a0e98-1 - Removed debug package creation opt-out. - Updated to Git revision c9a0e98 (Nov 17, 2025). - Updated the SPDX license expression. +- The examples can now be found in the package documentation directory. * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 89e51fa9eb0dcf34c45eac6d2e766c05309e91a7 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:51:37 +0200 Subject: [PATCH 26/34] Update summary and descriptions --- zeromq-ada.spec | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 0a38dc2..ff40e12 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -9,7 +9,7 @@ Name: zeromq-ada Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} Release: 1%{?dist} -Summary: Ada binding for zeromq +Summary: Ada binding for ZeroMQ License: MIT # According to the upstream commit history, the license of this library was @@ -35,11 +35,19 @@ Requires: zeromq # gcc-gnat only available on these: ExclusiveArch: %{GPRbuild_arches} -%description -Ada bindings for zeromq +%global common_description_en \ +The ZeroMQ lightweight messaging kernel is a library which extends the \ +standard socket interfaces with features traditionally provided by specialized \ +messaging middleware products. ZeroMQ sockets provide an abstraction of \ +asynchronous message queues, multiple messaging patterns, message filtering \ +(subscriptions), seamless access to multiple transport protocols and more. + +%description %{common_description_en} + +This package provides an Ada binding to the ZeroMQ library. %package devel -Summary: Devel package for Ada binding for zeromq +Summary: Development package for the Ada binding for ZeroMQ License: MIT AND GPL-2.0-or-later WITH GNAT-exception # The license is MIT except for: # - libzmq.gpr.in : GPLv2+ with GNAT runtime exception @@ -49,8 +57,13 @@ Requires: %{name}%{?_isa} = %{version}-%{release} Requires: fedora-gnat-project-common Requires: zeromq-devel -%description devel -%{summary} +%description devel %{common_description_en} + +This package contains source code and linking information for developing +applications that use the Ada binding for ZeroMQ. It also contains some +code examples. + + %prep %autosetup -C -p1 @@ -104,6 +117,7 @@ cp --preserve=timestamps examples/zmq-examples.gpr \ - Updated to Git revision c9a0e98 (Nov 17, 2025). - Updated the SPDX license expression. - The examples can now be found in the package documentation directory. +- All package summaries and descriptions have been updated. * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 8bc5aca6dd743c4783dcf7675513dd77cbf3deab Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:55:42 +0200 Subject: [PATCH 27/34] Improve overall spec readability --- zeromq-ada.spec | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index ff40e12..4febf56 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -32,8 +32,8 @@ BuildRequires: zeromq-devel Requires: zeromq -# gcc-gnat only available on these: -ExclusiveArch: %{GPRbuild_arches} +# Build only on architectures where GPRbuild is available: +ExclusiveArch: %{GPRbuild_arches} %global common_description_en \ The ZeroMQ lightweight messaging kernel is a library which extends the \ @@ -46,6 +46,10 @@ asynchronous message queues, multiple messaging patterns, message filtering \ This package provides an Ada binding to the ZeroMQ library. +################# +## Subpackages ## +################# + %package devel Summary: Development package for the Ada binding for ZeroMQ License: MIT AND GPL-2.0-or-later WITH GNAT-exception @@ -64,6 +68,10 @@ applications that use the Ada binding for ZeroMQ. It also contains some code examples. +############# +## Prepare ## +############# + %prep %autosetup -C -p1 @@ -75,11 +83,21 @@ cp --preserve=timestamp examples/zmq-examples.gpr.inst \ # libzmq.gpr is needed by zmq.gpr. cp libzmq.gpr.in libzmq.gpr + +########### +## Build ## +########### + %build # Build the library. gprbuild %{GPRbuild_flags} -XLIBRARY_TYPE=relocatable -P zmq.gpr + +############# +## Install ## +############# + %install # Install the library. @@ -96,6 +114,9 @@ cp --preserve=timestamps examples/zmq-examples*.ad* \ cp --preserve=timestamps examples/zmq-examples.gpr \ %{buildroot}%{_pkgdocdir}/examples +########### +## Files ## +########### %files %doc README.md COPYING @@ -111,6 +132,10 @@ cp --preserve=timestamps examples/zmq-examples.gpr \ %{_pkgdocdir}/examples +############### +## Changelog ## +############### + %changelog * Fri Jan 09 2026 Dennis van Raaij - 4.1.5^git20251117.c9a0e98-1 - Removed debug package creation opt-out. From 5967ddb0cd2ad09e005e393f3fef9ae32c527ec8 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 22:57:09 +0200 Subject: [PATCH 28/34] Add a check section and an option to disable it --- zeromq-ada-adjust-zmq-tests-project.patch | 28 ++++++++++++++ zeromq-ada.spec | 46 +++++++++++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 zeromq-ada-adjust-zmq-tests-project.patch diff --git a/zeromq-ada-adjust-zmq-tests-project.patch b/zeromq-ada-adjust-zmq-tests-project.patch new file mode 100644 index 0000000..0989522 --- /dev/null +++ b/zeromq-ada-adjust-zmq-tests-project.patch @@ -0,0 +1,28 @@ +--- a/tests/zmq-tests.gpr ++++ b/tests/zmq-tests.gpr +@@ -1,7 +1,7 @@ + with "zmq.gpr"; + with "aunit.gpr"; +-with "helpers/zmq-helpers.gpr"; +-with "examples/zmq-examples.gpr"; ++with "gnatcoll_core.gpr"; ++with "../examples/zmq-examples.gpr"; + + project ZMQ.Tests is + +@@ -19,15 +19,8 @@ + for Default_Switches ("ada") use ("-k", "-j0"); + end Builder; + +- package Compiler is +- for Default_Switches ("ada") use Zmq.Compiler'Default_Switches ("ada") & ("-gnaty-s", "-gnata"); +- end Compiler; +- + package Binder is + for Default_Switches ("ada") use ("-E"); + end Binder; + +- package Ide renames Zmq.Ide; +- + end ZMQ.Tests; +- diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 4febf56..4757dc2 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -1,3 +1,6 @@ +# The test suite is normally run. It can be disabled with "--without=check". +%bcond_without check + # Upstream source information. %global upstream_owner persan %global upstream_name zeromq-Ada @@ -26,9 +29,29 @@ Patch: %{name}-remove-unnecessary-languages.patch # [Fedora-specific] Indicate that the examples depend on GNATcoll Core. Patch: %{name}-add-gnatcoll-core-dependency-to-zmq-example.patch +# [Fedora-specific] Update the GPRbuild project for building the test suite. +# Note that we want to run the test suite against the Ada bindings installed +# in the buildroot and must therefore remove any reference to packages that +# are only defined in the ZMQ project in the source tree. +# +# - Remove the `helpers' project; the dependency isn't used by any test. +# - Update the dependency from GNATcoll to GNATcoll Core. +# - Remove the compiler switches. They're inherited from the ZMQ project in +# the source tree. When building the testsuite, we'll use the switches of +# Fedora instead. +# - Remove the `Ide' package. The package is inherited from the the ZMQ +# project in the source tree and isn't needed when packaging the library. +# +Patch: %{name}-adjust-zmq-tests-project.patch + BuildRequires: gcc-gnat gprbuild BuildRequires: fedora-gnat-project-common BuildRequires: zeromq-devel +%if %{with check} +BuildRequires: aunit-devel +BuildRequires: gnatcoll-core-devel +BuildRequires: xmlada-devel +%endif Requires: zeromq @@ -114,6 +137,29 @@ cp --preserve=timestamps examples/zmq-examples*.ad* \ cp --preserve=timestamps examples/zmq-examples.gpr \ %{buildroot}%{_pkgdocdir}/examples +########### +## Check ## +########### + +%if %{with check} +%check + +# Make the files of this packages visible to the test runner. +export PATH=%{buildroot}%{_bindir}:$PATH +export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH +export GPR_PROJECT_PATH=%{buildroot}%{_GNAT_project_dir}:$GPR_PROJECT_PATH + +cd tests + +# Build the test suite. +gprbuild %{GPRbuild_flags} -P zmq-tests.gpr -cargs -fPIE + +# Run the test suite. +bin/test_all + +%endif + + ########### ## Files ## ########### From 58bf2a3af47ad4dc89296775d3117e9602003c75 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Sun, 4 May 2025 23:01:20 +0200 Subject: [PATCH 29/34] Remove README.md as documentation, mark COPYING as license The README-file doesn't contain any useful information for Fedora users. --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 4757dc2..02a825d 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -165,7 +165,7 @@ bin/test_all ########### %files -%doc README.md COPYING +%license COPYING %{_libdir}/libzmqAda.so.%{upstream_version} @@ -189,6 +189,9 @@ bin/test_all - Updated the SPDX license expression. - The examples can now be found in the package documentation directory. - All package summaries and descriptions have been updated. +- The README-file has been removed from the package as it doesn't contain any + useful information for Fedora users. +- The license file can now be found in the package license directory. * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 765d0c164768241f86c8b2ee47690e1a95b3ae80 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Tue, 6 May 2025 21:24:14 +0200 Subject: [PATCH 30/34] Add the low-level binding generation step and an option to disable it --- zeromq-ada-skip-gnatpp-during-generate.patch | 25 ++++++++++++++++++++ zeromq-ada.spec | 18 ++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 zeromq-ada-skip-gnatpp-during-generate.patch diff --git a/zeromq-ada-skip-gnatpp-during-generate.patch b/zeromq-ada-skip-gnatpp-during-generate.patch new file mode 100644 index 0000000..020e744 --- /dev/null +++ b/zeromq-ada-skip-gnatpp-during-generate.patch @@ -0,0 +1,25 @@ +--- a/Makefile ++++ b/Makefile +@@ -64,7 +64,6 @@ + (cd .temp;g++ -c -fdump-ada-spec -C x.c) + python rename.py .temp/zmq_h.ads + cp .temp/zmq_h.ads src/gen/zmq-low_level.ads +- gnatpp -rf -M128 --comments-special src/gen/*.ads + sed "s-Zmq.Low_Level-ZMQ.Low_Level-" -i src/gen/zmq-low_level.ads + chmod -w src/gen/*.ads + clean: +@@ -85,7 +84,7 @@ + + helpers/getinfo:$(wildcard src/*.ads) + cd helpers;gprbuild -p +- ++ + tag:helpers/getinfo + @if [ -n "`git status --porcelain`" ] ; then \ + echo "Folder is not clean";\ +@@ -94,5 +93,3 @@ + fi + @(VERSION=`helpers/getinfo --binding-version`-`date +%Y%m%d`;\ + git tag $${VERSION}) +- +- diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 02a825d..896bb03 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -1,6 +1,10 @@ # The test suite is normally run. It can be disabled with "--without=check". %bcond_without check +# The low-level bindings are normally regenerated. Regeneration can be disabled +# with "--without=generate". +%bcond_without generate + # Upstream source information. %global upstream_owner persan %global upstream_name zeromq-Ada @@ -29,6 +33,10 @@ Patch: %{name}-remove-unnecessary-languages.patch # [Fedora-specific] Indicate that the examples depend on GNATcoll Core. Patch: %{name}-add-gnatcoll-core-dependency-to-zmq-example.patch +# [Fedora-specific] The gnatpp tool, a source code formatter tool which is part +# of the now obsolete ASIS-toolset, is not available in Fedora. +Patch: %{name}-skip-gnatpp-during-generate.patch + # [Fedora-specific] Update the GPRbuild project for building the test suite. # Note that we want to run the test suite against the Ada bindings installed # in the buildroot and must therefore remove any reference to packages that @@ -47,6 +55,11 @@ Patch: %{name}-adjust-zmq-tests-project.patch BuildRequires: gcc-gnat gprbuild BuildRequires: fedora-gnat-project-common BuildRequires: zeromq-devel +%if %{with generate} +BuildRequires: make gcc-g++ sed +BuildRequires: python3-devel +BuildRequires: python-unversioned-command +%endif %if %{with check} BuildRequires: aunit-devel BuildRequires: gnatcoll-core-devel @@ -106,6 +119,11 @@ cp --preserve=timestamp examples/zmq-examples.gpr.inst \ # libzmq.gpr is needed by zmq.gpr. cp libzmq.gpr.in libzmq.gpr +# Regenerate the low-level bindings. +%if %{with generate} +make generate +%endif + ########### ## Build ## From 0cce2495c37eef447eeaf116846e727107c3df83 Mon Sep 17 00:00:00 2001 From: Dennis van Raaij Date: Wed, 7 Jan 2026 21:56:01 +0100 Subject: [PATCH 31/34] Make the generated project file architecture-independent --- zeromq-ada.spec | 40 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 896bb03..0b40665 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -155,6 +155,39 @@ cp --preserve=timestamps examples/zmq-examples*.ad* \ cp --preserve=timestamps examples/zmq-examples.gpr \ %{buildroot}%{_pkgdocdir}/examples +# Before making the project files architecture-independent, copy the buildroot +# into a separate directory for later testing. The testsuite fails if applied to +# the buildroot after making the project files architecture-independent because +# of the hardcoded paths in `directories.gpr`. +%if %{with check} +%global checkroot %{_builddir}/%{name}-%{version}/checkroot +mkdir %{checkroot} # without --parents to not clobber any upstream directory +cp --recursive %{buildroot}/* %{checkroot}/ +%endif + +# Make the generated usage project file architecture-independent. +sed --regexp-extended --in-place \ + '--expression=1i with "directories";' \ + '--expression=/^-- This project has been generated/d' \ + '--expression=/package Linker is/,/end Linker/d' \ + '--expression=s|^( *for +Source_Dirs +use +).*;$|\1(Directories.Includedir \& "/'%{name}'");|i' \ + '--expression=s|^( *for +Library_Dir +use +).*;$|\1Directories.Libdir;|i' \ + '--expression=s|^( *for +Library_ALI_Dir +use +).*;$|\1Directories.Libdir \& "/'%{name}'";|i' \ + %{buildroot}%{_GNAT_project_dir}/zmq.gpr +# The Sed commands are: +# 1: Insert a with clause before the first line to import the directories +# project. +# 2: Delete a comment that mentions the architecture. +# 3: Delete the package Linker, which contains linker parameters that a +# shared library normally doesn't need, and can contain architecture- +# specific pathnames. +# 4: Replace the value of Source_Dirs with a pathname based on +# Directories.Includedir. +# 5: Replace the value of Library_Dir with Directories.Libdir. +# 6: Replace the value of Library_ALI_Dir with a pathname based on +# Directories.Libdir. + + ########### ## Check ## ########### @@ -163,9 +196,9 @@ cp --preserve=timestamps examples/zmq-examples.gpr \ %check # Make the files of this packages visible to the test runner. -export PATH=%{buildroot}%{_bindir}:$PATH -export LD_LIBRARY_PATH=%{buildroot}%{_libdir}:$LD_LIBRARY_PATH -export GPR_PROJECT_PATH=%{buildroot}%{_GNAT_project_dir}:$GPR_PROJECT_PATH +export PATH=%{checkroot}%{_bindir}:$PATH +export LD_LIBRARY_PATH=%{checkroot}%{_libdir}:$LD_LIBRARY_PATH +export GPR_PROJECT_PATH=%{checkroot}%{_GNAT_project_dir}:$GPR_PROJECT_PATH cd tests @@ -210,6 +243,7 @@ bin/test_all - The README-file has been removed from the package as it doesn't contain any useful information for Fedora users. - The license file can now be found in the package license directory. +- Made the generated project file architecture-independent. * Fri Jul 25 2025 Fedora Release Engineering - 4.1.5-16.git - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From a9a7a88140a140466463f791406445533ea88cc6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 17 Jan 2026 21:07:41 +0000 Subject: [PATCH 32/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 0b40665..68fd95f 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -15,7 +15,7 @@ Name: zeromq-ada Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} -Release: 1%{?dist} +Release: 2%{?dist} Summary: Ada binding for ZeroMQ License: MIT @@ -234,6 +234,9 @@ bin/test_all ############### %changelog +* Sat Jan 17 2026 Fedora Release Engineering - 4.1.5^git20251117.c9a0e98-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + * Fri Jan 09 2026 Dennis van Raaij - 4.1.5^git20251117.c9a0e98-1 - Removed debug package creation opt-out. - Updated to Git revision c9a0e98 (Nov 17, 2025). From 770ed5d4e56f8b588dd30e9cda82d0fbd750f9f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Persson?= Date: Sat, 28 Mar 2026 23:37:39 +0100 Subject: [PATCH 33/34] Rebuilt because GCC 16.0.1-0.10 broke ALI. --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 68fd95f..84921eb 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -15,7 +15,7 @@ Name: zeromq-ada Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} -Release: 2%{?dist} +Release: 3%{?dist} Summary: Ada binding for ZeroMQ License: MIT @@ -234,6 +234,9 @@ bin/test_all ############### %changelog +* Sat Mar 28 2026 Björn Persson - 4.1.5^git20251117.c9a0e98-3 +- Rebuilt because GCC 16.0.1-0.10 broke ALI. + * Sat Jan 17 2026 Fedora Release Engineering - 4.1.5^git20251117.c9a0e98-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild From 14daa18d17e69a88e529e449a09f0627ce1be96b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jul 2026 09:40:03 +0000 Subject: [PATCH 34/34] Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild --- zeromq-ada.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/zeromq-ada.spec b/zeromq-ada.spec index 84921eb..3ec42c0 100644 --- a/zeromq-ada.spec +++ b/zeromq-ada.spec @@ -15,7 +15,7 @@ Name: zeromq-ada Version: %{upstream_version}^git%{upstream_commit_date}.%{upstream_shortcommit} -Release: 3%{?dist} +Release: 4%{?dist} Summary: Ada binding for ZeroMQ License: MIT @@ -234,6 +234,9 @@ bin/test_all ############### %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 4.1.5^git20251117.c9a0e98-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + * Sat Mar 28 2026 Björn Persson - 4.1.5^git20251117.c9a0e98-3 - Rebuilt because GCC 16.0.1-0.10 broke ALI.