release: name /opt package rrdtool-1-opt (concrete major version)

Use the concrete major version `1` rather than a literal `1.x`
placeholder, matching the established distro convention for
version-pinned package names (gcc-12, postgresql-15, python3). The
major version is itself the SemVer compatibility boundary, so `1`
carries the full meaning; the `x` was a constant conveying nothing a
package resolver acts on. @oetiker

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 69d9a18c9deff39f373d385f70f52cf7ccaae821..a93afecd059403c79943c19ccdcb9ab1b0474418 100644 (file)
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -322,7 +322,7 @@ jobs:
           set -e
           mkdir -p out
           # Copy only the binary rpm (not the src.rpm — design says binaries only)
-          cp ~/rpmbuild/RPMS/x86_64/rrdtool-1.x-opt-${VERSION}-*.rpm out/
+          cp ~/rpmbuild/RPMS/x86_64/rrdtool-1-opt-${VERSION}-*.rpm out/
           ls -l out/
 
       - uses: actions/upload-artifact@v6
@@ -339,9 +339,9 @@ jobs:
           # Install the distro rrdtool first to prove DB-level coexistence.
           dnf install -y rrdtool
           # Install our /opt package alongside it.
-          dnf install -y ./out/rrdtool-1.x-opt-${VERSION}-*.rpm
+          dnf install -y ./out/rrdtool-1-opt-${VERSION}-*.rpm
           # Both packages must be in the rpm database at the same time.
-          rpm -q rrdtool rrdtool-1.x-opt
+          rpm -q rrdtool rrdtool-1-opt
           # The distro binary and ours both run, independently.
           rrdtool --version
           /opt/rrdtool/bin/rrdtool --version
@@ -443,7 +443,7 @@ jobs:
           set -e
           mkdir -p out
           fpm -s dir -t deb \
-              -n rrdtool-1.x-opt \
+              -n rrdtool-1-opt \
               -v "$VERSION" \
               --iteration "1~${DISTRO_TAG}" \
               --license "GPL-2.0-or-later WITH FLOSS-exception-1.0" \
@@ -475,9 +475,9 @@ jobs:
           # Install the distro rrdtool first to prove DB-level coexistence.
           apt-get install -y rrdtool
           # Install our /opt package alongside it.
-          apt-get install -y ./out/rrdtool-1.x-opt_*.deb
+          apt-get install -y ./out/rrdtool-1-opt_*.deb
           # Both packages must be in the dpkg database at the same time.
-          dpkg -l rrdtool rrdtool-1.x-opt
+          dpkg -l rrdtool rrdtool-1-opt
           # The distro binary and ours both run, independently.
           rrdtool --version
           /opt/rrdtool/bin/rrdtool --version

diff --git a/conftools/rrdtool-opt.spec b/conftools/rrdtool-opt.spec
index 11f09720885be9e74e796281c80f86c4cd84a535..7f0c189d3e5238a7f51671ee1f3058023538fea0 100644 (file)
--- a/conftools/rrdtool-opt.spec
+++ b/conftools/rrdtool-opt.spec
@@ -7,7 +7,7 @@
 #
 # @VERSION@ is substituted by the release workflow before invoking rpmbuild.
 
-Name:           rrdtool-1.x-opt
+Name:           rrdtool-1-opt
 Version:        @VERSION@
 Release:        1%{?dist}
 Summary:        Round Robin Database Tool (upstream /opt build)