From patchwork Thu Dec 1 18:53:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 6267 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNQFR2b8jz3whh for ; Thu, 1 Dec 2022 18:53:15 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNQFP2d6lz2sM; Thu, 1 Dec 2022 18:53:13 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNQFP1k42z2yLH; Thu, 1 Dec 2022 18:53:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNQFM2Zktz2xbM for ; Thu, 1 Dec 2022 18:53:11 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNQFJ5qsNzqN for ; Thu, 1 Dec 2022 18:53:08 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669920790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pcDIo9J5XuImF1OCYvq67neh7joaSUKq5jBzzyERF9s=; b=cKzimk51ly+T/BeMnmbmzsxGWIBel1NFvJP9Pu0j6u/FnktcG6WfPPgt77TLxP4J5E+mOh jw0roRg2Z3szi/DA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669920790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pcDIo9J5XuImF1OCYvq67neh7joaSUKq5jBzzyERF9s=; b=BWC0dmA8GB+xWrIA1d01Mj+NN/M4W1ZZwRLPq5VuHyENjb9OIK8eEzVsbPDCUnOwH/2N3m w1l7P3a0pG7JeDTvoFgag5M6B9WuE/5HIC61XrTSmIC2miXWfl6j5I6fBs+e7LuGTTr//6 eliSWLueR6rAC+4fHLDQx+UP39aes5rVf4pfV0h8vr4zPmed0yU06ytfB1K/AzNqJL/bar BOlTujBnJwzgl9XShmX9Qs6x+w75mn6DxCvyNYUQJMVTmKj8P2BSgGsV64gzXSfsQrC4rs gQ8z4ZIqYoKUoXt4ozoawJ3ubbbqYER3KDvVSAfFxUsxFQ565RJ1hb1hK6Aiqw== Message-ID: <50b30ae3-0673-4f5c-1e5c-cdf390a5bbcb@ipfire.org> Date: Thu, 1 Dec 2022 19:53:03 +0100 MIME-Version: 1.0 Content-Language: en-US To: development@lists.ipfire.org From: =?utf-8?q?Peter_M=C3=BCller?= Subject: [PATCH 1/4] python3-wheel: New package X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" 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 --- 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 # +############################################################################### + +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 From patchwork Thu Dec 1 18:53:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 6268 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNQG66wBLz3whh for ; Thu, 1 Dec 2022 18:53:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNQG62V8Hz2pN; Thu, 1 Dec 2022 18:53:50 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNQG62m9Vz2y3Y; Thu, 1 Dec 2022 18:53:50 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNQG43Gzmz2y3Y for ; Thu, 1 Dec 2022 18:53:48 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNQG23K73z2QT for ; Thu, 1 Dec 2022 18:53:45 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669920827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GzC+d2RJz+2PLMm75qRHEjFa2dE2FcZ+W6oRvwwqza0=; b=q4QWrb2LX2F2IoDe4Z82tjptPq2YHpbNyh9mtQdH3liPpAihsMQCwggRWLBpAP2o3HERAb dsTQxreY4K/hqIAw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669920827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GzC+d2RJz+2PLMm75qRHEjFa2dE2FcZ+W6oRvwwqza0=; b=PmSuM+fHmBHG7hDyOqEMdHFA65fp0Z+462nxNc/dVN4P+bKs5QL6Q9whHXkax6nhPOv24Z YuZSjyYtZMXDfzyYbqrE030LLLCHT398KT3uAJlssXBxjOhse/FTkmn6VWw0rEYLqCCobi Yknq2XJf835yXaRCjKpBecWIQ1oIsEXBihZxNSMZ2JeqqqUbiwHFMQjb3J/FrZADQqKT++ /Gf19J0gt9nhp5zPIv5HcwuWDphdZb+NBAcp8zxH/Dgf3rtoCy5mG0GuvslxzZRd9l7ZRc wtKZu658OejUlSRa/04TqsLIo2dLMxvUKNayRJFEjKZadIPg7O8Ln5OvKCjK0A== Message-ID: <879ecb00-f927-edc8-1cca-14c39f75f690@ipfire.org> Date: Thu, 1 Dec 2022 19:53:27 +0100 MIME-Version: 1.0 Subject: [PATCH 2/4] python3-pip: New package Content-Language: en-US To: development@lists.ipfire.org References: <50b30ae3-0673-4f5c-1e5c-cdf390a5bbcb@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <50b30ae3-0673-4f5c-1e5c-cdf390a5bbcb@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Peter Müller --- 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 # +############################################################################### + +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 From patchwork Thu Dec 1 18:54:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 6269 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNQGn0kj5z3whh for ; Thu, 1 Dec 2022 18:54:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNQGm3RWjz2rm; Thu, 1 Dec 2022 18:54:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNQGm3ZGTz2yLH; Thu, 1 Dec 2022 18:54:24 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNQGk6fnKz2xNB for ; Thu, 1 Dec 2022 18:54:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNQGj4Cdgz2pN for ; Thu, 1 Dec 2022 18:54:21 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669920862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+rj9+RbEUFEQo2LCGhbm6b4qaFtU8lNtyspUHnmKtyM=; b=YEyFwuw3nR836hSnNHpv6s3hedkq+ue80w7orGXE1mmg4C1oyEQsJXTSWbalQTPNFCXRCa DTI//UrC7r/ZXMDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669920862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=+rj9+RbEUFEQo2LCGhbm6b4qaFtU8lNtyspUHnmKtyM=; b=QCIsM6w2Ci9LhBQ1CtzIrs7NjLHZF4kZr1F7jMi6X0V4Nh7SMkB08VdosjnO3jTn49UNUO sjOaRr7O7iXjKWULFx+ub73u15NQvfe9cizHykyssOwMjttWt30PoE6DqHNP0nETcbc4om TVvCAtkY9MYWLimjMcFZTPQ//s83ei2FziDCDhvFpzFHYRNS4ERHm0SU8CGHuHT0FFuX1Q AshgglCLI0bHCB089PDjKapu0kgEzmXEVn+LkO5Cikhlq9GdfuuKRoK8Mv/OY+hkBaK/Mu 9FzEw53nSc48ho3Cm3eDVdFj/M9TBNGhgdB5+uZ+2ZOm0FDrvF9LUdRkngv+uw== Message-ID: Date: Thu, 1 Dec 2022 19:54:06 +0100 MIME-Version: 1.0 Subject: [PATCH 3/4] python3-{pip,wheel}: Properly build packages Content-Language: en-US To: development@lists.ipfire.org References: <50b30ae3-0673-4f5c-1e5c-cdf390a5bbcb@ipfire.org> <879ecb00-f927-edc8-1cca-14c39f75f690@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: <879ecb00-f927-edc8-1cca-14c39f75f690@ipfire.org> X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Reported-by: Michael Tremer Signed-off-by: Peter Müller --- 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 From patchwork Thu Dec 1 18:54:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Peter_M=C3=BCller?= X-Patchwork-Id: 6270 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NNQHJ1g1gz3whh for ; Thu, 1 Dec 2022 18:54:52 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NNQHH4Nl0z1Py; Thu, 1 Dec 2022 18:54:51 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NNQHH4Xw5z2y3Y; Thu, 1 Dec 2022 18:54:51 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NNQHG09SFz2xNB for ; Thu, 1 Dec 2022 18:54:50 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384)) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4NNQHD4cHZzqN for ; Thu, 1 Dec 2022 18:54:48 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1669920889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9MU65kLG4AVuah9fJ/jLcCQzQUgzqSq3W2rDYGPFXVA=; b=kxm8cTUcDHFzvNWCIcdOeRwUaf14oWATNeXPdG78/om48H26GrAt33OO8Wr6RO0oPLZpHg 8eAcjC6WeeV8VhBA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1669920889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9MU65kLG4AVuah9fJ/jLcCQzQUgzqSq3W2rDYGPFXVA=; b=VtMlaCwfzH+Crxht472Ivoc3xBZIty7SbvXHaI2mgaKxJ4FCIR92J6E3QCcWLRLGzvt9ol zOalvfKSUWszYkzVMpWQ+2YF10owRnFD5v8zXh9SlCU+uzoJc619+YEIA7CDy4L8xnAeaf lnu7K20M8adLowatrdinALWBYehta77BrmpDYyyGFYvS34EDYDESwY6l3Ln7DidfIBThix shC3lve2YO10Yoa8Wsa/ka3IYeTkKEuktsR1yShS1kN/Irilm4rVqpBL27C6m9mRMy/DU8 nISxp2MnKvTW7yx5X3CQdpB3IM4yd5V73RU65O/YEIImJfKUoUwHbL3UubB5aw== Message-ID: <78f57a42-afc6-54c5-d0ab-415ea195d2e7@ipfire.org> Date: Thu, 1 Dec 2022 19:54:47 +0100 MIME-Version: 1.0 Subject: [PATCH 4/4] asciidoc: Update to 10.2.0 Content-Language: en-US To: development@lists.ipfire.org References: <50b30ae3-0673-4f5c-1e5c-cdf390a5bbcb@ipfire.org> <879ecb00-f927-edc8-1cca-14c39f75f690@ipfire.org> From: =?utf-8?q?Peter_M=C3=BCller?= In-Reply-To: X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Peter Müller --- 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