Aligning spec file with fedora review guideline (#98)

* add release

* License: updated and added to each code files

* Added: ownership of health-check network dropin

default healtcheck scripts requires network.target, So
added that as a drop in to greenboot-healtcheck.

* Added  bootupd dependency

* Added no-replace for greenboot.conf

* remove %global debug_package %{nil} from spec

fedora packaging guidelines require debuginfo.

* Use cargo_buildrequires macro to resolve build dependencies

* fix: packit,make rpm,clippy,CI containers

remove all forge and fix packit config
re-aligning saypaul git username

fix clippy warnings

CI containers to have the necessary packages

Author: say-paul

.packit.yaml

@@ -11,6 +11,10 @@ downstream_package_name: greenboot-rs
 
 upstream_tag_template: v{version}
 copy_upstream_release_description: true
+sync_changelog: true
+
+# Use clean release string without commit hashes/branch names
+release_suffix: ""
 
 srpm_build_deps:
   - cargo
@@ -20,11 +24,21 @@ actions:
   - grep -oP '^Version:\s+\K\S+' greenboot-rs.spec
   create-archive:
   - "cargo vendor vendor"
+  # Create archive with version for spec compatibility
   - bash -c "git archive --prefix=greenboot-rs-${PACKIT_PROJECT_VERSION}/ --format=tar HEAD > greenboot-rs-${PACKIT_PROJECT_VERSION}.tar"
   - bash -c "tar -xvf greenboot-rs-${PACKIT_PROJECT_VERSION}.tar"
   - bash -c "tar -czf greenboot-rs-${PACKIT_PROJECT_VERSION}.tar.gz greenboot-rs-${PACKIT_PROJECT_VERSION}"
   - bash -c "rm -rf greenboot-rs-${PACKIT_PROJECT_VERSION} greenboot-rs-${PACKIT_PROJECT_VERSION}.tar vendor"
   - bash -c "ls -1 ./greenboot-rs-*.tar.gz"
+  post-upstream-clone:
+  - "sed -i '/^%global forgeurl/d' greenboot-rs.spec"
+  - "sed -i '/^%forgemeta/d' greenboot-rs.spec"
+  - "sed -i '/^%forgeautosetup/d' greenboot-rs.spec"
+  - bash -c "git config user.name 'Packit Build' || true"
+  - bash -c "git config user.email 'packit@fedoraproject.org' || true"
+  fix-spec-file:
+  # This runs after Packit's release processing - disable debug package to prevent saypaul error
+  - "sed -i '/^License:/a\\%global debug_package %{nil}' greenboot-rs.spec"
 
 jobs:
 - job: copr_build

Cargo.toml

@@ -2,6 +2,7 @@
 name = "greenboot"
 version = "0.1.0"
 edition = "2024"
+license = "BSD-3-Clause"
 
 [lib]
 name = "greenboot"

LICENSE

@@ -1,7 +1,7 @@
 BSD 3-Clause License
 
 Copyright (c) 2022, Antonio Murdaca
-All rights reserved.
+Copyright (c) 2024, Sayan Paul
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:
@@ -26,4 +26,4 @@ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
 CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
 OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

Makefile

@@ -1,10 +1,13 @@
 RELEASE ?= 0
 TARGETDIR ?= target
 SRCDIR ?= .
-COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse HEAD))
+VERSION = $(shell grep -oP '^Version:\s+\K\S+' greenboot-rs.spec)
+COMMIT = $(shell (cd "$(SRCDIR)" && git rev-parse --short HEAD))
+TIMESTAMP = $(shell date +%Y%m%d%H%M%S)
 
-RPM_SPECFILE=rpmbuild/SPECS/greenboot-rs-$(COMMIT).spec
-RPM_TARBALL=rpmbuild/SOURCES/greenboot-rs-$(COMMIT).tar.gz
+# Create unique filenames with version+commit for build isolation
+RPM_SPECFILE=rpmbuild/SPECS/greenboot-rs-$(VERSION)-$(COMMIT).spec
+RPM_TARBALL=rpmbuild/SOURCES/greenboot-rs-$(VERSION).tar.gz
 
 ifeq ($(RELEASE),1)
 	PROFILE ?= release
@@ -19,33 +22,44 @@ all: build check
 
 $(RPM_SPECFILE):
 	mkdir -p $(CURDIR)/rpmbuild/SPECS
