fix: ship single-file RPMs per architecture

Author: Sopwit

.github/workflows/ci.yml

@@ -136,40 +136,28 @@ jobs:
       - name: Verify Fedora 43 RPM compatibility
         run: |
           MAIN_RPM="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name 'ro-control-*.x86_64.rpm' | head -n1)"
-          COMMON_RPM="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name 'ro-control-common-*.noarch.rpm' | head -n1)"
 
           if [[ -z "${MAIN_RPM}" ]]; then
             echo "Failed to locate ro-control x86_64 RPM." >&2
             exit 1
           fi
 
-          if [[ -z "${COMMON_RPM}" ]]; then
-            echo "Failed to locate ro-control-common noarch RPM." >&2
-            exit 1
-          fi
-
           rpm -qpR "${MAIN_RPM}" | tee /tmp/ro-control.requires
           if grep -E 'PRIVATE_API' /tmp/ro-control.requires; then
             echo "Forbidden Qt private ABI dependency detected." >&2
             exit 1
           fi
 
           rpm -qpl "${MAIN_RPM}" | grep -Fx '/usr/bin/ro-control'
-          if rpm -qpl "${COMMON_RPM}" | grep -Fx '/usr/bin/ro-control'; then
-            echo "/usr/bin/ro-control must not be shipped by ro-control-common." >&2
-            exit 1
-          fi
 
           cp "${MAIN_RPM}" /tmp/ro-control-x86_64.rpm
-          cp "${COMMON_RPM}" /tmp/ro-control-common-noarch.rpm
 
       - name: Install and smoke-test RPMs
         run: |
           MAIN_RPM=/tmp/ro-control-x86_64.rpm
-          COMMON_RPM=/tmp/ro-control-common-noarch.rpm
 
           dnf clean all
-          dnf -y --refresh --setopt=install_weak_deps=False install "${MAIN_RPM}" "${COMMON_RPM}"
+          dnf -y --refresh --setopt=install_weak_deps=False install "${MAIN_RPM}"
 
           rpm -q ro-control
           command -v ro-control

.github/workflows/release.yml

@@ -161,7 +161,6 @@ jobs:
           cp packaging/rpm/ro-control.spec "${HOME}/rpmbuild/SPECS/ro-control.spec"
           FEDORA_VERSION=43
           MAIN_RPM_PATTERN="ro-control-[0-9]*.${RPM_ARCH}.rpm"
-          COMMON_RPM_PATTERN="ro-control-common-[0-9]*.noarch.rpm"
 
           rpmbuild -ba "${HOME}/rpmbuild/SPECS/ro-control.spec" \
             --define "_topdir ${HOME}/rpmbuild" \
@@ -175,15 +174,6 @@ jobs:
           fi
           cp "${MAIN_RPM_FILE}" "dist/rpm/ro-control-${RPM_ARCH}.rpm"
 
