From 1fcc083e6e2a08695b7da4cb063a525946bffffa Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 12:37:25 +0100
Subject: [PATCH 1/8] Add libzmq

---
 libzmq.spec    | 17 +++++++++++++++++
 pip/pyzmq.file |  1 +
 2 files changed, 18 insertions(+)
 create mode 100644 libzmq.spec
 create mode 100644 pip/pyzmq.file

diff --git a/libzmq.spec b/libzmq.spec
new file mode 100644
index 00000000000..ca90f41d8e5
--- /dev/null
+++ b/libzmq.spec
@@ -0,0 +1,17 @@
+### RPM external libzmq 4.3.2
+Source: https://github.com/zeromq/libzmq/releases/download/v%{realversion}/zeromq-%{realversion}.tar.gz
+Requires: ...
+BuildRequires: autotools
+
+%prep
+%setup -n %{n}-%{realversion}
+
+./configure --prefix=%{i} \
+            --disable-doc \
+            --disable-dependency-tracking
+
+%build
+make all %makeprocesses
+
+%install
+make install
\ No newline at end of file
diff --git a/pip/pyzmq.file b/pip/pyzmq.file
new file mode 100644
index 00000000000..b2bea3c702f
--- /dev/null
+++ b/pip/pyzmq.file
@@ -0,0 +1 @@
+Requires: libzmq
\ No newline at end of file

From 76463237414f20f7fc3b7e3ec51e2138ecb53e72 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 12:39:02 +0100
Subject: [PATCH 2/8] Cleanup

---
 libzmq.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libzmq.spec b/libzmq.spec
index ca90f41d8e5..9319a19084f 100644
--- a/libzmq.spec
+++ b/libzmq.spec
@@ -1,6 +1,5 @@
 ### RPM external libzmq 4.3.2
 Source: https://github.com/zeromq/libzmq/releases/download/v%{realversion}/zeromq-%{realversion}.tar.gz
-Requires: ...
 BuildRequires: autotools
 
 %prep

From 75791753c455049502c9fa1cf15161f97d9b8831 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 13:58:03 +0100
Subject: [PATCH 3/8] Fix

---
 libzmq.spec | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libzmq.spec b/libzmq.spec
index 9319a19084f..cd9dfa37d37 100644
--- a/libzmq.spec
+++ b/libzmq.spec
@@ -3,14 +3,14 @@ Source: https://github.com/zeromq/libzmq/releases/download/v%{realversion}/zerom
 BuildRequires: autotools
 
 %prep
-%setup -n %{n}-%{realversion}
+%setup -n zeromq-%{realversion}
 
 ./configure --prefix=%{i} \
-            --disable-doc \
+            --without-docs \
             --disable-dependency-tracking
 
 %build
 make all %makeprocesses
 
 %install
-make install
\ No newline at end of file
+make install

From b7e194aa825f0a4c623b7e9bedc4b10cc93b4bdb Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 16:28:29 +0100
Subject: [PATCH 4/8] Add config for py3-pyzmq

---
 pip/pyzmq.file | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pip/pyzmq.file b/pip/pyzmq.file
index b2bea3c702f..9e2a82f6dd8 100644
--- a/pip/pyzmq.file
+++ b/pip/pyzmq.file
@@ -1 +1,11 @@
-Requires: libzmq
\ No newline at end of file
+Requires: libzmq
+
+%define patchsrc \
+cat > setup.cfg <<EOF \
+[global]
+zmq_prefix = $LIBZMQ_ROOT
+
+[build_ext]
+include_dirs = $LIBZMQ_ROOT/include
+library_dirs = $LIBZMQ_ROOT/lib
+EOF

From 9aa56f687894d6f459ca04448697ff311306dcda Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 16:32:40 +0100
Subject: [PATCH 5/8] Change EOLs

---
 pip/pyzmq.file | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pip/pyzmq.file b/pip/pyzmq.file
index 9e2a82f6dd8..b3581732b72 100644
--- a/pip/pyzmq.file
+++ b/pip/pyzmq.file
@@ -1,11 +1,11 @@
-Requires: libzmq
-
-%define patchsrc \
-cat > setup.cfg <<EOF \
-[global]
-zmq_prefix = $LIBZMQ_ROOT
-
-[build_ext]
-include_dirs = $LIBZMQ_ROOT/include
-library_dirs = $LIBZMQ_ROOT/lib
-EOF
+Requires: libzmq
+
+%define patchsrc \
+cat > setup.cfg <<EOF \
+[global]
+zmq_prefix = $LIBZMQ_ROOT
+
+[build_ext]
+include_dirs = $LIBZMQ_ROOT/include
+library_dirs = $LIBZMQ_ROOT/lib
+EOF

From 32f957af8113faef448af73dd8a0d543fc129b6d Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Mon, 17 Jan 2022 16:42:05 +0100
Subject: [PATCH 6/8] Fix

---
 pip/pyzmq.file | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pip/pyzmq.file b/pip/pyzmq.file
index b3581732b72..e8aa7622170 100644
--- a/pip/pyzmq.file
+++ b/pip/pyzmq.file
@@ -2,10 +2,10 @@ Requires: libzmq
 
 %define patchsrc \
 cat > setup.cfg <<EOF \
-[global]
-zmq_prefix = $LIBZMQ_ROOT
-
-[build_ext]
-include_dirs = $LIBZMQ_ROOT/include
-library_dirs = $LIBZMQ_ROOT/lib
+[global]\
+zmq_prefix = $LIBZMQ_ROOT\
+\
+[build_ext]\
+include_dirs = $LIBZMQ_ROOT/include\
+library_dirs = $LIBZMQ_ROOT/lib\
 EOF

From 083b7da0a171246b3c97fbb10c4988daca6964f0 Mon Sep 17 00:00:00 2001
From: iarspider <iarspider@gmail.com>
Date: Tue, 18 Jan 2022 09:51:40 +0100
Subject: [PATCH 7/8] Add toolfile for libzmq

---
 scram-tools.file/tools/libzmq/libzmq.xml | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 scram-tools.file/tools/libzmq/libzmq.xml

diff --git a/scram-tools.file/tools/libzmq/libzmq.xml b/scram-tools.file/tools/libzmq/libzmq.xml
new file mode 100644
index 00000000000..9fc2f77b3b7
--- /dev/null
+++ b/scram-tools.file/tools/libzmq/libzmq.xml
@@ -0,0 +1,9 @@
+<tool name="libzmq" version="@TOOL_VERSION@">
+  <info url="https://zeromq.org"/>
+  <lib name="zmq"/>
+  <client>
+    <environment name="LIBZMQ_BASE" default="@TOOL_ROOT@"/>
+    <environment name="LIBDIR" default="$LIBXSLT_BASE/lib"/>
+    <environment name="INCLUDE" default="$LIBXSLT_BASE/include"/>
+  </client>
+</tool> 
\ No newline at end of file

From f4450de71544ea7d4255bf4b440678f67a2bfcc1 Mon Sep 17 00:00:00 2001
From: Malik Shahzad Muzaffar <shahzad.malik.muzaffar@cern.ch>
Date: Sun, 23 Jan 2022 08:02:25 +0100
Subject: [PATCH 8/8] typo

---
 scram-tools.file/tools/libzmq/libzmq.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scram-tools.file/tools/libzmq/libzmq.xml b/scram-tools.file/tools/libzmq/libzmq.xml
index 9fc2f77b3b7..18794fd39ee 100644
--- a/scram-tools.file/tools/libzmq/libzmq.xml
+++ b/scram-tools.file/tools/libzmq/libzmq.xml
@@ -3,7 +3,7 @@
   <lib name="zmq"/>
   <client>
     <environment name="LIBZMQ_BASE" default="@TOOL_ROOT@"/>
-    <environment name="LIBDIR" default="$LIBXSLT_BASE/lib"/>
-    <environment name="INCLUDE" default="$LIBXSLT_BASE/include"/>
+    <environment name="LIBDIR" default="$LIBZMQ_BASE/lib"/>
+    <environment name="INCLUDE" default="$LIBZMQ_BASE/include"/>
   </client>
-</tool> 
\ No newline at end of file
+</tool>