-	(echo "%global commit $(COMMIT)"; git show HEAD:greenboot-rs.spec) > $(RPM_SPECFILE)
+	# Copy spec file as-is, no modifications - let the existing release string be used
+	cp greenboot-rs.spec $(RPM_SPECFILE)
 
 $(RPM_TARBALL):
 	mkdir -p $(CURDIR)/rpmbuild/SOURCES
-	git archive --prefix=greenboot-rs-$(COMMIT)/ --format=tar.gz HEAD > $(RPM_TARBALL)
+	# Create tarball with directory name matching spec file expectations: greenboot-rs-<version>/
+	git archive --prefix=greenboot-rs-$(VERSION)/ --format=tar.gz HEAD > $(RPM_TARBALL)
 
 .PHONY: build
 build:
 	cargo build "--target-dir=${TARGETDIR}" ${CARGO_ARGS}
 
-.PHONY: install
-install: build
-	install -D -t ${DESTDIR}/usr/libexec "${TARGETDIR}/${PROFILE}/greenboot"
-	install -D -m 644 -t ${DESTDIR}/usr/lib/systemd/system dist/systemd/system/*.service
-
 .PHONY: check
 check:
-	cargo test "--target-dir=${TARGETDIR}" -- --test-threads=1
+	cargo test "--target-dir=${TARGETDIR}" ${CARGO_ARGS}
+
+.PHONY: fmt
+fmt:
+	cargo fmt
 
 .PHONY: srpm
 srpm: $(RPM_SPECFILE) $(RPM_TARBALL)
-	rpmbuild -bs \
+	rpmbuild -bs $(RPM_SPECFILE) \
 		--define "_topdir $(CURDIR)/rpmbuild" \
-		$(RPM_SPECFILE)
+		--define "_sourcedir $(CURDIR)/rpmbuild/SOURCES" \
+		--define "_specdir $(CURDIR)/rpmbuild/SPECS" \
+		--define "_srcrpmdir $(CURDIR)/rpmbuild/SRPMS"
 
 .PHONY: rpm
 rpm: $(RPM_SPECFILE) $(RPM_TARBALL)
-	rpmbuild -bb \
+	rpmbuild -bb $(RPM_SPECFILE) \
 		--define "_topdir $(CURDIR)/rpmbuild" \
-		$(RPM_SPECFILE)
+		--define "_sourcedir $(CURDIR)/rpmbuild/SOURCES" \
+		--define "_specdir $(CURDIR)/rpmbuild/SPECS" \
+		--define "_builddir $(CURDIR)/rpmbuild/BUILD" \
+		--define "_rpmdir $(CURDIR)/rpmbuild/RPMS"
+
+.PHONY: clean
+clean:
+	cargo clean "--target-dir=${TARGETDIR}"
+	rm -rf rpmbuild

greenboot-rs.spec

@@ -1,21 +1,17 @@
-%global debug_package %{nil}
+Name:               greenboot-rs
+Version:            0.16.0
+Release:            2%{?dist}
+Summary:            Generic Health Check Framework for systemd
+License:            BSD-3-Clause
+
 %bcond_without check
 %global __cargo_skip_build 0
 %global __cargo_is_lib() false
-%global forgeurl https://github.com/fedora-iot/greenboot-rs
 %global pkgname greenboot
 
-Version:            0.16.0
 
-%forgemeta
-
-Name:               greenboot-rs
-Release:            2%{?dist}
-Summary:            Generic Health Check Framework for systemd
-License:            BSD-3-Clause
-
-URL:               %{forgeurl}
-Source0:           %{forgesource}
+URL:                https://github.com/fedora-iot/greenboot-rs
+Source0:            %{name}-%{version}.tar.gz
 
 ExcludeArch:    s390x i686 %{power64}
 
@@ -26,23 +22,9 @@ BuildRequires:  rust-packaging
 %endif
 BuildRequires:      systemd-rpm-macros
 
-# greenboot dependencies
-BuildRequires: rust-anyhow-devel
-BuildRequires: rust-clap+default-devel
-BuildRequires: rust-clap_derive-devel
-BuildRequires: rust-config-devel
-BuildRequires: rust-env_logger-devel
-BuildRequires: rust-glob-devel
-BuildRequires: rust-once_cell-devel
-BuildRequires: rust-pretty_env_logger-devel
-BuildRequires: rust-serde_json-devel
-BuildRequires: rust-tempfile+default-devel
-BuildRequires: rust-thiserror-devel
-BuildRequires: rust-config+default-devel
-BuildRequires: rust-nix-devel
-
 %{?systemd_requires}
 Requires:           systemd >= 240
+Requires:           bootupd
 Requires:           rpm-ostree
 # PAM is required to programmatically read motd messages from /etc/motd.d/*
 # This causes issues with RHEL-8 as the fix isn't there an el8 is on pam-1.3.x
@@ -78,9 +60,12 @@ Requires:           jq
 %{summary}.
 
 %prep
-%forgeautosetup
+%autosetup -n %{name}-%{version}
 %cargo_prep
 
+%generate_buildrequires
+%cargo_generate_buildrequires -a
+
 %build
 %cargo_build
 
@@ -132,7 +117,7 @@ install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-net
 %{_unitdir}/greenboot-healthcheck.service
 %{_unitdir}/greenboot-set-rollback-trigger.service
 %{_unitdir}/greenboot-success.target
-%{_sysconfdir}/%{pkgname}/greenboot.conf
+%config(noreplace) %{_sysconfdir}/%{pkgname}/greenboot.conf
 %{_prefix}/lib/bootupd/grub2-static/configs.d/08_greenboot.cfg
 %dir %{_prefix}/lib/%{pkgname}
 %dir %{_prefix}/lib/%{pkgname}/check
@@ -148,6 +133,7 @@ install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-net
 %dir %{_sysconfdir}/%{pkgname}/red.d
 
 %files -n %{pkgname}-default-health-checks
+%dir %{_unitdir}/greenboot-healthcheck.service.d
 %{_prefix}/lib/%{pkgname}/check/wanted.d/01_update_platforms_check.sh
 %{_prefix}/lib/%{pkgname}/check/required.d/02_watchdog.sh
 %{_prefix}/lib/%{pkgname}/check/required.d/01_repository_dns_check.sh
@@ -158,6 +144,6 @@ install -DpZm 0644 usr/lib/systemd/system/greenboot-healthcheck.service.d/10-net
 - Update src to greenboot-rs, binaries remain greenboot
 - Obsoletes/Conflicts for bash greenboot, Provides greenboot
 
-* Thu Jul 24 2025 Sayan Paul <paul.sayan@gmail.com> - 0.16.0-1
+* Thu Jul 24 2025 Sayan Paul <saypaul@redhat.com> - 0.16.0-1
 - Initial Package
-- Switched to native Fedora dependencies, removing vendoring.
+- Switched to native Fedora dependencies, removing vendoring.

src/lib/greenboot.rs

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
 use anyhow::{Result, bail};
 use glob::glob;
 use std::collections::HashSet;
@@ -136,12 +138,12 @@ fn run_scripts(name: &str, path: &str, disabled_scripts: Option<&[String]>) -> S
         };
 
         // Check if script/binary should be skipped
-        if let Some(disabled) = disabled_scripts {
-            if disabled.contains(&file_name.to_string()) {
-                log::info!("Skipping disabled script: {file_name}");
-                result.skipped.push(file_name.to_string());
-                continue;
-            }
+        if let Some(disabled) = disabled_scripts
+            && disabled.contains(&file_name.to_string())
+        {
+            log::info!("Skipping disabled script: {file_name}");
+            result.skipped.push(file_name.to_string());
+            continue;
         }
 
         log::info!("running {} check {}", name, entry.to_string_lossy());

src/lib/grub.rs

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
 use anyhow::{Context, Result, bail};
 use std::path::Path;
 use std::process::Command;

src/lib/handler.rs

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
 use anyhow::{Context, Result, anyhow, bail};
 use serde_json::Value;
 use std::path::Path;
@@ -12,15 +14,12 @@ fn detect_os_deployment() -> Option<&'static str> {
     if let Ok(output) = Command::new("bootc")
         .args(["status", "--booted", "--json"])
         .output()
+        && output.status.success()
+        && let Ok(json) = serde_json::from_slice::<Value>(&output.stdout)
+        && json.get("kind").and_then(|v| v.as_str()) == Some("BootcHost")
     {
-        if output.status.success() {
-            if let Ok(json) = serde_json::from_slice::<Value>(&output.stdout) {
-                if json.get("kind").and_then(|v| v.as_str()) == Some("BootcHost") {
-                    log::info!("System detected as bootc-managed host.");
-                    return Some("bootc");
-                }
-            }
-        }
+        log::info!("System detected as bootc-managed host.");
+        return Some("bootc");
     }
 
     // 2. If not bootc, check if it's an ostree-based OS by looking for /run/ostree-booted.

src/lib/mod.rs

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
 pub mod greenboot;
 pub mod grub;
 pub mod handler;

src/lib/mount.rs

@@ -1,3 +1,5 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
 use log::{info, warn};
 use std::fs;
 use std::path::Path;