public inbox for ipfire-scm@lists.ipfire.org
 help / color / mirror / Atom feed
* [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5cd803df8fbcdd03e339cd0107c4ac7dc00f3cd4
@ 2023-08-29 19:50 Michael Tremer
  0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2023-08-29 19:50 UTC (permalink / raw)
  To: ipfire-scm

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

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  5cd803df8fbcdd03e339cd0107c4ac7dc00f3cd4 (commit)
       via  0e5bdeb9482c0d04af07f45e21221be49ef84c40 (commit)
       via  84587bfeed67a811f2546a0c19e02991b56af26c (commit)
       via  dfe51d81442ca2fddd256e6989a3128b39b46f9c (commit)
      from  51cb30aed39d2dd6641c3c5790717844f30285bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5cd803df8fbcdd03e339cd0107c4ac7dc00f3cd4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 29 19:49:51 2023 +0000

    Change how we make packages "noarch"
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 0e5bdeb9482c0d04af07f45e21221be49ef84c40
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 29 18:31:20 2023 +0000

    libarchive: Update to 3.7.1
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit 84587bfeed67a811f2546a0c19e02991b56af26c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 29 15:57:13 2023 +0000

    *: Change how we define build architectures
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

commit dfe51d81442ca2fddd256e6989a3128b39b46f9c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Tue Aug 29 15:56:40 2023 +0000

    gcc: Update to 12.3.0
    
    Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>

-----------------------------------------------------------------------

Summary of changes:
 asciidoc/asciidoc.nm                               |  3 +-
 autoconf/autoconf.nm                               |  3 +-
 automake/automake.nm                               |  3 +-
 basesystem/basesystem.nm                           |  3 +-
 bash-completion/bash-completion.nm                 |  5 ++-
 ca-certificates/ca-certificates.nm                 |  3 +-
 crontabs/crontabs.nm                               |  3 +-
 ddns/ddns.nm                                       |  3 +-
 dejagnu/dejagnu.nm                                 |  3 +-
 docbook-dsssl/docbook-dsssl.nm                     |  3 +-
 docbook-dtds/docbook-dtds.nm                       |  3 +-
 docbook-xsl/docbook-xsl.nm                         |  3 +-
 firmware-update/firmware-update.nm                 |  3 +-
 gcc/gcc.nm                                         |  4 +--
 grub/grub.nm                                       |  5 ++-
 help2man/help2man.nm                               |  3 +-
 hwdata/hwdata.nm                                   |  5 ++-
 hyperscan/hyperscan.nm                             |  6 ++--
 intel-microcode/intel-microcode.nm                 |  3 +-
 intltool/intltool.nm                               |  3 +-
 ipfire-logos/ipfire-logos.nm                       |  3 +-
 ipfire-release/ipfire-release.nm                   |  3 +-
 kernel-updater/kernel-updater.nm                   |  3 +-
 libarchive/libarchive.nm                           |  4 +--
 ...Do-not-include-sys-mount.h-when-linux-fs..patch | 40 ----------------------
 linux-firmware/linux-firmware.nm                   |  3 +-
 man-pages/man-pages.nm                             |  3 +-
 memtest86+/memtest86+.nm                           |  3 +-
 meson/meson.nm                                     |  3 +-
 pcengines-apu-firmware/pcengines-apu-firmware.nm   |  3 +-
 perl-Authen-SASL/perl-Authen-SASL.nm               |  3 +-
 .../perl-Class-Method-Modifiers.nm                 |  3 +-
 perl-Convert-ASN1/perl-Convert-ASN1.nm             |  3 +-
 .../perl-Crypt-OpenSSL-Guess.nm                    |  3 +-
 perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm       |  3 +-
 perl-Digest-HMAC/perl-Digest-HMAC.nm               |  3 +-
 perl-File-HomeDir/perl-File-HomeDir.nm             |  3 +-
 perl-File-Remove/perl-File-Remove.nm               |  3 +-
 perl-File-Which/perl-File-Which.nm                 |  3 +-
 perl-Font-TTF/perl-Font-TTF.nm                     |  3 +-
 perl-HTML-Tagset/perl-HTML-Tagset.nm               |  3 +-
 perl-IO-All/perl-IO-All.nm                         |  3 +-
 perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm           |  3 +-
 perl-JSON/perl-JSON.nm                             |  3 +-
 .../perl-Module-Install-AuthorRequires.nm          |  3 +-
 .../perl-Module-Install-ManifestSkip.nm            |  3 +-
 perl-Module-Install/perl-Module-Install.nm         |  3 +-
 perl-Module-Package/perl-Module-Package.nm         |  3 +-
 perl-Moo/perl-Moo.nm                               |  3 +-
 perl-Net-HTTP/perl-Net-HTTP.nm                     |  3 +-
 perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm             |  3 +-
 perl-Role-Tiny/perl-Role-Tiny.nm                   |  3 +-
 perl-SGMLSpm/perl-SGMLSpm.nm                       |  3 +-
 perl-Sub-Quote/perl-Sub-Quote.nm                   |  3 +-
 perl-TimeDate/perl-TimeDate.nm                     |  3 +-
 perl-URI/perl-URI.nm                               |  3 +-
 .../perl-XML-NamespaceSupport.nm                   |  3 +-
 perl-XML-SAX-Base/perl-XML-SAX-Base.nm             |  3 +-
 perl-XML-SAX/perl-XML-SAX.nm                       |  3 +-
 perl-YAML-Tiny/perl-YAML-Tiny.nm                   |  3 +-
 perl-YAML/perl-YAML.nm                             |  3 +-
 perl-common-sense/perl-common-sense.nm             |  3 +-
 python3-docutils/python3-docutils.nm               |  3 +-
 python3-setuptools/python3-setuptools.nm           |  3 +-
 setup/setup.nm                                     |  3 +-
 sgml-common/sgml-common.nm                         |  3 +-
 tzdata/tzdata.nm                                   |  3 +-
 usb-modeswitch-data/usb-modeswitch-data.nm         |  3 +-
 wireless-regdb/wireless-regdb.nm                   |  3 +-
 69 files changed, 141 insertions(+), 114 deletions(-)
 delete mode 100644 libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch

Difference in files:
diff --git a/asciidoc/asciidoc.nm b/asciidoc/asciidoc.nm
index e2691b956..9a2ee0bf2 100644
--- a/asciidoc/asciidoc.nm
+++ b/asciidoc/asciidoc.nm
@@ -7,7 +7,6 @@ name       = asciidoc
 version    = 10.2.0
 release    = 1
 thisapp    = %{name}-py-%{version}
-arch       = noarch
 
 groups     = Application/System
 url        = https://asciidoc.org/
@@ -23,6 +22,8 @@ end
 source_dl  = https://github.com/%{name}-py/asciidoc-py/archive/%{version}/
 
 build
+	arches = noarch
+
 	requires
 		autoconf
 		docbook-dsssl
diff --git a/autoconf/autoconf.nm b/autoconf/autoconf.nm
index 3f6bec327..259b6c9e5 100644
--- a/autoconf/autoconf.nm
+++ b/autoconf/autoconf.nm
@@ -6,7 +6,6 @@
 name       = autoconf
 version    = 2.71
 release    = 2
-arch       = noarch
 
 groups     = Development/Tools
 url        = https://www.gnu.org/software/autoconf/
@@ -24,6 +23,8 @@ source_dl  = https://ftp.gnu.org/gnu/autoconf/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	requires
 		m4
 		perl
diff --git a/automake/automake.nm b/automake/automake.nm
index 96df054ef..4254c770d 100644
--- a/automake/automake.nm
+++ b/automake/automake.nm
@@ -6,7 +6,6 @@
 name       = automake
 version    = 1.16.5
 release    = 1
-arch       = noarch
 
 groups     = Development/Tools
 url        = htts://www.gnu.org/software/automake/
@@ -24,6 +23,8 @@ sources    = %{thisapp}.tar.xz
 required_autoconf_version = 2.62
 
 build
+	arches = noarch
+
 	requires
 		autoconf >= %{required_autoconf_version}
 		perl(threads)
diff --git a/basesystem/basesystem.nm b/basesystem/basesystem.nm
index 889e8d7fe..bbb8c53b5 100644
--- a/basesystem/basesystem.nm
+++ b/basesystem/basesystem.nm
@@ -6,7 +6,6 @@
 name       = basesystem
 version    = 2.99
 release    = 4.2
-arch       = noarch
 
 groups     = Base System/Base
 url        =
@@ -22,6 +21,8 @@ end
 sources   =
 
 build
+	arches = noarch
+
 	build
 		: # Nothing to do.
 	end
diff --git a/bash-completion/bash-completion.nm b/bash-completion/bash-completion.nm
index faabcfa62..dd08338a0 100644
--- a/bash-completion/bash-completion.nm
+++ b/bash-completion/bash-completion.nm
@@ -6,7 +6,6 @@
 name       = bash-completion
 version    = 2.11
 release    = 1
-arch       = noarch
 
 groups     = Development/Languages
 url        = https://github.com/scop/bash-completion
@@ -21,6 +20,10 @@ end
 source_dl  = https://github.com/scop/bash-completion/releases/download/%{version}/
 sources    = %{thisapp}.tar.xz
 
+build
+	arches = noarch
+end
+
 packages
 	package %{name}
 		requires
diff --git a/ca-certificates/ca-certificates.nm b/ca-certificates/ca-certificates.nm
index fadabdce0..c06d3cc6e 100644
--- a/ca-certificates/ca-certificates.nm
+++ b/ca-certificates/ca-certificates.nm
@@ -6,7 +6,6 @@
 name       = ca-certificates
 version    = 2022.12
 release    = 2
-arch       = noarch
 
 groups     = System/Base
 url        = https://www.mozilla.org/
@@ -22,6 +21,8 @@ end
 sources    =
 
 build
+	arches = noarch
+
 	requires
 		openssl
 		p11-kit
diff --git a/crontabs/crontabs.nm b/crontabs/crontabs.nm
index 571f530d7..f37dcc3fe 100644
--- a/crontabs/crontabs.nm
+++ b/crontabs/crontabs.nm
@@ -7,7 +7,6 @@ name       = crontabs
 version    = 1.11
 snap_rel   = 20190603
 release    = 1.%{snap_rel}
-arch       = noarch
 
 groups     = System/Base
 url        = https://github.com/cronie-crond/crontabs
@@ -31,6 +30,8 @@ source_dl  = https://github.com/cronie-crond/crontabs/releases/download/crontabs
 sources    = %{name}-%{version}-%{snap_rel}git.tar.gz
 
 build
+	arches = noarch
+
 	build
 		# empty
 	end
diff --git a/ddns/ddns.nm b/ddns/ddns.nm
index 005d90e23..f2cd19bfb 100644
--- a/ddns/ddns.nm
+++ b/ddns/ddns.nm
@@ -6,7 +6,6 @@
 name       = ddns
 version    = 014
 release    = 1
-arch       = noarch
 
 groups     = System/Tools
 url        = https://www.ipfire.org
@@ -22,6 +21,8 @@ source_dl  = https://source.ipfire.org/releases/ddns/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	requires
 		autoconf
 		automake
diff --git a/dejagnu/dejagnu.nm b/dejagnu/dejagnu.nm
index 1f95e0104..e4aed70e4 100644
--- a/dejagnu/dejagnu.nm
+++ b/dejagnu/dejagnu.nm
@@ -6,7 +6,6 @@
 name       = dejagnu
 version    = 1.6.3
 release    = 1.1
-arch       = noarch
 
 groups     = Development/Tools
 url        = https://www.gnu.org/software/dejagnu/
@@ -20,6 +19,8 @@ end
 source_dl  = https://ftp.gnu.org/gnu/dejagnu/
 
 build
+	arches = noarch
+
 	requires
 		bison
 		expect
diff --git a/docbook-dsssl/docbook-dsssl.nm b/docbook-dsssl/docbook-dsssl.nm
index b835a962b..7127156ec 100644
--- a/docbook-dsssl/docbook-dsssl.nm
+++ b/docbook-dsssl/docbook-dsssl.nm
@@ -6,7 +6,6 @@
 name       = docbook-dsssl
 version    = 1.79
 release    = 2
-arch       = noarch
 
 groups     = Applications/Text
 url        = http://docbook.sourceforge.net/
@@ -21,6 +20,8 @@ end
 source_dl = http://prdownloads.sourceforge.net/docbook/
 
 build
+	arches = noarch
+
 	requires
 		sgml-common
 	end
diff --git a/docbook-dtds/docbook-dtds.nm b/docbook-dtds/docbook-dtds.nm
index 1ed875384..df96fbab8 100644
--- a/docbook-dtds/docbook-dtds.nm
+++ b/docbook-dtds/docbook-dtds.nm
@@ -6,7 +6,6 @@
 name       = docbook-dtds
 version    = 1.0
 release    = 7
-arch       = noarch
 
 groups     = Applications/Text
 url        = http://www.oasis-open.org/docbook/
@@ -52,6 +51,8 @@ directories = \
 	4.5-xml
 
 build
+	arches = noarch
+
 	requires
 		dos2unix
 		unzip>=6.0-3
diff --git a/docbook-xsl/docbook-xsl.nm b/docbook-xsl/docbook-xsl.nm
index 0ae968c93..988181f22 100644
--- a/docbook-xsl/docbook-xsl.nm
+++ b/docbook-xsl/docbook-xsl.nm
@@ -6,7 +6,6 @@
 name       = docbook-xsl
 version    = 1.79.2
 release    = 3
-arch       = noarch
 
 groups     = Applications/Text
 url        = https://docbook.sourceforge.net/projects/xsl/
@@ -23,6 +22,8 @@ source_dl = https://github.com/docbook/xslt10-stylesheets/releases/download/rele
 sources = %{thisapp}.tar.bz2
 
 build
+	arches = noarch
+
 	build
 		# Nothing to do.
 	end
diff --git a/firmware-update/firmware-update.nm b/firmware-update/firmware-update.nm
index d43e3a6af..b9814984d 100644
--- a/firmware-update/firmware-update.nm
+++ b/firmware-update/firmware-update.nm
@@ -6,7 +6,6 @@
 name       = firmware-update
 version    = 20190329
 release    = 1
-arch       = noarch
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = System/Tools
@@ -21,6 +20,8 @@ end
 source_dl  = https://source.ipfire.org/releases/firmware-update/
 
 build
+	arches = noarch
+
 	requires
 		autoconf
 		automake
diff --git a/gcc/gcc.nm b/gcc/gcc.nm
index cf0274268..6f304cdf0 100644
--- a/gcc/gcc.nm
+++ b/gcc/gcc.nm
@@ -7,8 +7,8 @@
 build_graphite = 1
 
 name       = gcc
-version    = 12.2.0
-release    = 5
+version    = 12.3.0
+release    = 1
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Development/Compilers
diff --git a/grub/grub.nm b/grub/grub.nm
index e5ad722d0..e5ea727b4 100644
--- a/grub/grub.nm
+++ b/grub/grub.nm
@@ -7,9 +7,6 @@ name       = grub
 version    = 2.06
 release    = 1.1
 
-sup_arches = aarch64 x86_64
-thisapp    = %{name}-%{version}
-
 groups     = System/Boot
 url        = https://www.gnu.org/software/grub/
 license    = GPLv3
@@ -26,6 +23,8 @@ source_dl  = https://ftp.gnu.org/gnu/grub/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = aarch64 x86_64
+
 	requires
 		autoconf
 		automake
diff --git a/help2man/help2man.nm b/help2man/help2man.nm
index 7462bf4b7..4b3afa150 100644
--- a/help2man/help2man.nm
+++ b/help2man/help2man.nm
@@ -6,7 +6,6 @@
 name       = help2man
 version    = 1.49.3
 release    = 1
-arch       = noarch
 
 groups     = Development/Tools
 url        = https://www.gnu.org/software/help2man
@@ -26,6 +25,8 @@ source_dl  = https://ftp.gnu.org/gnu/help2man/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	requires
 		%{bindir}/perl
 	end
diff --git a/hwdata/hwdata.nm b/hwdata/hwdata.nm
index 94b5d43cc..46ef8c483 100644
--- a/hwdata/hwdata.nm
+++ b/hwdata/hwdata.nm
@@ -6,7 +6,6 @@
 name       = hwdata
 version    = 0.366
 release    = 1
-arch       = noarch
 
 groups     = System/Base
 url        = https://github.com/vcrhonek/hwdata
@@ -20,6 +19,10 @@ end
 
 source_dl  = https://github.com/vcrhonek/hwdata/archive/v%{version}.tar.gz#/
 
+build
+	arches = noarch
+end
+
 packages
 	package %{name}
 end
diff --git a/hyperscan/hyperscan.nm b/hyperscan/hyperscan.nm
index a0a437e65..793a5729f 100644
--- a/hyperscan/hyperscan.nm
+++ b/hyperscan/hyperscan.nm
@@ -7,9 +7,6 @@ name       = hyperscan
 version    = 5.4.0
 release    = 1.1
 
-# This won't build on any architectures but those
-sup_arches = x86_64
-
 groups     = System/Libraries
 url        = https://github.com/intel/hyperscan
 license    = BSD
@@ -29,6 +26,9 @@ end
 source_dl  = https://github.com/intel/hyperscan/archive/v%{version}.tar.gz#/
 
 build
+	# This package only supports x86_64
+	arches = x86_64
+
 	requires
 		boost-devel >= 1.57
 		cmake
diff --git a/intel-microcode/intel-microcode.nm b/intel-microcode/intel-microcode.nm
index b29557baf..c0454d731 100644
--- a/intel-microcode/intel-microcode.nm
+++ b/intel-microcode/intel-microcode.nm
@@ -6,7 +6,6 @@
 name       = intel-microcode
 version    = 20221108
 release    = 2
-arch       = noarch
 thisapp    = microcode-%{version}
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
@@ -23,6 +22,8 @@ end
 source_dl  = https://github.com/intel/Intel-Linux-Processor-Microcode-Data-Files/archive/
 
 build
+	arches = noarch
+
 	build
 		: # Nothing to do.
 	end
diff --git a/intltool/intltool.nm b/intltool/intltool.nm
index bedcc53a7..9aa17d151 100644
--- a/intltool/intltool.nm
+++ b/intltool/intltool.nm
@@ -6,7 +6,6 @@
 name       = intltool
 version    = 0.51.0
 release    = 2
-arch       = noarch
 
 groups     = Localization/Tools
 url        = https://launchpad.net/intltool
@@ -22,6 +21,8 @@ end
 source_dl  = http://edge.launchpad.net/intltool/trunk/%{version}/+download/
 
 build
+	arches = noarch
+
 	requires
 		expat-devel
 		gettext
diff --git a/ipfire-logos/ipfire-logos.nm b/ipfire-logos/ipfire-logos.nm
index dce866c7e..d99f00ccf 100644
--- a/ipfire-logos/ipfire-logos.nm
+++ b/ipfire-logos/ipfire-logos.nm
@@ -6,7 +6,6 @@
 name       = ipfire-logos
 version    = 4
 release    = 1
-arch       = noarch
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 url        = http://www.ipfire.org
@@ -21,6 +20,8 @@ end
 source_dl  = https://source.ipfire.org/releases/%{name}/
 
 build
+	arches = noarch
+
 	requires
 		ImageMagick
 		ghostscript
diff --git a/ipfire-release/ipfire-release.nm b/ipfire-release/ipfire-release.nm
index db41d322c..d9020cd8d 100644
--- a/ipfire-release/ipfire-release.nm
+++ b/ipfire-release/ipfire-release.nm
@@ -15,7 +15,6 @@ DISTRO_COLOR    = 0;31
 name       = %{DISTRO_SNAME}-release
 version    = %{DISTRO_VERSION}
 release    = 7
-arch       = noarch
 
 maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
 groups     = Base Build System/Base
@@ -32,6 +31,8 @@ end
 sources    =
 
 build
+	arches = noarch
+
 	prepare = # Do nothing
 	build = # Do nothing
 
diff --git a/kernel-updater/kernel-updater.nm b/kernel-updater/kernel-updater.nm
index d5bbc94ac..ee76f6f6a 100644
--- a/kernel-updater/kernel-updater.nm
+++ b/kernel-updater/kernel-updater.nm
@@ -6,7 +6,6 @@
 name       = kernel-updater
 version    = 20190621
 release    = 1
-arch       = noarch
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
 groups     = System/Tools
@@ -23,6 +22,8 @@ source_dl  = https://source.ipfire.org/releases/%{name}/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	requires
 		autoconf
 		automake
diff --git a/libarchive/libarchive.nm b/libarchive/libarchive.nm
index 337c9afae..f04a02fac 100644
--- a/libarchive/libarchive.nm
+++ b/libarchive/libarchive.nm
@@ -4,8 +4,8 @@
 ###############################################################################
 
 name       = libarchive
-version    = 3.6.1
-release    = 2
+version    = 3.7.1
+release    = 1
 
 groups     = System/Libraries
 url        = http://www.libarchive.org/
diff --git a/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch b/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
deleted file mode 100644
index 0ce2d8d82..000000000
--- a/libarchive/patches/libarchive-Do-not-include-sys-mount.h-when-linux-fs..patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From a2f68263a1da5ad227bcb9cd8fa91b93c8b6c99f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem(a)gmail.com>
-Date: Mon, 25 Jul 2022 10:56:53 -0700
-Subject: [PATCH] libarchive: Do not include sys/mount.h when linux/fs.h is present
-
-These headers are in conflict and only one is needed by
-archive_read_disk_posix.c therefore include linux/fs.h if it exists
-otherwise include sys/mount.h
-
-It also helps compiling with glibc 2.36
-where sys/mount.h conflicts with linux/mount.h see [1]
-
-[1] https://sourceware.org/glibc/wiki/Release/2.36
----
- libarchive/archive_read_disk_posix.c | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/libarchive/archive_read_disk_posix.c b/libarchive/archive_read_disk_posix.c
-index 2b39e672..a96008db 100644
---- a/libarchive/archive_read_disk_posix.c
-+++ b/libarchive/archive_read_disk_posix.c
-@@ -34,9 +34,6 @@ __FBSDID("$FreeBSD$");
- #ifdef HAVE_SYS_PARAM_H
- #include <sys/param.h>
- #endif
--#ifdef HAVE_SYS_MOUNT_H
--#include <sys/mount.h>
--#endif
- #ifdef HAVE_SYS_STAT_H
- #include <sys/stat.h>
- #endif
-@@ -54,6 +51,8 @@ __FBSDID("$FreeBSD$");
- #endif
- #ifdef HAVE_LINUX_FS_H
- #include <linux/fs.h>
-+#elif HAVE_SYS_MOUNT_H
-+#include <sys/mount.h>
- #endif
- /*
-  * Some Linux distributions have both linux/ext2_fs.h and ext2fs/ext2_fs.h.
diff --git a/linux-firmware/linux-firmware.nm b/linux-firmware/linux-firmware.nm
index 08b6e9b1d..53413eacf 100644
--- a/linux-firmware/linux-firmware.nm
+++ b/linux-firmware/linux-firmware.nm
@@ -6,7 +6,6 @@
 name       = linux-firmware
 version    = 20221214
 release    = 1
-arch       = noarch
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
 groups     = System/Libraries
@@ -24,6 +23,8 @@ end
 source_dl  = https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/
 
 build
+	arches = noarch
+
 	build
 		: # Nothing to do.
 	end
diff --git a/man-pages/man-pages.nm b/man-pages/man-pages.nm
index 00040c32d..dafd46c99 100644
--- a/man-pages/man-pages.nm
+++ b/man-pages/man-pages.nm
@@ -6,7 +6,6 @@
 name       = man-pages
 version    = 6.03
 release    = 1
-arch       = noarch
 
 groups     = Base Documentation
 url        = http://www.kernel.org/pub/linux/docs/man-pages/
@@ -22,6 +21,8 @@ source_dl  = http://www.kernel.org/pub/linux/docs/man-pages/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	prepare_cmds
 		# Remove deprecated/unneeded stuff:
 
diff --git a/memtest86+/memtest86+.nm b/memtest86+/memtest86+.nm
index d62137d83..37ccce8d4 100644
--- a/memtest86+/memtest86+.nm
+++ b/memtest86+/memtest86+.nm
@@ -7,7 +7,6 @@ name       = memtest86+
 version    = 6.10
 release    = 1
 thisapp    = memtest86plus-%{version}
-sup_arches = x86_64
 
 groups     = System/Base
 url        = http://www.memtest.org/
@@ -25,6 +24,8 @@ source_dl  = https://github.com/memtest86plus/memtest86plus/archive/refs/tags/v%
 sources    = %{thisapp}.tar.gz
 
 build
+	arches = x86_64
+
 	requires
 		dosfstools
 	end
diff --git a/meson/meson.nm b/meson/meson.nm
index 75c0ba085..6daee06ce 100644
--- a/meson/meson.nm
+++ b/meson/meson.nm
@@ -6,7 +6,6 @@
 name       = meson
 version    = 0.64.1
 release    = 1
-arch	   = noarch
 
 groups     = Applications/System
 url        = https://mesonbuild.com/
@@ -23,6 +22,8 @@ end
 source_dl  = https://github.com/mesonbuild/meson/archive/%{version}/
 
 build
+	arches = noarch
+
 	requires
 		bison
 		boost-devel
diff --git a/pcengines-apu-firmware/pcengines-apu-firmware.nm b/pcengines-apu-firmware/pcengines-apu-firmware.nm
index e2b5aab4e..ce2a452b2 100644
--- a/pcengines-apu-firmware/pcengines-apu-firmware.nm
+++ b/pcengines-apu-firmware/pcengines-apu-firmware.nm
@@ -6,7 +6,6 @@
 name       = pcengines-apu-firmware
 version    = 4.10.0.0
 release    = 1
-arch       = noarch
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
 groups     = System/Firmware
@@ -35,6 +34,8 @@ sources  = \
 	apu5_v%{version}.rom
 
 build
+	arches = noarch
+
 	MACRO_EXTRACT = : # Do not attempt to extract the binary files
 
 	build
diff --git a/perl-Authen-SASL/perl-Authen-SASL.nm b/perl-Authen-SASL/perl-Authen-SASL.nm
index 9415808a1..0c6de44dc 100644
--- a/perl-Authen-SASL/perl-Authen-SASL.nm
+++ b/perl-Authen-SASL/perl-Authen-SASL.nm
@@ -6,7 +6,6 @@
 name       = perl-Authen-SASL
 version    = 2.16
 release    = 2
-arch       = noarch
 thisapp    = Authen-SASL-%{version}
 
 groups     = Development/Libraries
@@ -23,6 +22,8 @@ end
 source_dl  = http://www.cpan.org/authors/id/G/GB/GBARR/
 
 build
+	arches = noarch
+
 	requires
 		perl(FindBin)
 		perl(Digest::HMAC)
diff --git a/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm b/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm
index e90ef3004..64d183b7d 100644
--- a/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm
+++ b/perl-Class-Method-Modifiers/perl-Class-Method-Modifiers.nm
@@ -7,7 +7,6 @@ name       = perl-Class-Method-Modifiers
 version    = 2.14
 release    = 1
 thisapp    = Class-Method-Modifiers-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/Class-Method-Modifiers/
@@ -22,6 +21,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
 
 build
+	arches = noarch
+
 	requires
 		perl(B)
 		perl(Carp)
diff --git a/perl-Convert-ASN1/perl-Convert-ASN1.nm b/perl-Convert-ASN1/perl-Convert-ASN1.nm
index 60a316076..68c745983 100644
--- a/perl-Convert-ASN1/perl-Convert-ASN1.nm
+++ b/perl-Convert-ASN1/perl-Convert-ASN1.nm
@@ -6,7 +6,6 @@
 name       = perl-Convert-ASN1
 version    = 0.33
 release    = 1
-arch       = noarch
 thisapp    = Convert-ASN1-%{version}
 
 groups     = Development/Libraries
@@ -21,6 +20,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/T/TI/TIMLEGGE/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 	end
diff --git a/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm b/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm
index af137f220..4a54e508a 100644
--- a/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm
+++ b/perl-Crypt-OpenSSL-Guess/perl-Crypt-OpenSSL-Guess.nm
@@ -6,7 +6,6 @@
 name       = perl-Crypt-OpenSSL-Guess
 version    = 0.15
 release    = 1
-arch       = noarch
 thisapp    = Crypt-OpenSSL-Guess-%{version}
 
 groups     = Development/Libraries
@@ -21,6 +20,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/A/AK/AKIYM/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 	end
diff --git a/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm b/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm
index 25b9fae6d..51e74049d 100644
--- a/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm
+++ b/perl-Crypt-PasswdMD5/perl-Crypt-PasswdMD5.nm
@@ -6,7 +6,6 @@
 name       = perl-Crypt-PasswdMD5
 version    = 1.40
 release    = 1
-arch       = noarch
 thisapp    = Crypt-PasswdMD5-%{version}
 
 groups     = Development/Libraries
@@ -22,6 +21,8 @@ source_dl  = http://search.cpan.org/CPAN/authors/id/R/RS/RSAVAGE/
 sources    = %{thisapp}.tgz
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 	end
diff --git a/perl-Digest-HMAC/perl-Digest-HMAC.nm b/perl-Digest-HMAC/perl-Digest-HMAC.nm
index 5f1ce5f0d..284c9d69a 100644
--- a/perl-Digest-HMAC/perl-Digest-HMAC.nm
+++ b/perl-Digest-HMAC/perl-Digest-HMAC.nm
@@ -6,7 +6,6 @@
 name       = perl-Digest-HMAC
 version    = 1.03
 release    = 1
-arch       = noarch
 thisapp    = Digest-HMAC-%{version}
 
 groups     = Development/Libraries
@@ -24,6 +23,8 @@ end
 source_dl  = http://www.cpan.org/authors/id/G/GA/GAAS/
 
 build
+	arches = noarch
+
 	requires
 		perl(Digest::MD5)
 		perl(Digest::SHA1)
diff --git a/perl-File-HomeDir/perl-File-HomeDir.nm b/perl-File-HomeDir/perl-File-HomeDir.nm
index 406b08538..66d314576 100644
--- a/perl-File-HomeDir/perl-File-HomeDir.nm
+++ b/perl-File-HomeDir/perl-File-HomeDir.nm
@@ -6,7 +6,6 @@
 name       = perl-File-HomeDir
 version    = 1.00
 release    = 1.2
-arch       = noarch
 thisapp    = File-HomeDir-%{version}
 
 groups     = Development/Libraries
@@ -24,6 +23,8 @@ end
 source_dl  = http://www.cpan.org/authors/id/A/AD/ADAMK/
 
 build
+	arch = noarch
+
 	requires
 		perl
 		perl(Config)
diff --git a/perl-File-Remove/perl-File-Remove.nm b/perl-File-Remove/perl-File-Remove.nm
index f3717c2cc..bdcbb8b49 100644
--- a/perl-File-Remove/perl-File-Remove.nm
+++ b/perl-File-Remove/perl-File-Remove.nm
@@ -6,7 +6,6 @@
 name       = perl-File-Remove
 version    = 1.61
 release    = 1
-arch       = noarch
 thisapp    = File-Remove-%{version}
 
 groups     = Development/Libraries
@@ -25,6 +24,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/S/SH/SHLOMIF/
 
 build
+	arches = noarch
+
 	requires
 		perl(blib)
 		perl(IPC::Open3)
diff --git a/perl-File-Which/perl-File-Which.nm b/perl-File-Which/perl-File-Which.nm
index 76aa89001..fb476146d 100644
--- a/perl-File-Which/perl-File-Which.nm
+++ b/perl-File-Which/perl-File-Which.nm
@@ -6,7 +6,6 @@
 name       = perl-File-Which
 version    = 1.27
 release    = 1
-arch       = noarch
 thisapp    = File-Which-%{version}
 
 groups     = Development/Libraries
@@ -25,6 +24,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/P/PL/PLICEASE/
 
 build
+	arches = noarch
+
 	requires
 		perl(Env)
 		perl(ExtUtils::MakeMaker) >= 6.42
diff --git a/perl-Font-TTF/perl-Font-TTF.nm b/perl-Font-TTF/perl-Font-TTF.nm
index fc0fd19b9..f2a08f0e7 100644
--- a/perl-Font-TTF/perl-Font-TTF.nm
+++ b/perl-Font-TTF/perl-Font-TTF.nm
@@ -6,7 +6,6 @@
 name       = perl-Font-TTF
 version    = 0.48
 release    = 1
-arch       = noarch
 thisapp    = Font-TTF-%{version}
 
 groups     = Development/Libraries
@@ -25,6 +24,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/M/MH/MHOSKEN/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(ExtUtils::ParseXS)
diff --git a/perl-HTML-Tagset/perl-HTML-Tagset.nm b/perl-HTML-Tagset/perl-HTML-Tagset.nm
index cb6f21ac6..b705f6c5b 100644
--- a/perl-HTML-Tagset/perl-HTML-Tagset.nm
+++ b/perl-HTML-Tagset/perl-HTML-Tagset.nm
@@ -6,7 +6,6 @@
 name       = perl-HTML-Tagset
 version    = 3.20
 release    = 2
-arch       = noarch
 thisapp    = HTML-Tagset-%{version}
 
 groups     = Development/Libratries
@@ -22,6 +21,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/P/PE/PETDANCE/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Test::More)
diff --git a/perl-IO-All/perl-IO-All.nm b/perl-IO-All/perl-IO-All.nm
index c903b9ac3..d0477f0dc 100644
--- a/perl-IO-All/perl-IO-All.nm
+++ b/perl-IO-All/perl-IO-All.nm
@@ -7,7 +7,6 @@ name       = perl-IO-All
 version    = 0.87
 release    = 1
 thisapp    = IO-All-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/IO-All/
@@ -25,6 +24,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/F/FR/FREW/
 
 build
+	arches = noarch
+
 	requires
 		perl(FindBin)
 		perl(ExtUtils::MakeMaker)
diff --git a/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
index e5f438697..5c06f8954 100644
--- a/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
+++ b/perl-IO-Socket-SSL/perl-IO-Socket-SSL.nm
@@ -6,7 +6,6 @@
 name       = perl-IO-Socket-SSL
 version    = 2.016
 release    = 2.1
-arch       = noarch
 thisapp    = IO-Socket-SSL-%{version}
 
 groups     = Development/Libraries
@@ -23,6 +22,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/S/SU/SULLR/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Net::SSLeay)
diff --git a/perl-JSON/perl-JSON.nm b/perl-JSON/perl-JSON.nm
index b673ab4ca..61f9486fd 100644
--- a/perl-JSON/perl-JSON.nm
+++ b/perl-JSON/perl-JSON.nm
@@ -6,7 +6,6 @@
 name       = perl-JSON
 version    = 4.10
 release    = 1
-arch       = noarch
 thisapp    = JSON-%{version}
 
 groups     = Development/Libraries
@@ -26,6 +25,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/I/IS/ISHIGAKI/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Test::More)
diff --git a/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm b/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm
index 8a7d348dd..d3fd1f28b 100644
--- a/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm
+++ b/perl-Module-Install-AuthorRequires/perl-Module-Install-AuthorRequires.nm
@@ -6,7 +6,6 @@
 name       = perl-Module-Install-AuthorRequires
 version    = 0.02
 release    = 1
-arch       = noarch
 
 groups     = Development/Libratries
 url        = http://search.cpan.org/dist/Module-Install-AuthorRequires/
@@ -22,6 +21,8 @@ source_dl  = https://cpan.metacpan.org/authors/id/F/FL/FLORA/
 thisapp    = Module-Install-AuthorRequires-%{version}
 
 build
+	arches = noarch
+
 	requires
 		perl(FindBin)
 		perl(ExtUtils::MakeMaker)
diff --git a/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm b/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm
index 609eba4d4..7683cadc6 100644
--- a/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm
+++ b/perl-Module-Install-ManifestSkip/perl-Module-Install-ManifestSkip.nm
@@ -6,7 +6,6 @@
 name       = perl-Module-Install-ManifestSkip
 version    = 0.24
 release    = 1
-arch       = noarch
 
 groups     = Development/Libratries
 url        = http://search.cpan.org/dist/Module-Install-ManifestSkip/
@@ -22,6 +21,8 @@ source_dl  = https://cpan.metacpan.org/authors/id/I/IN/INGY/
 thisapp    = Module-Install-ManifestSkip-%{version}
 
 build
+	arches = noarch
+
 	requires
 		perl(FindBin)
 		perl(ExtUtils::MakeMaker)
diff --git a/perl-Module-Install/perl-Module-Install.nm b/perl-Module-Install/perl-Module-Install.nm
index f3313e5fc..df641b9fc 100644
--- a/perl-Module-Install/perl-Module-Install.nm
+++ b/perl-Module-Install/perl-Module-Install.nm
@@ -6,7 +6,6 @@
 name       = perl-Module-Install
 version    = 1.19
 release    = 1
-arch       = noarch
 
 groups     = Development/Libratries
 url        = http://search.cpan.org/dist/Module-Install/
@@ -25,6 +24,8 @@ source_dl  = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
 thisapp    = Module-Install-%{version}
 
 build
+	arches = noarch
+
 	requires
 		perl(autodie)
 		perl(CPAN::Meta::YAML)
diff --git a/perl-Module-Package/perl-Module-Package.nm b/perl-Module-Package/perl-Module-Package.nm
index 3815ba11d..f823c9109 100644
--- a/perl-Module-Package/perl-Module-Package.nm
+++ b/perl-Module-Package/perl-Module-Package.nm
@@ -6,7 +6,6 @@
 name       = perl-Module-Package
 version    = 0.30
 release    = 1
-arch       = noarch
 
 groups     = Development/Libratries
 url        = http://search.cpan.org/dist/Module-Package/
@@ -23,6 +22,8 @@ source_dl  = https://cpan.metacpan.org/authors/id/I/IN/INGY/
 thisapp    = Module-Package-%{version}
 
 build
+	arches = noarch
+
 	requires
 		perl(FindBin)
 		perl(File::Find)
diff --git a/perl-Moo/perl-Moo.nm b/perl-Moo/perl-Moo.nm
index 622eacdc2..55a3e997a 100644
--- a/perl-Moo/perl-Moo.nm
+++ b/perl-Moo/perl-Moo.nm
@@ -7,7 +7,6 @@ name       = perl-Moo
 version    = 2.005005
 release    = 1
 thisapp    = Moo-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/Moo/
@@ -23,6 +22,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
 
 build
+	arches = noarch
+
 	requires
 		perl(B::Deparse)
 		perl(Class::Method::Modifiers)
diff --git a/perl-Net-HTTP/perl-Net-HTTP.nm b/perl-Net-HTTP/perl-Net-HTTP.nm
index eee400b3f..1339b57b8 100644
--- a/perl-Net-HTTP/perl-Net-HTTP.nm
+++ b/perl-Net-HTTP/perl-Net-HTTP.nm
@@ -7,7 +7,6 @@ name       = perl-Net-HTTP
 version    = 6.22
 release    = 1
 thisapp    = Net-HTTP-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = https://metacpan.org/dist/Net-HTTP
@@ -25,6 +24,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/O/OA/OALDERS/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Test::More)
diff --git a/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
index 9dc8d5809..0d976bd2e 100644
--- a/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
+++ b/perl-Net-SMTP-SSL/perl-Net-SMTP-SSL.nm
@@ -6,7 +6,6 @@
 name       = perl-Net-SMTP-SSL
 version    = 1.04
 release    = 2
-arch       = noarch
 thisapp    = Net-SMTP-SSL-%{version}
 
 groups     = Development/Libraries
@@ -21,6 +20,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/R/RJ/RJBS/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(IO::Socket::SSL)
diff --git a/perl-Role-Tiny/perl-Role-Tiny.nm b/perl-Role-Tiny/perl-Role-Tiny.nm
index d6d93a136..3d0e9b5d6 100644
--- a/perl-Role-Tiny/perl-Role-Tiny.nm
+++ b/perl-Role-Tiny/perl-Role-Tiny.nm
@@ -7,7 +7,6 @@ name       = perl-Role-Tiny
 version    = 2.002004
 release    = 1
 thisapp    = Role-Tiny-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/Moo/
@@ -22,6 +21,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
 
 build
+	arches = noarch
+
 	requires
 		perl(B)
 		perl(ExtUtils::MakeMaker)
diff --git a/perl-SGMLSpm/perl-SGMLSpm.nm b/perl-SGMLSpm/perl-SGMLSpm.nm
index a408ae7c5..4d302d210 100644
--- a/perl-SGMLSpm/perl-SGMLSpm.nm
+++ b/perl-SGMLSpm/perl-SGMLSpm.nm
@@ -7,7 +7,6 @@ name       = perl-SGMLSpm
 version    = 1.1
 release    = 2
 thisapp    = SGMLSpm-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/SGMLSpm/
@@ -22,6 +21,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/R/RA/RAAB/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Test::More)
diff --git a/perl-Sub-Quote/perl-Sub-Quote.nm b/perl-Sub-Quote/perl-Sub-Quote.nm
index 81bcce47c..9e3c34900 100644
--- a/perl-Sub-Quote/perl-Sub-Quote.nm
+++ b/perl-Sub-Quote/perl-Sub-Quote.nm
@@ -7,7 +7,6 @@ name       = perl-Sub-Quote
 version    = 2.006008
 release    = 1
 thisapp    = Sub-Quote-%{version}
-arch       = noarch
 
 groups     = Development/Libraries
 url        = http://search.cpan.org/dist/Sub-Quote/
@@ -22,6 +21,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/H/HA/HAARG/
 
 build
+	arches = noarch
+
 	requires
 		perl(B)
 		perl(ExtUtils::MakeMaker)
diff --git a/perl-TimeDate/perl-TimeDate.nm b/perl-TimeDate/perl-TimeDate.nm
index 858846b81..1bee24118 100644
--- a/perl-TimeDate/perl-TimeDate.nm
+++ b/perl-TimeDate/perl-TimeDate.nm
@@ -6,7 +6,6 @@
 name       = perl-TimeDate
 version    = 2.33
 release    = 1
-arch       = noarch
 thisapp    = TimeDate-%{version}
 
 groups     = Development/Libraries
@@ -25,6 +24,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/A/AT/ATOOMIC/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(Test::More)
diff --git a/perl-URI/perl-URI.nm b/perl-URI/perl-URI.nm
index 060448f84..67a71335f 100644
--- a/perl-URI/perl-URI.nm
+++ b/perl-URI/perl-URI.nm
@@ -6,7 +6,6 @@
 name       = perl-URI
 version    = 1.67
 release    = 1
-arch       = noarch
 thisapp    = URI-%{version}
 
 groups     = Development/Libraries
@@ -23,6 +22,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(MIME::Base64)
diff --git a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
index 9010e505b..0ebf61942 100644
--- a/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
+++ b/perl-XML-NamespaceSupport/perl-XML-NamespaceSupport.nm
@@ -6,7 +6,6 @@
 name       = perl-XML-NamespaceSupport
 version    = 1.11
 release    = 1.1
-arch       = noarch
 
 thisapp    = XML-NamespaceSupport-%{version}
 
@@ -24,6 +23,8 @@ end
 source_dl  = http://www.cpan.org/authors/id/P/PE/PERIGRIN/
 
 build
+	arches = noarch
+
 	requires
 		perl(constant)
 		perl(Cwd)
diff --git a/perl-XML-SAX-Base/perl-XML-SAX-Base.nm b/perl-XML-SAX-Base/perl-XML-SAX-Base.nm
index 092b0ddf2..b418b6615 100644
--- a/perl-XML-SAX-Base/perl-XML-SAX-Base.nm
+++ b/perl-XML-SAX-Base/perl-XML-SAX-Base.nm
@@ -6,7 +6,6 @@
 name       = perl-XML-SAX-Base
 version    = 1.08
 release    = 1
-arch       = noarch
 
 thisapp    = XML-SAX-Base-%{version}
 
@@ -25,6 +24,8 @@ end
 source_dl  = http://www.cpan.org/authors/id/G/GR/GRANTM/
 
 build
+	arches = noarch
+
 	requires
 		perl(base)
 		perl(Carp)
diff --git a/perl-XML-SAX/perl-XML-SAX.nm b/perl-XML-SAX/perl-XML-SAX.nm
index b2e9e3992..9dedeab86 100644
--- a/perl-XML-SAX/perl-XML-SAX.nm
+++ b/perl-XML-SAX/perl-XML-SAX.nm
@@ -6,7 +6,6 @@
 name       = perl-XML-SAX
 version    = 0.99
 release    = 1
-arch       = noarch
 
 thisapp    = XML-SAX-%{version}
 
@@ -35,6 +34,8 @@ end
 sources = %{thisapp}-nopatents.tar.gz
 
 build
+	arches = noarch
+
 	requires
 		perl(base)
 		perl(Carp)
diff --git a/perl-YAML-Tiny/perl-YAML-Tiny.nm b/perl-YAML-Tiny/perl-YAML-Tiny.nm
index cb153b461..b42626b64 100644
--- a/perl-YAML-Tiny/perl-YAML-Tiny.nm
+++ b/perl-YAML-Tiny/perl-YAML-Tiny.nm
@@ -6,7 +6,6 @@
 name       = perl-YAML-Tiny
 version    = 1.73
 release    = 1
-arch       = noarch
 thisapp    = YAML-Tiny-%{version}
 
 groups     = Development/Libraries
@@ -23,6 +22,8 @@ end
 source_dl  = https://cpan.metacpan.org/authors/id/E/ET/ETHER/
 
 build
+	arches = noarch
+
 	requires
 		perl(autodie)
 		perl(B)
diff --git a/perl-YAML/perl-YAML.nm b/perl-YAML/perl-YAML.nm
index 4b8f3105d..5112e934c 100644
--- a/perl-YAML/perl-YAML.nm
+++ b/perl-YAML/perl-YAML.nm
@@ -6,7 +6,6 @@
 name       = perl-YAML
 version    = 0.84
 release    = 2.1
-arch       = noarch
 thisapp    = YAML-%{version}
 
 groups     = Development/Libraries
@@ -27,6 +26,8 @@ end
 source_dl  = http://search.cpan.org/CPAN/authors/id/M/MS/MSTROUT/
 
 build
+	arches = noarch
+
 	requires
 		perl(Carp)
 		perl(constant)
diff --git a/perl-common-sense/perl-common-sense.nm b/perl-common-sense/perl-common-sense.nm
index 5d1f3488c..a1b4206cd 100644
--- a/perl-common-sense/perl-common-sense.nm
+++ b/perl-common-sense/perl-common-sense.nm
@@ -6,7 +6,6 @@
 name       = perl-common-sense
 version    = 3.75
 release    = 1
-arch       = noarch
 thisapp    = common-sense-%{version}
 
 groups     = Development/Libraries
@@ -27,6 +26,8 @@ end
 source_dl  = https://search.cpan.org/CPAN/authors/id/M/ML/MLEHMANN/
 
 build
+	arches = noarch
+
 	requires
 		perl(ExtUtils::MakeMaker)
 		perl(ExtUtils::ParseXS)
diff --git a/python3-docutils/python3-docutils.nm b/python3-docutils/python3-docutils.nm
index 86edd1120..c86fa41ab 100644
--- a/python3-docutils/python3-docutils.nm
+++ b/python3-docutils/python3-docutils.nm
@@ -7,7 +7,6 @@ name       = python3-docutils
 version    = 0.19
 release    = 1
 thisapp    = docutils-%{version}
-arch       = noarch
 
 groups     = System/Tools
 url        = https://docutils.sourceforge.net
@@ -25,6 +24,8 @@ end
 source_dl  = https://sourceforge.net/projects/docutils/files/docutils/%{version}/
 
 build
+	arches = noarch
+
 	requires
 		python3-devel >= 3.4
 		python3-setuptools
diff --git a/python3-setuptools/python3-setuptools.nm b/python3-setuptools/python3-setuptools.nm
index 06fc77361..d5d3d7ec9 100644
--- a/python3-setuptools/python3-setuptools.nm
+++ b/python3-setuptools/python3-setuptools.nm
@@ -6,7 +6,6 @@
 name       = python3-setuptools
 version    = 65.6.3
 release    = 1
-arch       = noarch
 thisapp    = setuptools-%{version}
 
 groups     = Development/Libraries
@@ -23,6 +22,8 @@ end
 source_dl = https://files.pythonhosted.org/packages/b6/21/cb9a8d0b2c8597c83fce8e9c02884bce3d4951e41e807fc35791c6b23d9a
 
 build
+	arches = noarch
+
 	requires
 		python3
 		python3-devel
diff --git a/setup/setup.nm b/setup/setup.nm
index cee66fab4..0a1c4e82b 100644
--- a/setup/setup.nm
+++ b/setup/setup.nm
@@ -6,7 +6,6 @@
 name       = setup
 version    = 3.0
 release    = 18
-arch       = noarch
 
 groups     = Base Build System/Base
 url        =
@@ -22,6 +21,8 @@ end
 sources    =
 
 build
+	arches = noarch
+
 	DIR_APP = %{DIR_SOURCE}
 
 	requires
diff --git a/sgml-common/sgml-common.nm b/sgml-common/sgml-common.nm
index 5a3a72483..f5b3fc8b2 100644
--- a/sgml-common/sgml-common.nm
+++ b/sgml-common/sgml-common.nm
@@ -6,7 +6,6 @@
 name       = sgml-common
 version    = 0.6.3
 release    = 3
-arch       = noarch
 
 groups     = Applications/Text
 url        =
@@ -24,6 +23,8 @@ source_dl =
 sources   = %{thisapp}.tgz
 
 build
+	arches = noarch
+
 	requires
 		autoconf
 		automake
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 3219b8c3c..1b5d8c767 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -9,7 +9,6 @@ tzcode_version = 2022g
 name       = tzdata
 version    = %{tzdata_version}
 release    = 1
-arch       = noarch
 thisapp    = tzdb-%{version}
 
 groups     = System/Base
@@ -26,6 +25,8 @@ source_dl  = https://www.iana.org/time-zones/repository/releases/
 sources    = %{thisapp}.tar.lz
 
 build
+	arches = noarch
+
 	requires
 		gawk
 		perl
diff --git a/usb-modeswitch-data/usb-modeswitch-data.nm b/usb-modeswitch-data/usb-modeswitch-data.nm
index 4b8882888..bcf9a4eda 100644
--- a/usb-modeswitch-data/usb-modeswitch-data.nm
+++ b/usb-modeswitch-data/usb-modeswitch-data.nm
@@ -6,7 +6,6 @@
 name       = usb-modeswitch-data
 version    = 20191128
 release    = 1
-arch       = noarch
 
 groups     = Applications/System
 url        = https://www.draisberghof.de/usb_modeswitch
@@ -22,6 +21,8 @@ source_dl  = https://www.draisberghof.de/usb_modeswitch/
 sources    = %{thisapp}.tar.bz2
 
 build
+	arches = noarch
+
 	build
 		# Nothing to do here.
 	end
diff --git a/wireless-regdb/wireless-regdb.nm b/wireless-regdb/wireless-regdb.nm
index cc4fb8d0d..7133d0b18 100644
--- a/wireless-regdb/wireless-regdb.nm
+++ b/wireless-regdb/wireless-regdb.nm
@@ -6,7 +6,6 @@
 name       = wireless-regdb
 version    = 2022.08.12
 release    = 1
-arch       = noarch
 
 maintainer = Arne Fitzenreiter <arne.fitzenreiter(a)ipfire.org>
 groups     = Network/Wireless
@@ -24,6 +23,8 @@ source_dl  = https://www.kernel.org/pub/software/network/wireless-regdb/
 sources    = %{thisapp}.tar.xz
 
 build
+	arches = noarch
+
 	requires
 		systemd-devel
 	end


hooks/post-receive
--
IPFire 3.x development tree

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-08-29 19:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-08-29 19:50 [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 5cd803df8fbcdd03e339cd0107c4ac7dc00f3cd4 Michael Tremer

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox