Skip to content

Fix POSIX portability, Source0 naming, and License tags in RPM specs and e2e tests #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ayanimea merged 3 commits into from
Mar 8, 2026
Merged

Fix POSIX portability, Source0 naming, and License tags in RPM specs and e2e tests #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
afd27c3
Initial plan
Copilot Mar 8, 2026
f879561
Fix head -3 portability, Source0 name, and License tags in specs and …
Copilot Mar 8, 2026
8ab4c68
Fix tarball name in workflows to match lowercase spec packname (xnee)
Copilot Mar 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/el6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ jobs:
| tr -d ' ')
# git safe.directory was added in git 2.35.2; ignore errors on older git.
git config --global --add safe.directory "$(pwd)" 2>/dev/null || true
git archive --prefix="Xnee-${XNEE_VERSION}/" HEAD \
| gzip > "Xnee-${XNEE_VERSION}.tar.gz"
git archive --prefix="xnee-${XNEE_VERSION}/" HEAD \
| gzip > "xnee-${XNEE_VERSION}.tar.gz"

- name: Build RPM inside CentOS 6 container
run: |
Expand Down Expand Up @@ -147,7 +147,7 @@ jobs:
| awk 'BEGIN {FS=","} { print $2 }' | tr -d ' ')
XNEE_RELEASE=1
mkdir -p "$HOME/rpmbuild"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
cp "Xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
cp "xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
sed \
-e "s/XNEE_VERSION/${XNEE_VERSION}/g" \
-e "s/XNEE_RELEASE/${XNEE_RELEASE}/g" \
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/el8.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ jobs:
git config --global --add safe.directory "$(pwd)"
# Use git archive to avoid the doc/Makefile.am dia→png generation
# that make dist triggers even with --disable-doc.
git archive --prefix="Xnee-${XNEE_VERSION}/" HEAD \
| gzip > "Xnee-${XNEE_VERSION}.tar.gz"
git archive --prefix="xnee-${XNEE_VERSION}/" HEAD \
| gzip > "xnee-${XNEE_VERSION}.tar.gz"

- name: Build RPM package
run: |
Expand All @@ -73,7 +73,7 @@ jobs:

mkdir -p "$HOME/rpmbuild"/{BUILD,RPMS,SOURCES,SPECS,SRPMS}

cp "Xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"
cp "xnee-${XNEE_VERSION}.tar.gz" "$HOME/rpmbuild/SOURCES/"

sed \
-e "s/XNEE_VERSION/${XNEE_VERSION}/g" \
Expand Down
8 changes: 2 additions & 6 deletions build/SPECS/cnee-el6.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
%define packname Xnee
%define packname xnee

Copilot AI Mar 8, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The same packname change from Xnee to xnee creates an identical mismatch with the CI pipeline in .github/workflows/el6.yml.

After this change, Source0 resolves to .../xnee-%{version}.tar.gz and %setup -q -n %{packname}-%{version} expects a directory named xnee-<version> inside the archive. However, the EL6 CI workflow (.github/workflows/el6.yml, lines 119–120, 150) creates and copies a tarball named Xnee-${XNEE_VERSION}.tar.gz with an archive prefix Xnee-<version>/. This will cause rpmbuild to fail at the %prep stage: the source file xnee-<version>.tar.gz will not be found, and %setup would also fail to find the xnee-<version> directory inside the archive.

The CI workflows need to be updated to use lowercase xnee-${XNEE_VERSION}.tar.gz / --prefix="xnee-${XNEE_VERSION}/" to match the updated spec, or the spec packname should stay as Xnee.

Suggested change
%define packname xnee
%define packname Xnee

Copilot uses AI. Check for mistakes.
%define cliname cnee

Name: %{cliname}
Version: XNEE_VERSION
Release: XNEE_RELEASE%{?dist}
Summary: X11 event recorder, replayer and distributor (command line tool)

# NOTE: The COPYING file in this package contains the GNU General Public
# License version 3 (GPLv3). The License tag below reflects the original
# upstream project packaging convention and has not been updated to GPLv3+
# to avoid unintended changes to distributed package metadata.
License: GPLv2+
License: GPLv3+
URL: https://www.gnu.org/software/xnee
Source0: https://ftp.gnu.org/pub/gnu/xnee/%{packname}-%{version}.tar.gz

Expand Down
8 changes: 2 additions & 6 deletions build/SPECS/cnee-el8.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
%define packname Xnee
%define packname xnee

Copilot AI Mar 8, 2026

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The packname change from Xnee to xnee introduces a mismatch between the spec file and the CI pipeline in .github/workflows/el8.yml.

After this change, Source0 resolves to .../xnee-%{version}.tar.gz and %setup -q -n %{packname}-%{version} expects a top-level directory named xnee-<version> inside the archive. However, the CI workflow (.github/workflows/el8.yml, lines 64–65) creates the source tarball with:

git archive --prefix="Xnee-${XNEE_VERSION}/" HEAD | gzip > "Xnee-${XNEE_VERSION}.tar.gz"

and copies it as Xnee-${XNEE_VERSION}.tar.gz (line 76) into $HOME/rpmbuild/SOURCES/. RPM rpmbuild will fail because it cannot find a source file named xnee-<version>.tar.gz, and even if the filename were matched, %setup would fail to find the expected directory xnee-<version> inside the archive (the archive root is Xnee-<version>/).

Either the CI workflow must also be updated to produce xnee-${XNEE_VERSION}.tar.gz / --prefix="xnee-${XNEE_VERSION}/", or the packname in the spec should remain Xnee to match the CI-produced tarball.

Suggested change
%define packname xnee
%define packname Xnee

Copilot uses AI. Check for mistakes.
%define cliname cnee

Name: %{cliname}
Version: XNEE_VERSION
Release: XNEE_RELEASE%{?dist}
Summary: X11 event recorder, replayer and distributor (command line tool)

# NOTE: The COPYING file in this package contains the GNU General Public
# License version 3 (GPLv3). The License tag below reflects the original
# upstream project packaging convention and has not been updated to GPL-3.0-or-later
# to avoid unintended changes to distributed package metadata.
License: GPL-2.0-or-later
License: GPL-3.0-or-later
URL: https://www.gnu.org/software/xnee
Source0: https://ftp.gnu.org/pub/gnu/xnee/%{packname}-%{version}.tar.gz

Expand Down
4 changes: 2 additions & 2 deletions tests/e2e_cnee.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ assert_output_contains() {
if echo "$_out" | grep -Eq "$_ere_pat"; then
pass "$_desc"
else
fail "$_desc" "output matching '$_ere_pat'" "$(echo "$_out" | head -3)"
fail "$_desc" "output matching '$_ere_pat'" "$(echo "$_out" | head -n 3)"
fi
}

Expand Down Expand Up @@ -446,7 +446,7 @@ else
pass "cnee --replay connects to virtual display successfully"
else
fail "cnee --replay connects to virtual display successfully" \
"no display error" "$(head -3 "$REPLAY_STDERR")"
"no display error" "$(head -n 3 "$REPLAY_STDERR")"
fi

kill "$XVFB_PID" 2>/dev/null
Expand Down