From 258e5823a5155352b9d3969c0c425c81af79d243 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Thu, 9 Oct 2025 14:00:12 +0000
Subject: [PATCH 01/10] AL2023 spec file template

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py                 | 101 ++++++++++++++++++++++
 package/templates/amzn2023.spec.template | 103 +++++++++++++++++++++++
 2 files changed, 204 insertions(+)
 create mode 100644 package/generate_spec.py
 create mode 100644 package/templates/amzn2023.spec.template

diff --git a/package/generate_spec.py b/package/generate_spec.py
new file mode 100644
index 000000000..2bc95109a
--- /dev/null
+++ b/package/generate_spec.py
@@ -0,0 +1,101 @@
+#!/usr/bin/env python3
+
+"""
+This RPM spec generator creates distribution-specific .spec files using template inheritance.
+It extracts versions from Cargo.toml/rust-toolchain.toml, scans git submodules for bundled library declarations,
+and uses a base template with distribution-specific overrides.
+
+The script takes a target distribution (like amzn2023), loads the corresponding template,
+and outputs a complete RPM spec file ready for rpmbuild.
+"""
+
+import argparse
+import subprocess
+from pathlib import Path
+import sys
+from datetime import datetime
+from jinja2 import Environment, FileSystemLoader
+import tomllib
+
+script_dir = Path(__file__).parent
+project_root = script_dir.parent
+templates_dir = script_dir / "templates"
+
+
+def get_version():
+    cargo_path = project_root / "mountpoint-s3" / "Cargo.toml"
+    with open(cargo_path, "rb") as f:
+        data = tomllib.load(f)
+        return data["package"]["version"]
+
+
+def get_rust_version():
+    rust_path = project_root / "rust-toolchain.toml"
+    with open(rust_path, "rb") as f:
+        data = tomllib.load(f)
+        return data["toolchain"]["channel"]
+
+
+def get_submodule_versions():
+    result = subprocess.run(
+        'git submodule foreach -q \'echo $name `git describe --tags`\'', capture_output=True, text=True, shell=True
+    )
+    versions = {}
+    for line in result.stdout.strip().split('\n'):
+        if line.strip():
+            parts = line.strip().split(' ', 1)
+            if len(parts) == 2:
+                name, version = parts
+                versions[name] = version.lstrip('v')
+    return versions
+
+
+def generate_bundled_provides(submodule_versions):
+    return "\n".join(
+        [f"Provides: bundled({lib_name}) = {lib_version}" for lib_name, lib_version in submodule_versions.items()]
+    )
+
+
+def main():
+    parser = argparse.ArgumentParser(description="Generate RPM spec files for different distributions")
+    parser.add_argument("build_target", help="Target distribution (e.g., amzn2023)")
+
+    args = parser.parse_args()
+    build_target = args.build_target
+    template_file = f"{build_target}.spec.template"
+
+    # Checking if template exists
+    template_path = templates_dir / template_file
+    if not template_path.exists():
+        print(f"Error: Template file {template_path} not found")
+        sys.exit(1)
+
+    version = get_version()
+    rust_version = get_rust_version()
+    submodule_versions = get_submodule_versions()
+    current_date = datetime.now().strftime("%a %b %d %Y")
+
+    template_data = {
+        'version': version,
+        'rust_version': rust_version,
+        'build_target': build_target,
+        'current_date': current_date,
+        'submodule_versions': submodule_versions,
+    }
+
+    # Setting up template env
+    env = Environment(loader=FileSystemLoader(templates_dir), trim_blocks=True, lstrip_blocks=True)
+
+    template = env.get_template(template_file)
+
+    spec_content = template.render(**template_data)
+
+    output_file = f"{build_target}.spec"
+    with open(output_file, "w") as f:
+        f.write(spec_content)
+
+    print(f"Generated {output_file}")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/package/templates/amzn2023.spec.template b/package/templates/amzn2023.spec.template
new file mode 100644
index 000000000..8c34fecda
--- /dev/null
+++ b/package/templates/amzn2023.spec.template
@@ -0,0 +1,103 @@
+{# Amazon Linux 2023 Complete RPM Spec Template #}
+%bcond_without check
+
+Name:           mount-s3
+Version:        {{ version }}
+Release:        {{ build_target }}
+Summary:        Mountpoint for Amazon S3
+
+License:        Apache-2.0
+URL:            https://github.com/awslabs/mountpoint-s3 
+Source0:        mountpoint-s3-{{ version }}.tar.gz
+Source1:        LICENSE
+Source2:        NOTICE
+Source3:        THIRD_PARTY_LICENSES
+
+{# Amazon Linux 2023 build dependencies #}
+BuildRequires:  clang
+BuildRequires:  clang-devel
+BuildRequires:  rust >= {{ rust_version }}      
+BuildRequires:  cargo >= {{ rust_version }}    
+BuildRequires:  cmake
+BuildRequires:  gcc
+BuildRequires:  gcc-c++
+BuildRequires:  git
+BuildRequires:  pkgconfig
+BuildRequires:  fuse-devel
+BuildRequires:  glibc-devel
+BuildRequires:  glibc-headers
+BuildRequires:  glibc-static
+BuildRequires:  libstdc++-devel
+BuildRequires:  nasm
+BuildRequires:  make
+BuildRequires:  which
+BuildRequires:  rust-packaging
+BuildRequires:  rust-toolset
+
+{# Supported architectures for Amazon Linux 2023 #}
+ExclusiveArch: x86_64 aarch64
+
+{# Bundled C/C++ libraries for security tracking #}
+{% for lib_name, lib_version in submodule_versions.items() %}
+Provides: bundled({{ lib_name }}) = {{ lib_version }}
+{% endfor %}
+
+{# Runtime dependencies #}
+Requires:       ca-certificates               
+Requires:       fuse >= 2.9.0               
+Requires:       fuse-libs >= 2.9.0     
+
+%description
+Mountpoint for Amazon S3 is a simple, high-throughput file client for
+mounting an Amazon S3 bucket as a local file system. With Mountpoint for Amazon
+S3, your applications can access objects stored in Amazon S3 through file
+operations like open and read. Mountpoint for Amazon S3 automatically
+translates these operations into S3 object API calls, giving your applications
+access to the elastic storage and throughput of Amazon S3 through a file
+interface.
+
+{# Build commands #}
+%build
+export CFLAGS="${CFLAGS:-%{optflags}} -O2 -Wno-error=cpp"
+export CMAKE_C_FLAGS="$CFLAGS"
+
+export MOUNTPOINT_S3_AWS_RELEASE="{{ build_target }}"
+
+cargo build --release
+
+%cargo_vendor_manifest
+
+%prep
+%autosetup -n mountpoint-s3
+%cargo_prep -v vendor
+
+%install
+mkdir -p %{{buildroot}}/opt/aws/mountpoint-s3/bin
+mkdir -p %{{buildroot}}/%{{_prefix}}/sbin
+mkdir -p %{{buildroot}}/%{{_bindir}}
+install -m 755 target/release/mount-s3 %{{buildroot}}/opt/aws/mountpoint-s3/bin/mount-s3
+install -m 644 NOTICE %{{buildroot}}/opt/aws/mountpoint-s3/
+install -m 644 LICENSE %{{buildroot}}/opt/aws/mountpoint-s3/
+install -m 644 THIRD_PARTY_LICENSES %{{buildroot}}/opt/aws/mountpoint-s3/
+install -m 644 cargo-vendor.txt %{{buildroot}}/opt/aws/mountpoint-s3/
+echo "%{{version}}" > %{{buildroot}}/opt/aws/mountpoint-s3/VERSION
+ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{{buildroot}}/%{{_bindir}}/mount-s3
+ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{{buildroot}}/%{{_prefix}}/sbin/mount.mount-s3
+
+%files
+%defattr(-,root,root,-)
+%dir %attr(755,root,root) /opt/aws/mountpoint-s3
+%dir %attr(755,root,root) /opt/aws/mountpoint-s3/bin
+%attr(755,root,root) /opt/aws/mountpoint-s3/bin/mount-s3
+%doc %attr(644,root,root) /opt/aws/mountpoint-s3/NOTICE
+%license %attr(644,root,root) /opt/aws/mountpoint-s3/LICENSE
+%license %attr(644,root,root) /opt/aws/mountpoint-s3/cargo-vendor.txt
+%attr(644,root,root) /opt/aws/mountpoint-s3/THIRD_PARTY_LICENSES
+%attr(644,root,root) /opt/aws/mountpoint-s3/VERSION
+%attr(755,root,root) %{_bindir}/mount-s3
+%attr(755,root,root) %{_prefix}/sbin/mount.mount-s3
+
+%changelog
+* {{ current_date }} Mountpoint-S3 Team <s3-opensource@amazon.com> - {{ version }}+{{ build_target }}
+- Mountpoint-S3 {{ version }} {{ build_target }} release
+- Refer to https://github.com/awslabs/mountpoint-s3/blob/main/mountpoint-s3/CHANGELOG.md
\ No newline at end of file

From 0107201e567b78ffd23e2c33e22a4c50067d6c2e Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Thu, 9 Oct 2025 16:22:00 +0000
Subject: [PATCH 02/10] AL2023 Spec file adjustments

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py                 | 7 +++----
 package/templates/amzn2023.spec.template | 4 ++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index 2bc95109a..b1add6687 100644
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -43,10 +43,9 @@ def get_submodule_versions():
     versions = {}
     for line in result.stdout.strip().split('\n'):
         if line.strip():
-            parts = line.strip().split(' ', 1)
-            if len(parts) == 2:
-                name, version = parts
-                versions[name] = version.lstrip('v')
+            match line.strip().split(' ', 1):
+                case [name, version]:
+                    versions[name] = version.lstrip('v')
     return versions
 
 
diff --git a/package/templates/amzn2023.spec.template b/package/templates/amzn2023.spec.template
index 8c34fecda..1a4501825 100644
--- a/package/templates/amzn2023.spec.template
+++ b/package/templates/amzn2023.spec.template
@@ -13,7 +13,7 @@ Source1:        LICENSE
 Source2:        NOTICE
 Source3:        THIRD_PARTY_LICENSES
 
-{# Amazon Linux 2023 build dependencies #}
+{# Build dependencies #}
 BuildRequires:  clang
 BuildRequires:  clang-devel
 BuildRequires:  rust >= {{ rust_version }}      
@@ -34,7 +34,7 @@ BuildRequires:  which
 BuildRequires:  rust-packaging
 BuildRequires:  rust-toolset
 
-{# Supported architectures for Amazon Linux 2023 #}
+{# Supported architectures #}
 ExclusiveArch: x86_64 aarch64
 
 {# Bundled C/C++ libraries for security tracking #}

From 64dbbe6cd6bb6f96c58618d4675c2709c6480aa0 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Fri, 10 Oct 2025 10:08:42 +0000
Subject: [PATCH 03/10] AL2023 Spec file generator updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 package/generate_spec.py

diff --git a/package/generate_spec.py b/package/generate_spec.py
old mode 100644
new mode 100755

From 0c425c60e583f97c2860d6d768d49c81e19c1314 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Sun, 12 Oct 2025 22:50:20 +0000
Subject: [PATCH 04/10] Spec file generator updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py                 | 51 +++++++++++-------------
 package/templates/amzn2023.spec.template | 42 ++++++++++---------
 2 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index b1add6687..d43e27434 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -1,18 +1,16 @@
 #!/usr/bin/env python3
 
 """
-This RPM spec generator creates distribution-specific .spec files using template inheritance.
-It extracts versions from Cargo.toml/rust-toolchain.toml, scans git submodules for bundled library declarations,
-and uses a base template with distribution-specific overrides.
+This RPM spec generator creates a distribution-specific .spec file.
+It extracts versions from Cargo.toml/rust-toolchain.toml and scans git submodules for bundled library declarations.
 
-The script takes a target distribution (like amzn2023), loads the corresponding template,
+The script takes a target distribution, loads the corresponding template,
 and outputs a complete RPM spec file ready for rpmbuild.
 """
 
 import argparse
 import subprocess
 from pathlib import Path
-import sys
 from datetime import datetime
 from jinja2 import Environment, FileSystemLoader
 import tomllib
@@ -42,52 +40,51 @@ def get_submodule_versions():
     )
     versions = {}
     for line in result.stdout.strip().split('\n'):
-        if line.strip():
-            match line.strip().split(' ', 1):
-                case [name, version]:
-                    versions[name] = version.lstrip('v')
+        match line.split(' ', 1):
+            case [name, version]:
+                versions[name] = version.removeprefix('v')
     return versions
 
 
 def generate_bundled_provides(submodule_versions):
     return "\n".join(
-        [f"Provides: bundled({lib_name}) = {lib_version}" for lib_name, lib_version in submodule_versions.items()]
+        f"Provides: bundled({lib_name}) = {lib_version}" for lib_name, lib_version in submodule_versions.items()
     )
 
 
 def main():
     parser = argparse.ArgumentParser(description="Generate RPM spec files for different distributions")
     parser.add_argument("build_target", help="Target distribution (e.g., amzn2023)")
+    parser.add_argument("--template", help="Custom template file (default: {build_target}.spec.template)")
 
     args = parser.parse_args()
     build_target = args.build_target
-    template_file = f"{build_target}.spec.template"
 
-    # Checking if template exists
-    template_path = templates_dir / template_file
+    template_file = args.template or f'{build_target}.spec.template'
+
+    # Handling both relative and absolute template paths
+    if args.template and Path(args.template).is_absolute():
+        template_path = Path(args.template)
+        template_dir = template_path.parent
+    else:
+        template_path = templates_dir / template_file
+        template_dir = templates_dir
+
     if not template_path.exists():
-        print(f"Error: Template file {template_path} not found")
-        sys.exit(1)
+        raise Exception(f"Template file {template_path} not found")
 
     version = get_version()
     rust_version = get_rust_version()
     submodule_versions = get_submodule_versions()
     current_date = datetime.now().strftime("%a %b %d %Y")
 
-    template_data = {
-        'version': version,
-        'rust_version': rust_version,
-        'build_target': build_target,
-        'current_date': current_date,
-        'submodule_versions': submodule_versions,
-    }
+    env = Environment(loader=FileSystemLoader(template_dir), trim_blocks=True, lstrip_blocks=True)
 
-    # Setting up template env
-    env = Environment(loader=FileSystemLoader(templates_dir), trim_blocks=True, lstrip_blocks=True)
+    template = env.get_template(template_path.name)
 
-    template = env.get_template(template_file)
-
-    spec_content = template.render(**template_data)
+    spec_content = template.render(
+        version=version, rust_version=rust_version, current_date=current_date, submodule_versions=submodule_versions
+    )
 
     output_file = f"{build_target}.spec"
     with open(output_file, "w") as f:
diff --git a/package/templates/amzn2023.spec.template b/package/templates/amzn2023.spec.template
index 1a4501825..10a6de389 100644
--- a/package/templates/amzn2023.spec.template
+++ b/package/templates/amzn2023.spec.template
@@ -3,7 +3,7 @@
 
 Name:           mount-s3
 Version:        {{ version }}
-Release:        {{ build_target }}
+Release:        amzn2023
 Summary:        Mountpoint for Amazon S3
 
 License:        Apache-2.0
@@ -43,9 +43,9 @@ Provides: bundled({{ lib_name }}) = {{ lib_version }}
 {% endfor %}
 
 {# Runtime dependencies #}
-Requires:       ca-certificates               
-Requires:       fuse >= 2.9.0               
-Requires:       fuse-libs >= 2.9.0     
+Requires:       ca-certificates
+Requires:       fuse >= 2.9.0
+Requires:       fuse-libs >= 2.9.0
 
 %description
 Mountpoint for Amazon S3 is a simple, high-throughput file client for
@@ -61,7 +61,7 @@ interface.
 export CFLAGS="${CFLAGS:-%{optflags}} -O2 -Wno-error=cpp"
 export CMAKE_C_FLAGS="$CFLAGS"
 
-export MOUNTPOINT_S3_AWS_RELEASE="{{ build_target }}"
+export MOUNTPOINT_S3_AWS_RELEASE="amzn2023"
 
 cargo build --release
 
@@ -71,19 +71,24 @@ cargo build --release
 %autosetup -n mountpoint-s3
 %cargo_prep -v vendor
 
+{% raw %}
 %install
-mkdir -p %{{buildroot}}/opt/aws/mountpoint-s3/bin
-mkdir -p %{{buildroot}}/%{{_prefix}}/sbin
-mkdir -p %{{buildroot}}/%{{_bindir}}
-install -m 755 target/release/mount-s3 %{{buildroot}}/opt/aws/mountpoint-s3/bin/mount-s3
-install -m 644 NOTICE %{{buildroot}}/opt/aws/mountpoint-s3/
-install -m 644 LICENSE %{{buildroot}}/opt/aws/mountpoint-s3/
-install -m 644 THIRD_PARTY_LICENSES %{{buildroot}}/opt/aws/mountpoint-s3/
-install -m 644 cargo-vendor.txt %{{buildroot}}/opt/aws/mountpoint-s3/
-echo "%{{version}}" > %{{buildroot}}/opt/aws/mountpoint-s3/VERSION
-ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{{buildroot}}/%{{_bindir}}/mount-s3
-ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{{buildroot}}/%{{_prefix}}/sbin/mount.mount-s3
+mkdir -p %{buildroot}/opt/aws/mountpoint-s3/bin
+mkdir -p %{buildroot}/%{_prefix}/sbin
+mkdir -p %{buildroot}/%{_bindir}
+install -m 755 target/release/mount-s3 %{buildroot}/opt/aws/mountpoint-s3/bin/mount-s3
+install -m 644 NOTICE %{buildroot}/opt/aws/mountpoint-s3/
+install -m 644 LICENSE %{buildroot}/opt/aws/mountpoint-s3/
+install -m 644 THIRD_PARTY_LICENSES %{buildroot}/opt/aws/mountpoint-s3/
+install -m 644 cargo-vendor.txt %{buildroot}/opt/aws/mountpoint-s3/
+{% endraw %}
+echo "{{ version }}" > %{buildroot}/opt/aws/mountpoint-s3/VERSION
+{% raw %}
+ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{buildroot}/%{_bindir}/mount-s3
+ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{buildroot}/%{_prefix}/sbin/mount.mount-s3
+{% endraw %}
 
+{% raw %}
 %files
 %defattr(-,root,root,-)
 %dir %attr(755,root,root) /opt/aws/mountpoint-s3
@@ -96,8 +101,9 @@ ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{{buildroot}}/%{{_prefix}}/sbin/moun
 %attr(644,root,root) /opt/aws/mountpoint-s3/VERSION
 %attr(755,root,root) %{_bindir}/mount-s3
 %attr(755,root,root) %{_prefix}/sbin/mount.mount-s3
+{% endraw %}
 
 %changelog
-* {{ current_date }} Mountpoint-S3 Team <s3-opensource@amazon.com> - {{ version }}+{{ build_target }}
-- Mountpoint-S3 {{ version }} {{ build_target }} release
+* {{ current_date }} Mountpoint-S3 Team <s3-opensource@amazon.com> - {{ version }}+amzn2023
+- Mountpoint-S3 {{ version }} amzn2023 release
 - Refer to https://github.com/awslabs/mountpoint-s3/blob/main/mountpoint-s3/CHANGELOG.md
\ No newline at end of file

From 25f984afdd27e25f4bf026d6a5bc347b8b14f75f Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Mon, 13 Oct 2025 08:49:19 +0000
Subject: [PATCH 05/10] AL2023 Spec file simplification

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index d43e27434..6be833868 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -62,13 +62,7 @@ def main():
 
     template_file = args.template or f'{build_target}.spec.template'
 
-    # Handling both relative and absolute template paths
-    if args.template and Path(args.template).is_absolute():
-        template_path = Path(args.template)
-        template_dir = template_path.parent
-    else:
-        template_path = templates_dir / template_file
-        template_dir = templates_dir
+    template_path = templates_dir / template_file
 
     if not template_path.exists():
         raise Exception(f"Template file {template_path} not found")
@@ -78,9 +72,9 @@ def main():
     submodule_versions = get_submodule_versions()
     current_date = datetime.now().strftime("%a %b %d %Y")
 
-    env = Environment(loader=FileSystemLoader(template_dir), trim_blocks=True, lstrip_blocks=True)
+    env = Environment(loader=FileSystemLoader(templates_dir), trim_blocks=True, lstrip_blocks=True)
 
-    template = env.get_template(template_path.name)
+    template = env.get_template(template_file)
 
     spec_content = template.render(
         version=version, rust_version=rust_version, current_date=current_date, submodule_versions=submodule_versions

From 2200916a0b307685f2e5267a02dcd5fe25f574c1 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Mon, 13 Oct 2025 13:57:13 +0000
Subject: [PATCH 06/10] AL2023 CI Updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py                 | 16 +++++-----------
 package/templates/amzn2023.spec.template |  6 ------
 2 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index 6be833868..5d2f02c01 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -20,21 +20,21 @@
 templates_dir = script_dir / "templates"
 
 
-def get_version():
+def get_version() -> str:
     cargo_path = project_root / "mountpoint-s3" / "Cargo.toml"
     with open(cargo_path, "rb") as f:
         data = tomllib.load(f)
         return data["package"]["version"]
 
 
-def get_rust_version():
+def get_rust_version() -> str:
     rust_path = project_root / "rust-toolchain.toml"
     with open(rust_path, "rb") as f:
         data = tomllib.load(f)
         return data["toolchain"]["channel"]
 
 
-def get_submodule_versions():
+def get_submodule_versions() -> dict[str, str]:
     result = subprocess.run(
         'git submodule foreach -q \'echo $name `git describe --tags`\'', capture_output=True, text=True, shell=True
     )
@@ -46,13 +46,7 @@ def get_submodule_versions():
     return versions
 
 
-def generate_bundled_provides(submodule_versions):
-    return "\n".join(
-        f"Provides: bundled({lib_name}) = {lib_version}" for lib_name, lib_version in submodule_versions.items()
-    )
-
-
-def main():
+def main() -> None:
     parser = argparse.ArgumentParser(description="Generate RPM spec files for different distributions")
     parser.add_argument("build_target", help="Target distribution (e.g., amzn2023)")
     parser.add_argument("--template", help="Custom template file (default: {build_target}.spec.template)")
@@ -65,7 +59,7 @@ def main():
     template_path = templates_dir / template_file
 
     if not template_path.exists():
-        raise Exception(f"Template file {template_path} not found")
+        raise FileNotFoundError(f"Template file {template_path} not found")
 
     version = get_version()
     rust_version = get_rust_version()
diff --git a/package/templates/amzn2023.spec.template b/package/templates/amzn2023.spec.template
index 10a6de389..66136822f 100644
--- a/package/templates/amzn2023.spec.template
+++ b/package/templates/amzn2023.spec.template
@@ -71,7 +71,6 @@ cargo build --release
 %autosetup -n mountpoint-s3
 %cargo_prep -v vendor
 
-{% raw %}
 %install
 mkdir -p %{buildroot}/opt/aws/mountpoint-s3/bin
 mkdir -p %{buildroot}/%{_prefix}/sbin
@@ -81,14 +80,10 @@ install -m 644 NOTICE %{buildroot}/opt/aws/mountpoint-s3/
 install -m 644 LICENSE %{buildroot}/opt/aws/mountpoint-s3/
 install -m 644 THIRD_PARTY_LICENSES %{buildroot}/opt/aws/mountpoint-s3/
 install -m 644 cargo-vendor.txt %{buildroot}/opt/aws/mountpoint-s3/
-{% endraw %}
 echo "{{ version }}" > %{buildroot}/opt/aws/mountpoint-s3/VERSION
-{% raw %}
 ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{buildroot}/%{_bindir}/mount-s3
 ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{buildroot}/%{_prefix}/sbin/mount.mount-s3
-{% endraw %}
 
-{% raw %}
 %files
 %defattr(-,root,root,-)
 %dir %attr(755,root,root) /opt/aws/mountpoint-s3
@@ -101,7 +96,6 @@ ln -sf /opt/aws/mountpoint-s3/bin/mount-s3 %{buildroot}/%{_prefix}/sbin/mount.mo
 %attr(644,root,root) /opt/aws/mountpoint-s3/VERSION
 %attr(755,root,root) %{_bindir}/mount-s3
 %attr(755,root,root) %{_prefix}/sbin/mount.mount-s3
-{% endraw %}
 
 %changelog
 * {{ current_date }} Mountpoint-S3 Team <s3-opensource@amazon.com> - {{ version }}+amzn2023

From 33300baf93cc9b75def16896776ddbeda3a128dd Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Mon, 13 Oct 2025 16:00:04 +0000
Subject: [PATCH 07/10] CI Updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index 5d2f02c01..7300b6fc4 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -13,7 +13,7 @@
 from pathlib import Path
 from datetime import datetime
 from jinja2 import Environment, FileSystemLoader
-import tomllib
+import tomli as tomllib
 
 script_dir = Path(__file__).parent
 project_root = script_dir.parent
@@ -40,9 +40,10 @@ def get_submodule_versions() -> dict[str, str]:
     )
     versions = {}
     for line in result.stdout.strip().split('\n'):
-        match line.split(' ', 1):
-            case [name, version]:
-                versions[name] = version.removeprefix('v')
+        parts = line.split(' ', 1)
+        if len(parts) == 2:
+            name, version = parts
+            versions[name] = version.removeprefix('v')
     return versions
 
 

From c8d9d24c7d6e908dd6ea84fd5cd760ac8f70b606 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Mon, 13 Oct 2025 23:54:36 +0000
Subject: [PATCH 08/10] Spec file updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/.python-version  |   1 +
 package/generate_spec.py |   2 +-
 package/pyproject.toml   |  10 ++++
 package/uv.lock          | 100 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 112 insertions(+), 1 deletion(-)
 create mode 100644 package/.python-version
 create mode 100644 package/pyproject.toml
 create mode 100644 package/uv.lock

diff --git a/package/.python-version b/package/.python-version
new file mode 100644
index 000000000..fdcfcfdfc
--- /dev/null
+++ b/package/.python-version
@@ -0,0 +1 @@
+3.12
\ No newline at end of file
diff --git a/package/generate_spec.py b/package/generate_spec.py
index 7300b6fc4..4e4c1f851 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -13,7 +13,7 @@
 from pathlib import Path
 from datetime import datetime
 from jinja2 import Environment, FileSystemLoader
-import tomli as tomllib
+import tomllib
 
 script_dir = Path(__file__).parent
 project_root = script_dir.parent
diff --git a/package/pyproject.toml b/package/pyproject.toml
new file mode 100644
index 000000000..8eee416b6
--- /dev/null
+++ b/package/pyproject.toml
@@ -0,0 +1,10 @@
+[project]
+name = "mountpoint-s3-packaging"
+version = "0.1.0"
+description = "Packaging tools for Mountpoint-S3"
+readme = "README.md"
+requires-python = ">=3.11"
+dependencies = [
+    "jinja2>=3.0.0",
+]
+
diff --git a/package/uv.lock b/package/uv.lock
new file mode 100644
index 000000000..a970e702d
--- /dev/null
+++ b/package/uv.lock
@@ -0,0 +1,100 @@
+version = 1
+revision = 2
+requires-python = ">=3.11"
+
+[[package]]
+name = "jinja2"
+version = "3.1.6"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "markupsafe" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/df/bf/f7da0350254c0ed7c72f3e33cef02e048281fec7ecec5f032d4aac52226b/jinja2-3.1.6.tar.gz", hash = "sha256:0137fb05990d35f1275a587e9aee6d56da821fc83491a0fb838183be43f66d6d", size = 245115, upload-time = "2025-03-05T20:05:02.478Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/62/a1/3d680cbfd5f4b8f15abc1d571870c5fc3e594bb582bc3b64ea099db13e56/jinja2-3.1.6-py3-none-any.whl", hash = "sha256:85ece4451f492d0c13c5dd7c13a64681a86afae63a5f347908daf103ce6d2f67", size = 134899, upload-time = "2025-03-05T20:05:00.369Z" },
+]
+
+[[package]]
+name = "markupsafe"
+version = "3.0.3"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/7e/99/7690b6d4034fffd95959cbe0c02de8deb3098cc577c67bb6a24fe5d7caa7/markupsafe-3.0.3.tar.gz", hash = "sha256:722695808f4b6457b320fdc131280796bdceb04ab50fe1795cd540799ebe1698", size = 80313, upload-time = "2025-09-27T18:37:40.426Z" }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/08/db/fefacb2136439fc8dd20e797950e749aa1f4997ed584c62cfb8ef7c2be0e/markupsafe-3.0.3-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:1cc7ea17a6824959616c525620e387f6dd30fec8cb44f649e31712db02123dad", size = 11631, upload-time = "2025-09-27T18:36:18.185Z" },
+    { url = "https://files.pythonhosted.org/packages/e1/2e/5898933336b61975ce9dc04decbc0a7f2fee78c30353c5efba7f2d6ff27a/markupsafe-3.0.3-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:4bd4cd07944443f5a265608cc6aab442e4f74dff8088b0dfc8238647b8f6ae9a", size = 12058, upload-time = "2025-09-27T18:36:19.444Z" },
+    { url = "https://files.pythonhosted.org/packages/1d/09/adf2df3699d87d1d8184038df46a9c80d78c0148492323f4693df54e17bb/markupsafe-3.0.3-cp311-cp311-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:6b5420a1d9450023228968e7e6a9ce57f65d148ab56d2313fcd589eee96a7a50", size = 24287, upload-time = "2025-09-27T18:36:20.768Z" },
+    { url = "https://files.pythonhosted.org/packages/30/ac/0273f6fcb5f42e314c6d8cd99effae6a5354604d461b8d392b5ec9530a54/markupsafe-3.0.3-cp311-cp311-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:0bf2a864d67e76e5c9a34dc26ec616a66b9888e25e7b9460e1c76d3293bd9dbf", size = 22940, upload-time = "2025-09-27T18:36:22.249Z" },
+    { url = "https://files.pythonhosted.org/packages/19/ae/31c1be199ef767124c042c6c3e904da327a2f7f0cd63a0337e1eca2967a8/markupsafe-3.0.3-cp311-cp311-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:bc51efed119bc9cfdf792cdeaa4d67e8f6fcccab66ed4bfdd6bde3e59bfcbb2f", size = 21887, upload-time = "2025-09-27T18:36:23.535Z" },
+    { url = "https://files.pythonhosted.org/packages/b2/76/7edcab99d5349a4532a459e1fe64f0b0467a3365056ae550d3bcf3f79e1e/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_aarch64.whl", hash = "sha256:068f375c472b3e7acbe2d5318dea141359e6900156b5b2ba06a30b169086b91a", size = 23692, upload-time = "2025-09-27T18:36:24.823Z" },
+    { url = "https://files.pythonhosted.org/packages/a4/28/6e74cdd26d7514849143d69f0bf2399f929c37dc2b31e6829fd2045b2765/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_riscv64.whl", hash = "sha256:7be7b61bb172e1ed687f1754f8e7484f1c8019780f6f6b0786e76bb01c2ae115", size = 21471, upload-time = "2025-09-27T18:36:25.95Z" },
+    { url = "https://files.pythonhosted.org/packages/62/7e/a145f36a5c2945673e590850a6f8014318d5577ed7e5920a4b3448e0865d/markupsafe-3.0.3-cp311-cp311-musllinux_1_2_x86_64.whl", hash = "sha256:f9e130248f4462aaa8e2552d547f36ddadbeaa573879158d721bbd33dfe4743a", size = 22923, upload-time = "2025-09-27T18:36:27.109Z" },
+    { url = "https://files.pythonhosted.org/packages/0f/62/d9c46a7f5c9adbeeeda52f5b8d802e1094e9717705a645efc71b0913a0a8/markupsafe-3.0.3-cp311-cp311-win32.whl", hash = "sha256:0db14f5dafddbb6d9208827849fad01f1a2609380add406671a26386cdf15a19", size = 14572, upload-time = "2025-09-27T18:36:28.045Z" },
+    { url = "https://files.pythonhosted.org/packages/83/8a/4414c03d3f891739326e1783338e48fb49781cc915b2e0ee052aa490d586/markupsafe-3.0.3-cp311-cp311-win_amd64.whl", hash = "sha256:de8a88e63464af587c950061a5e6a67d3632e36df62b986892331d4620a35c01", size = 15077, upload-time = "2025-09-27T18:36:29.025Z" },
+    { url = "https://files.pythonhosted.org/packages/35/73/893072b42e6862f319b5207adc9ae06070f095b358655f077f69a35601f0/markupsafe-3.0.3-cp311-cp311-win_arm64.whl", hash = "sha256:3b562dd9e9ea93f13d53989d23a7e775fdfd1066c33494ff43f5418bc8c58a5c", size = 13876, upload-time = "2025-09-27T18:36:29.954Z" },
+    { url = "https://files.pythonhosted.org/packages/5a/72/147da192e38635ada20e0a2e1a51cf8823d2119ce8883f7053879c2199b5/markupsafe-3.0.3-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:d53197da72cc091b024dd97249dfc7794d6a56530370992a5e1a08983ad9230e", size = 11615, upload-time = "2025-09-27T18:36:30.854Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/81/7e4e08678a1f98521201c3079f77db69fb552acd56067661f8c2f534a718/markupsafe-3.0.3-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:1872df69a4de6aead3491198eaf13810b565bdbeec3ae2dc8780f14458ec73ce", size = 12020, upload-time = "2025-09-27T18:36:31.971Z" },
+    { url = "https://files.pythonhosted.org/packages/1e/2c/799f4742efc39633a1b54a92eec4082e4f815314869865d876824c257c1e/markupsafe-3.0.3-cp312-cp312-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:3a7e8ae81ae39e62a41ec302f972ba6ae23a5c5396c8e60113e9066ef893da0d", size = 24332, upload-time = "2025-09-27T18:36:32.813Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/2e/8d0c2ab90a8c1d9a24f0399058ab8519a3279d1bd4289511d74e909f060e/markupsafe-3.0.3-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:d6dd0be5b5b189d31db7cda48b91d7e0a9795f31430b7f271219ab30f1d3ac9d", size = 22947, upload-time = "2025-09-27T18:36:33.86Z" },
+    { url = "https://files.pythonhosted.org/packages/2c/54/887f3092a85238093a0b2154bd629c89444f395618842e8b0c41783898ea/markupsafe-3.0.3-cp312-cp312-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:94c6f0bb423f739146aec64595853541634bde58b2135f27f61c1ffd1cd4d16a", size = 21962, upload-time = "2025-09-27T18:36:35.099Z" },
+    { url = "https://files.pythonhosted.org/packages/c9/2f/336b8c7b6f4a4d95e91119dc8521402461b74a485558d8f238a68312f11c/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:be8813b57049a7dc738189df53d69395eba14fb99345e0a5994914a3864c8a4b", size = 23760, upload-time = "2025-09-27T18:36:36.001Z" },
+    { url = "https://files.pythonhosted.org/packages/32/43/67935f2b7e4982ffb50a4d169b724d74b62a3964bc1a9a527f5ac4f1ee2b/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:83891d0e9fb81a825d9a6d61e3f07550ca70a076484292a70fde82c4b807286f", size = 21529, upload-time = "2025-09-27T18:36:36.906Z" },
+    { url = "https://files.pythonhosted.org/packages/89/e0/4486f11e51bbba8b0c041098859e869e304d1c261e59244baa3d295d47b7/markupsafe-3.0.3-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:77f0643abe7495da77fb436f50f8dab76dbc6e5fd25d39589a0f1fe6548bfa2b", size = 23015, upload-time = "2025-09-27T18:36:37.868Z" },
+    { url = "https://files.pythonhosted.org/packages/2f/e1/78ee7a023dac597a5825441ebd17170785a9dab23de95d2c7508ade94e0e/markupsafe-3.0.3-cp312-cp312-win32.whl", hash = "sha256:d88b440e37a16e651bda4c7c2b930eb586fd15ca7406cb39e211fcff3bf3017d", size = 14540, upload-time = "2025-09-27T18:36:38.761Z" },
+    { url = "https://files.pythonhosted.org/packages/aa/5b/bec5aa9bbbb2c946ca2733ef9c4ca91c91b6a24580193e891b5f7dbe8e1e/markupsafe-3.0.3-cp312-cp312-win_amd64.whl", hash = "sha256:26a5784ded40c9e318cfc2bdb30fe164bdb8665ded9cd64d500a34fb42067b1c", size = 15105, upload-time = "2025-09-27T18:36:39.701Z" },
+    { url = "https://files.pythonhosted.org/packages/e5/f1/216fc1bbfd74011693a4fd837e7026152e89c4bcf3e77b6692fba9923123/markupsafe-3.0.3-cp312-cp312-win_arm64.whl", hash = "sha256:35add3b638a5d900e807944a078b51922212fb3dedb01633a8defc4b01a3c85f", size = 13906, upload-time = "2025-09-27T18:36:40.689Z" },
+    { url = "https://files.pythonhosted.org/packages/38/2f/907b9c7bbba283e68f20259574b13d005c121a0fa4c175f9bed27c4597ff/markupsafe-3.0.3-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:e1cf1972137e83c5d4c136c43ced9ac51d0e124706ee1c8aa8532c1287fa8795", size = 11622, upload-time = "2025-09-27T18:36:41.777Z" },
+    { url = "https://files.pythonhosted.org/packages/9c/d9/5f7756922cdd676869eca1c4e3c0cd0df60ed30199ffd775e319089cb3ed/markupsafe-3.0.3-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:116bb52f642a37c115f517494ea5feb03889e04df47eeff5b130b1808ce7c219", size = 12029, upload-time = "2025-09-27T18:36:43.257Z" },
+    { url = "https://files.pythonhosted.org/packages/00/07/575a68c754943058c78f30db02ee03a64b3c638586fba6a6dd56830b30a3/markupsafe-3.0.3-cp313-cp313-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:133a43e73a802c5562be9bbcd03d090aa5a1fe899db609c29e8c8d815c5f6de6", size = 24374, upload-time = "2025-09-27T18:36:44.508Z" },
+    { url = "https://files.pythonhosted.org/packages/a9/21/9b05698b46f218fc0e118e1f8168395c65c8a2c750ae2bab54fc4bd4e0e8/markupsafe-3.0.3-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:ccfcd093f13f0f0b7fdd0f198b90053bf7b2f02a3927a30e63f3ccc9df56b676", size = 22980, upload-time = "2025-09-27T18:36:45.385Z" },
+    { url = "https://files.pythonhosted.org/packages/7f/71/544260864f893f18b6827315b988c146b559391e6e7e8f7252839b1b846a/markupsafe-3.0.3-cp313-cp313-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:509fa21c6deb7a7a273d629cf5ec029bc209d1a51178615ddf718f5918992ab9", size = 21990, upload-time = "2025-09-27T18:36:46.916Z" },
+    { url = "https://files.pythonhosted.org/packages/c2/28/b50fc2f74d1ad761af2f5dcce7492648b983d00a65b8c0e0cb457c82ebbe/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:a4afe79fb3de0b7097d81da19090f4df4f8d3a2b3adaa8764138aac2e44f3af1", size = 23784, upload-time = "2025-09-27T18:36:47.884Z" },
+    { url = "https://files.pythonhosted.org/packages/ed/76/104b2aa106a208da8b17a2fb72e033a5a9d7073c68f7e508b94916ed47a9/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:795e7751525cae078558e679d646ae45574b47ed6e7771863fcc079a6171a0fc", size = 21588, upload-time = "2025-09-27T18:36:48.82Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/99/16a5eb2d140087ebd97180d95249b00a03aa87e29cc224056274f2e45fd6/markupsafe-3.0.3-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:8485f406a96febb5140bfeca44a73e3ce5116b2501ac54fe953e488fb1d03b12", size = 23041, upload-time = "2025-09-27T18:36:49.797Z" },
+    { url = "https://files.pythonhosted.org/packages/19/bc/e7140ed90c5d61d77cea142eed9f9c303f4c4806f60a1044c13e3f1471d0/markupsafe-3.0.3-cp313-cp313-win32.whl", hash = "sha256:bdd37121970bfd8be76c5fb069c7751683bdf373db1ed6c010162b2a130248ed", size = 14543, upload-time = "2025-09-27T18:36:51.584Z" },
+    { url = "https://files.pythonhosted.org/packages/05/73/c4abe620b841b6b791f2edc248f556900667a5a1cf023a6646967ae98335/markupsafe-3.0.3-cp313-cp313-win_amd64.whl", hash = "sha256:9a1abfdc021a164803f4d485104931fb8f8c1efd55bc6b748d2f5774e78b62c5", size = 15113, upload-time = "2025-09-27T18:36:52.537Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/3a/fa34a0f7cfef23cf9500d68cb7c32dd64ffd58a12b09225fb03dd37d5b80/markupsafe-3.0.3-cp313-cp313-win_arm64.whl", hash = "sha256:7e68f88e5b8799aa49c85cd116c932a1ac15caaa3f5db09087854d218359e485", size = 13911, upload-time = "2025-09-27T18:36:53.513Z" },
+    { url = "https://files.pythonhosted.org/packages/e4/d7/e05cd7efe43a88a17a37b3ae96e79a19e846f3f456fe79c57ca61356ef01/markupsafe-3.0.3-cp313-cp313t-macosx_10_13_x86_64.whl", hash = "sha256:218551f6df4868a8d527e3062d0fb968682fe92054e89978594c28e642c43a73", size = 11658, upload-time = "2025-09-27T18:36:54.819Z" },
+    { url = "https://files.pythonhosted.org/packages/99/9e/e412117548182ce2148bdeacdda3bb494260c0b0184360fe0d56389b523b/markupsafe-3.0.3-cp313-cp313t-macosx_11_0_arm64.whl", hash = "sha256:3524b778fe5cfb3452a09d31e7b5adefeea8c5be1d43c4f810ba09f2ceb29d37", size = 12066, upload-time = "2025-09-27T18:36:55.714Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/e6/fa0ffcda717ef64a5108eaa7b4f5ed28d56122c9a6d70ab8b72f9f715c80/markupsafe-3.0.3-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:4e885a3d1efa2eadc93c894a21770e4bc67899e3543680313b09f139e149ab19", size = 25639, upload-time = "2025-09-27T18:36:56.908Z" },
+    { url = "https://files.pythonhosted.org/packages/96/ec/2102e881fe9d25fc16cb4b25d5f5cde50970967ffa5dddafdb771237062d/markupsafe-3.0.3-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:8709b08f4a89aa7586de0aadc8da56180242ee0ada3999749b183aa23df95025", size = 23569, upload-time = "2025-09-27T18:36:57.913Z" },
+    { url = "https://files.pythonhosted.org/packages/4b/30/6f2fce1f1f205fc9323255b216ca8a235b15860c34b6798f810f05828e32/markupsafe-3.0.3-cp313-cp313t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:b8512a91625c9b3da6f127803b166b629725e68af71f8184ae7e7d54686a56d6", size = 23284, upload-time = "2025-09-27T18:36:58.833Z" },
+    { url = "https://files.pythonhosted.org/packages/58/47/4a0ccea4ab9f5dcb6f79c0236d954acb382202721e704223a8aafa38b5c8/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:9b79b7a16f7fedff2495d684f2b59b0457c3b493778c9eed31111be64d58279f", size = 24801, upload-time = "2025-09-27T18:36:59.739Z" },
+    { url = "https://files.pythonhosted.org/packages/6a/70/3780e9b72180b6fecb83a4814d84c3bf4b4ae4bf0b19c27196104149734c/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_riscv64.whl", hash = "sha256:12c63dfb4a98206f045aa9563db46507995f7ef6d83b2f68eda65c307c6829eb", size = 22769, upload-time = "2025-09-27T18:37:00.719Z" },
+    { url = "https://files.pythonhosted.org/packages/98/c5/c03c7f4125180fc215220c035beac6b9cb684bc7a067c84fc69414d315f5/markupsafe-3.0.3-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:8f71bc33915be5186016f675cd83a1e08523649b0e33efdb898db577ef5bb009", size = 23642, upload-time = "2025-09-27T18:37:01.673Z" },
+    { url = "https://files.pythonhosted.org/packages/80/d6/2d1b89f6ca4bff1036499b1e29a1d02d282259f3681540e16563f27ebc23/markupsafe-3.0.3-cp313-cp313t-win32.whl", hash = "sha256:69c0b73548bc525c8cb9a251cddf1931d1db4d2258e9599c28c07ef3580ef354", size = 14612, upload-time = "2025-09-27T18:37:02.639Z" },
+    { url = "https://files.pythonhosted.org/packages/2b/98/e48a4bfba0a0ffcf9925fe2d69240bfaa19c6f7507b8cd09c70684a53c1e/markupsafe-3.0.3-cp313-cp313t-win_amd64.whl", hash = "sha256:1b4b79e8ebf6b55351f0d91fe80f893b4743f104bff22e90697db1590e47a218", size = 15200, upload-time = "2025-09-27T18:37:03.582Z" },
+    { url = "https://files.pythonhosted.org/packages/0e/72/e3cc540f351f316e9ed0f092757459afbc595824ca724cbc5a5d4263713f/markupsafe-3.0.3-cp313-cp313t-win_arm64.whl", hash = "sha256:ad2cf8aa28b8c020ab2fc8287b0f823d0a7d8630784c31e9ee5edea20f406287", size = 13973, upload-time = "2025-09-27T18:37:04.929Z" },
+    { url = "https://files.pythonhosted.org/packages/33/8a/8e42d4838cd89b7dde187011e97fe6c3af66d8c044997d2183fbd6d31352/markupsafe-3.0.3-cp314-cp314-macosx_10_13_x86_64.whl", hash = "sha256:eaa9599de571d72e2daf60164784109f19978b327a3910d3e9de8c97b5b70cfe", size = 11619, upload-time = "2025-09-27T18:37:06.342Z" },
+    { url = "https://files.pythonhosted.org/packages/b5/64/7660f8a4a8e53c924d0fa05dc3a55c9cee10bbd82b11c5afb27d44b096ce/markupsafe-3.0.3-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:c47a551199eb8eb2121d4f0f15ae0f923d31350ab9280078d1e5f12b249e0026", size = 12029, upload-time = "2025-09-27T18:37:07.213Z" },
+    { url = "https://files.pythonhosted.org/packages/da/ef/e648bfd021127bef5fa12e1720ffed0c6cbb8310c8d9bea7266337ff06de/markupsafe-3.0.3-cp314-cp314-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:f34c41761022dd093b4b6896d4810782ffbabe30f2d443ff5f083e0cbbb8c737", size = 24408, upload-time = "2025-09-27T18:37:09.572Z" },
+    { url = "https://files.pythonhosted.org/packages/41/3c/a36c2450754618e62008bf7435ccb0f88053e07592e6028a34776213d877/markupsafe-3.0.3-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:457a69a9577064c05a97c41f4e65148652db078a3a509039e64d3467b9e7ef97", size = 23005, upload-time = "2025-09-27T18:37:10.58Z" },
+    { url = "https://files.pythonhosted.org/packages/bc/20/b7fdf89a8456b099837cd1dc21974632a02a999ec9bf7ca3e490aacd98e7/markupsafe-3.0.3-cp314-cp314-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:e8afc3f2ccfa24215f8cb28dcf43f0113ac3c37c2f0f0806d8c70e4228c5cf4d", size = 22048, upload-time = "2025-09-27T18:37:11.547Z" },
+    { url = "https://files.pythonhosted.org/packages/9a/a7/591f592afdc734f47db08a75793a55d7fbcc6902a723ae4cfbab61010cc5/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:ec15a59cf5af7be74194f7ab02d0f59a62bdcf1a537677ce67a2537c9b87fcda", size = 23821, upload-time = "2025-09-27T18:37:12.48Z" },
+    { url = "https://files.pythonhosted.org/packages/7d/33/45b24e4f44195b26521bc6f1a82197118f74df348556594bd2262bda1038/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:0eb9ff8191e8498cca014656ae6b8d61f39da5f95b488805da4bb029cccbfbaf", size = 21606, upload-time = "2025-09-27T18:37:13.485Z" },
+    { url = "https://files.pythonhosted.org/packages/ff/0e/53dfaca23a69fbfbbf17a4b64072090e70717344c52eaaaa9c5ddff1e5f0/markupsafe-3.0.3-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:2713baf880df847f2bece4230d4d094280f4e67b1e813eec43b4c0e144a34ffe", size = 23043, upload-time = "2025-09-27T18:37:14.408Z" },
+    { url = "https://files.pythonhosted.org/packages/46/11/f333a06fc16236d5238bfe74daccbca41459dcd8d1fa952e8fbd5dccfb70/markupsafe-3.0.3-cp314-cp314-win32.whl", hash = "sha256:729586769a26dbceff69f7a7dbbf59ab6572b99d94576a5592625d5b411576b9", size = 14747, upload-time = "2025-09-27T18:37:15.36Z" },
+    { url = "https://files.pythonhosted.org/packages/28/52/182836104b33b444e400b14f797212f720cbc9ed6ba34c800639d154e821/markupsafe-3.0.3-cp314-cp314-win_amd64.whl", hash = "sha256:bdc919ead48f234740ad807933cdf545180bfbe9342c2bb451556db2ed958581", size = 15341, upload-time = "2025-09-27T18:37:16.496Z" },
+    { url = "https://files.pythonhosted.org/packages/6f/18/acf23e91bd94fd7b3031558b1f013adfa21a8e407a3fdb32745538730382/markupsafe-3.0.3-cp314-cp314-win_arm64.whl", hash = "sha256:5a7d5dc5140555cf21a6fefbdbf8723f06fcd2f63ef108f2854de715e4422cb4", size = 14073, upload-time = "2025-09-27T18:37:17.476Z" },
+    { url = "https://files.pythonhosted.org/packages/3c/f0/57689aa4076e1b43b15fdfa646b04653969d50cf30c32a102762be2485da/markupsafe-3.0.3-cp314-cp314t-macosx_10_13_x86_64.whl", hash = "sha256:1353ef0c1b138e1907ae78e2f6c63ff67501122006b0f9abad68fda5f4ffc6ab", size = 11661, upload-time = "2025-09-27T18:37:18.453Z" },
+    { url = "https://files.pythonhosted.org/packages/89/c3/2e67a7ca217c6912985ec766c6393b636fb0c2344443ff9d91404dc4c79f/markupsafe-3.0.3-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:1085e7fbddd3be5f89cc898938f42c0b3c711fdcb37d75221de2666af647c175", size = 12069, upload-time = "2025-09-27T18:37:19.332Z" },
+    { url = "https://files.pythonhosted.org/packages/f0/00/be561dce4e6ca66b15276e184ce4b8aec61fe83662cce2f7d72bd3249d28/markupsafe-3.0.3-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:1b52b4fb9df4eb9ae465f8d0c228a00624de2334f216f178a995ccdcf82c4634", size = 25670, upload-time = "2025-09-27T18:37:20.245Z" },
+    { url = "https://files.pythonhosted.org/packages/50/09/c419f6f5a92e5fadde27efd190eca90f05e1261b10dbd8cbcb39cd8ea1dc/markupsafe-3.0.3-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.manylinux_2_28_x86_64.whl", hash = "sha256:fed51ac40f757d41b7c48425901843666a6677e3e8eb0abcff09e4ba6e664f50", size = 23598, upload-time = "2025-09-27T18:37:21.177Z" },
+    { url = "https://files.pythonhosted.org/packages/22/44/a0681611106e0b2921b3033fc19bc53323e0b50bc70cffdd19f7d679bb66/markupsafe-3.0.3-cp314-cp314t-manylinux_2_31_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:f190daf01f13c72eac4efd5c430a8de82489d9cff23c364c3ea822545032993e", size = 23261, upload-time = "2025-09-27T18:37:22.167Z" },
+    { url = "https://files.pythonhosted.org/packages/5f/57/1b0b3f100259dc9fffe780cfb60d4be71375510e435efec3d116b6436d43/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:e56b7d45a839a697b5eb268c82a71bd8c7f6c94d6fd50c3d577fa39a9f1409f5", size = 24835, upload-time = "2025-09-27T18:37:23.296Z" },
+    { url = "https://files.pythonhosted.org/packages/26/6a/4bf6d0c97c4920f1597cc14dd720705eca0bf7c787aebc6bb4d1bead5388/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_riscv64.whl", hash = "sha256:f3e98bb3798ead92273dc0e5fd0f31ade220f59a266ffd8a4f6065e0a3ce0523", size = 22733, upload-time = "2025-09-27T18:37:24.237Z" },
+    { url = "https://files.pythonhosted.org/packages/14/c7/ca723101509b518797fedc2fdf79ba57f886b4aca8a7d31857ba3ee8281f/markupsafe-3.0.3-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:5678211cb9333a6468fb8d8be0305520aa073f50d17f089b5b4b477ea6e67fdc", size = 23672, upload-time = "2025-09-27T18:37:25.271Z" },
+    { url = "https://files.pythonhosted.org/packages/fb/df/5bd7a48c256faecd1d36edc13133e51397e41b73bb77e1a69deab746ebac/markupsafe-3.0.3-cp314-cp314t-win32.whl", hash = "sha256:915c04ba3851909ce68ccc2b8e2cd691618c4dc4c4232fb7982bca3f41fd8c3d", size = 14819, upload-time = "2025-09-27T18:37:26.285Z" },
+    { url = "https://files.pythonhosted.org/packages/1a/8a/0402ba61a2f16038b48b39bccca271134be00c5c9f0f623208399333c448/markupsafe-3.0.3-cp314-cp314t-win_amd64.whl", hash = "sha256:4faffd047e07c38848ce017e8725090413cd80cbc23d86e55c587bf979e579c9", size = 15426, upload-time = "2025-09-27T18:37:27.316Z" },
+    { url = "https://files.pythonhosted.org/packages/70/bc/6f1c2f612465f5fa89b95bead1f44dcb607670fd42891d8fdcd5d039f4f4/markupsafe-3.0.3-cp314-cp314t-win_arm64.whl", hash = "sha256:32001d6a8fc98c8cb5c947787c5d08b0a50663d139f1305bac5885d98d9b40fa", size = 14146, upload-time = "2025-09-27T18:37:28.327Z" },
+]
+
+[[package]]
+name = "mountpoint-s3-packaging"
+version = "0.1.0"
+source = { virtual = "." }
+dependencies = [
+    { name = "jinja2" },
+]
+
+[package.metadata]
+requires-dist = [{ name = "jinja2", specifier = ">=3.0.0" }]

From 5c6659df9d94886a5e5dd9f356baf2d290878b08 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Tue, 14 Oct 2025 09:26:27 +0000
Subject: [PATCH 09/10] AL2023 Spec file updates

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index 4e4c1f851..5d2f02c01 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -40,10 +40,9 @@ def get_submodule_versions() -> dict[str, str]:
     )
     versions = {}
     for line in result.stdout.strip().split('\n'):
-        parts = line.split(' ', 1)
-        if len(parts) == 2:
-            name, version = parts
-            versions[name] = version.removeprefix('v')
+        match line.split(' ', 1):
+            case [name, version]:
+                versions[name] = version.removeprefix('v')
     return versions
 
 

From 7e8b6cedbdb017a7027451a19960d30b4ab77ca4 Mon Sep 17 00:00:00 2001
From: Tadiwa Magwenzi <tadiwaom@amazon.com>
Date: Tue, 14 Oct 2025 15:07:55 +0000
Subject: [PATCH 10/10] Ouput file path

Signed-off-by: Tadiwa Magwenzi <tadiwaom@amazon.com>
---
 package/generate_spec.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/generate_spec.py b/package/generate_spec.py
index 5d2f02c01..414e298e7 100755
--- a/package/generate_spec.py
+++ b/package/generate_spec.py
@@ -50,6 +50,7 @@ def main() -> None:
     parser = argparse.ArgumentParser(description="Generate RPM spec files for different distributions")
     parser.add_argument("build_target", help="Target distribution (e.g., amzn2023)")
     parser.add_argument("--template", help="Custom template file (default: {build_target}.spec.template)")
+    parser.add_argument("--output", "-o", help="Output file path (default: {build_target}.spec)")
 
     args = parser.parse_args()
     build_target = args.build_target
@@ -74,7 +75,7 @@ def main() -> None:
         version=version, rust_version=rust_version, current_date=current_date, submodule_versions=submodule_versions
     )
 
-    output_file = f"{build_target}.spec"
+    output_file = args.output or f"{build_target}.spec"
     with open(output_file, "w") as f:
         f.write(spec_content)