[PATCH 1/4] python3-wheel: New package

[PATCH 1/4] python3-wheel: New package

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1658 bytes --]

This is required as a dependency for python3-pip, which is
required as a dependency for asciidoc. (What a mess... :-/ )

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 python3-wheel/python3-wheel.nm | 42 ++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 python3-wheel/python3-wheel.nm

diff --git a/python3-wheel/python3-wheel.nm b/python3-wheel/python3-wheel.nm
new file mode 100644
index 000000000..ff7ef8e6d
--- /dev/null
+++ b/python3-wheel/python3-wheel.nm
@@ -0,0 +1,42 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = python3-wheel
+version    = 0.38.4
+release    = 1
+arch       = noarch
+thisapp    = wheel-%{version}
+
+groups     = Development/Libraries
+url        = https://github.com/pypa/wheel
+license    = MIT
+summary    = The official binary distribution format for Python.
+
+description
+	This library [python3-wheel] is the reference implementation of
+	the Python wheel packaging standard, as defined in PEP 427.
+end
+
+source_dl = https://github.com/pypa/wheel/archive/refs/tags/%{version}.tar.gz#/
+
+build
+	requires
+		python3
+		python3-devel
+		python3-setuptools
+	end
+
+	build
+		%{python3} setup.py build
+	end
+
+	install
+		%{python3} setup.py install
+	end
+end
+
+packages
+	package %{name}
+end
-- 
2.34.1

[PATCH 2/4] python3-pip: New package

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1680 bytes --]

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 python3-pip/python3-pip.nm | 46 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 python3-pip/python3-pip.nm

diff --git a/python3-pip/python3-pip.nm b/python3-pip/python3-pip.nm
new file mode 100644
index 000000000..0a5f03345
--- /dev/null
+++ b/python3-pip/python3-pip.nm
@@ -0,0 +1,46 @@
+###############################################################################
+# IPFire.org    - An Open Source Firewall Solution                            #
+# Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
+###############################################################################
+
+name       = python3-pip
+version    = 22.3.1
+release    = 1
+arch       = noarch
+thisapp    = pip-%{version}
+
+groups     = Development/Libraries
+url        = https://github.com/pypa/pip/
+license    = MIT and Python
+summary    = The package installer for Python.
+
+description
+	pip is the Python package installer. It integrates with virtualenv, doesn't
+	do partial installs, can save package state for replaying, can install from
+	non-egg sources, and can install from version control repositories.
+end
+
+source_dl = https://github.com/pypa/pip/archive/refs/tags/%{version}.tar.gz#/
+
+build
+	requires
+		python3
+		python3-devel
+		python3-setuptools
+		python3-wheel
+	end
+
+	export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES = 0
+
+	build
+		%{python3} setup.py build
+	end
+
+	install
+		%{python3} setup.py install
+	end
+end
+
+packages
+	package %{name}
+end
-- 
2.34.1

[PATCH 3/4] python3-{pip,wheel}: Properly build packages

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1515 bytes --]

Reported-by: Michael Tremer <michael.tremer(a)ipfire.org>
Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 python3-pip/python3-pip.nm     | 11 +++++++++--
 python3-wheel/python3-wheel.nm | 10 ++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/python3-pip/python3-pip.nm b/python3-pip/python3-pip.nm
index 0a5f03345..fd74909d2 100644
--- a/python3-pip/python3-pip.nm
+++ b/python3-pip/python3-pip.nm
@@ -5,7 +5,7 @@
 
 name       = python3-pip
 version    = 22.3.1
-release    = 1
+release    = 3
 arch       = noarch
 thisapp    = pip-%{version}
 
@@ -37,10 +37,17 @@ build
 	end
 
 	install
-		%{python3} setup.py install
+		%{python3} setup.py install --root=%{BUILDROOT}
 	end
 end
 
 packages
 	package %{name}
+		requires
+			python3
+			python3-setuptools
+			python3-wheel
+		end
+
+	end
 end
diff --git a/python3-wheel/python3-wheel.nm b/python3-wheel/python3-wheel.nm
index ff7ef8e6d..3fe9fe2a1 100644
--- a/python3-wheel/python3-wheel.nm
+++ b/python3-wheel/python3-wheel.nm
@@ -5,7 +5,7 @@
 
 name       = python3-wheel
 version    = 0.38.4
-release    = 1
+release    = 3
 arch       = noarch
 thisapp    = wheel-%{version}
 
@@ -28,15 +28,21 @@ build
 		python3-setuptools
 	end
 
+	export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES = 0
+
 	build
 		%{python3} setup.py build
 	end
 
 	install
-		%{python3} setup.py install
+		%{python3} setup.py install --root=%{BUILDROOT}
 	end
 end
 
 packages
 	package %{name}
+
+	requires
+		python3
+	end
 end
-- 
2.34.1

[PATCH 4/4] asciidoc: Update to 10.2.0

[Peter Müller]

[-- Attachment #1: Type: text/plain, Size: 1493 bytes --]

Signed-off-by: Peter Müller <peter.mueller(a)ipfire.org>
---
 asciidoc/asciidoc.nm | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm
index 35c8fc434..df3f1c44d 100644
--- a/asciidoc/asciidoc.nm
+++ b/asciidoc/asciidoc.nm
@@ -4,12 +4,13 @@
 ###############################################################################
 
 name       = asciidoc
-version    = 8.6.9
+version    = 10.2.0
 release    = 1
+thisapp    = %{name}-py-%{version}
 arch       = noarch
 
 groups     = Application/System
-url        = http://www.methods.co.nz/asciidoc/
+url        = https://asciidoc.org/
 license    = GPL+ and GPLv2+
 summary    = Text based document generation.
 
@@ -19,20 +20,24 @@ description
 	to HTML and DocBook markups using the asciidoc(1) command.
 end
 
-source_dl  = http://sourceforge.net/projects/asciidoc/files/%{name}/%{version}/
+source_dl  = https://github.com/%{name}-py/asciidoc-py/archive/%{version}/
 
 build
 	requires
-		python
+		autoconf
+		automake
+		docbook-dsssl
+		docbook-xsl
+		libxslt
+		python3-devel
+		python3-pip
 	end
 
-	make_install_targets += docs
-
-	install_cmds
-		# Install python API.
-		install -Dpm 644 asciidocapi.py \
-			%{BUILDROOT}/usr/lib/python${PYTHON_VERSION}/site-packages/asciidocapi.py
+	prepare_cmds
+		autoreconf -vfi
 	end
+
+	make_install_targets += docs
 end
 
 packages
-- 
2.34.1