-          COMMON_RPM_FILE="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${COMMON_RPM_PATTERN}" | head -n1)"
-          if [[ -n "${COMMON_RPM_FILE}" ]]; then
-            cp "${COMMON_RPM_FILE}" "dist/rpm/ro-control-common-noarch.rpm"
-          fi
-
-          if [[ "${RPM_ARCH}" == "x86_64" ]]; then
-            cp ~/rpmbuild/SRPMS/*.src.rpm dist/rpm/
-          fi
-
       - name: Verify package metadata
         env:
           VERSION: ${{ needs.metadata.outputs.version }}
@@ -204,27 +194,18 @@ jobs:
           fi
           grep -Fx '/usr/bin/ro-control' "dist/rpm/ro-control-${VERSION}-${RPM_ARCH}-files.txt"
 
-      - name: Verify main/common package split
+      - name: Verify package payload
         env:
           RPM_ARCH: ${{ matrix.arch }}
         run: |
           MAIN_RPM_FILE="dist/rpm/ro-control-${RPM_ARCH}.rpm"
-          COMMON_RPM_FILE="dist/rpm/ro-control-common-noarch.rpm"
 
           if [[ ! -f "${MAIN_RPM_FILE}" ]]; then
             echo "Main ro-control RPM is missing." >&2
             exit 1
           fi
-
-          if [[ ! -f "${COMMON_RPM_FILE}" ]]; then
-            echo "ro-control-common noarch RPM is missing." >&2
-            exit 1
-          fi
-
-          if rpm -qpl "${COMMON_RPM_FILE}" | grep -Fx '/usr/bin/ro-control'; then
-            echo "/usr/bin/ro-control must not be shipped by ro-control-common." >&2
-            exit 1
-          fi
+          rpm -qpl "${MAIN_RPM_FILE}" | grep -Fx '/usr/share/metainfo/io.github.projectroasd.rocontrol.metainfo.xml'
+          rpm -qpl "${MAIN_RPM_FILE}" | grep -Fx '/usr/share/applications/io.github.projectroasd.rocontrol.desktop'
 
       - name: Validate desktop metadata
         run: |
@@ -238,19 +219,13 @@ jobs:
           RPM_ARCH: ${{ matrix.arch }}
         run: |
           RPM_FILE="dist/rpm/ro-control-${RPM_ARCH}.rpm"
-          NOARCH_FILE="dist/rpm/ro-control-common-noarch.rpm"
 
           if [[ ! -f "${RPM_FILE}" ]]; then
             echo "Failed to locate built ${RPM_ARCH} RPM for smoke testing." >&2
             exit 1
           fi
 
-          if [[ ! -f "${NOARCH_FILE}" ]]; then
-            echo "Failed to locate ro-control-common noarch RPM for smoke testing." >&2
-            exit 1
-          fi
-
-          dnf install -y --nogpgcheck "${RPM_FILE}" "${NOARCH_FILE}"
+          dnf install -y --nogpgcheck "${RPM_FILE}"
 
           INSTALLED_VERSION="$(ro-control --version | tr -d '\n')"
           if [[ "${INSTALLED_VERSION}" != "${VERSION}" ]]; then
@@ -279,7 +254,7 @@ jobs:
         with:
           name: ro-control-rpm-${{ matrix.arch }}-${{ needs.metadata.outputs.version }}
           path: |
-            dist/rpm/*
+            dist/rpm/ro-control-${{ matrix.arch }}.rpm
 
   release:
     name: Create GitHub Release
@@ -303,9 +278,3 @@ jobs:
           files: |
             dist/*x86_64.rpm
             dist/*aarch64.rpm
-            dist/*noarch.rpm
-            dist/*.src.rpm
-            dist/*SHA256SUMS.txt
-            dist/*-requires.txt
-            dist/*-info.txt
-            dist/*-files.txt

.github/workflows/rpm-artifacts.yml

@@ -118,7 +118,6 @@ jobs:
           cp packaging/rpm/ro-control.spec "${HOME}/rpmbuild/SPECS/ro-control.spec"
           FEDORA_VERSION=43
           MAIN_RPM_PATTERN="ro-control-[0-9]*.${RPM_ARCH}.rpm"
-          COMMON_RPM_PATTERN="ro-control-common-[0-9]*.noarch.rpm"
 
           rpmbuild -ba "${HOME}/rpmbuild/SPECS/ro-control.spec" \
             --define "_topdir ${HOME}/rpmbuild" \
@@ -133,11 +132,6 @@ jobs:
 
           cp "${MAIN_RPM_FILE}" "dist/rpm/ro-control-${RPM_ARCH}.rpm"
 
-          COMMON_RPM_FILE="$(find ~/rpmbuild/RPMS -maxdepth 2 -type f -name "${COMMON_RPM_PATTERN}" | head -n1)"
-          if [[ -n "${COMMON_RPM_FILE}" ]]; then
-            cp "${COMMON_RPM_FILE}" "dist/rpm/ro-control-common-noarch.rpm"
-          fi
-
       - name: Validate metadata and RPM dependency surface
         env:
           RPM_ARCH: ${{ matrix.arch }}
@@ -146,7 +140,6 @@ jobs:
           appstreamcli validate --no-net data/icons/io.github.projectroasd.rocontrol.metainfo.xml
 
           MAIN_RPM_FILE="dist/rpm/ro-control-${RPM_ARCH}.rpm"
-          COMMON_RPM_FILE="dist/rpm/ro-control-common-noarch.rpm"
 
           rpm -qpR "${MAIN_RPM_FILE}" | tee /tmp/ro-control.requires
           if grep -E 'PRIVATE_API' /tmp/ro-control.requires; then
@@ -155,14 +148,10 @@ jobs:
           fi
 
           rpm -qpl "${MAIN_RPM_FILE}" | grep -Fx '/usr/bin/ro-control'
-          if [[ -f "${COMMON_RPM_FILE}" ]] && rpm -qpl "${COMMON_RPM_FILE}" | grep -Fx '/usr/bin/ro-control'; then
-            echo "/usr/bin/ro-control must only be shipped by the main RPM." >&2
-            exit 1
-          fi
 
       - name: Upload RPM artifacts
         uses: actions/upload-artifact@v7
         with:
           name: ro-control-${{ matrix.arch }}-rpm
           path: |
-            dist/rpm/*
+            dist/rpm/ro-control-${{ matrix.arch }}.rpm

packaging/rpm/ro-control.spec

@@ -3,10 +3,12 @@
 
 Name:           ro-control
 Version:        %{upstream_version}
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Smart NVIDIA driver manager and system monitor
 
 License:        GPL-3.0-or-later
+Vendor:         Project Ro ASD
+Packager:       Project Ro ASD <noreply@github.com>
 URL:            https://github.com/Project-Ro-ASD/ro-Control
 Source0:        %{name}-%{version}.tar.gz
 ExclusiveArch:  x86_64 aarch64
@@ -22,20 +24,10 @@ BuildRequires:  qt6-qtwayland-devel
 BuildRequires:  kf6-qqc2-desktop-style
 BuildRequires:  polkit-devel
 
-Requires:       %{name}-common = %{version}-%{release}
 Requires:       qt6-qtbase
 Requires:       qt6-qtdeclarative
 Requires:       qt6-qtwayland
 
-%description
-ro-Control is a Qt6/KDE Plasma desktop application that helps users
-manage NVIDIA drivers and monitor core system metrics.
-
-%package common
-Summary:        Shared assets for the ro-Control desktop application
-BuildArch:      noarch
-Obsoletes:      %{name} < 0.2.1-1
-
 Requires:       kf6-qqc2-desktop-style
 Requires:       polkit
 Requires:       /usr/bin/dnf
@@ -50,10 +42,9 @@ Recommends:     /usr/sbin/akmods
 Recommends:     /usr/bin/dracut
 Recommends:     /usr/sbin/grubby
 
-%description common
-ro-Control common ships the desktop entry, helper script, shell completions,
-metadata, icons, PolicyKit action, and documentation shared by all supported
-CPU architectures.
+%description
+ro-Control is a Qt6/KDE Plasma desktop application that helps users
+manage NVIDIA drivers and monitor core system metrics.
 
 %prep
 %autosetup -c -T -n %{name}-%{version}
@@ -74,10 +65,8 @@ export QT_QUICK_CONTROLS_STYLE=Basic
 %ctest --output-on-failure
 
 %files
-%{_bindir}/ro-control
-
-%files common
 %license LICENSE
+%{_bindir}/ro-control
 %{_datadir}/applications/io.github.projectroasd.rocontrol.desktop
 %{_datadir}/man/man1/ro-control.1*
 %{_datadir}/metainfo/io.github.projectroasd.rocontrol.metainfo.xml
@@ -92,6 +81,11 @@ export QT_QUICK_CONTROLS_STYLE=Basic
 %{_datadir}/polkit-1/actions/io.github.ProjectRoASD.rocontrol.policy
 
 %changelog
+* Sun May 10 2026 ro-Control Maintainers <noreply@github.com> - 1.1.0-2
+- Merge runtime assets back into the main architecture RPM
+- Make each release RPM installable on its own without a companion noarch package
+- Keep AppStream, desktop entry, icons, helper, and policy metadata in the main package
+
 * Sun May 10 2026 ro-Control Maintainers <noreply@github.com> - 1.1.0-1
 - Target Fedora 43 for CI, RPM validation, and release builds
 - Validate RPM compatibility for x86_64 and aarch64 with store metadata checks