Use toolbox when make rpm-release

Author: rubiojr

.goreleaser.yml

@@ -126,7 +126,8 @@ nfpms:
     package_name: whereami
     file_name_template: >-
       {{ .PackageName }}-
-      {{- .Version }}-
+      {{- .Version }}-1.fc
+      {{- if .Env.FEDORA_VERSION }}{{ .Env.FEDORA_VERSION }}{{ else }}42{{ end }}.
       {{- if eq .Arch "amd64" }}x86_64
       {{- else if eq .Arch "386" }}i386
       {{- else }}{{ .Arch }}{{ end }}

Makefile

@@ -268,9 +268,15 @@ release-snapshot: check-release-deps
 	goreleaser release --snapshot --clean
 
 # Build RPMs using the generic configuration
-release-rpm: check-release-deps
-	@echo "==> Building RPMs with GoReleaser"
-	goreleaser release --config .goreleaser.yml --snapshot --clean
+release-rpm:
+	@echo "==> Building RPMs with build-toolbox.sh"
+	@if [ ! -x scripts/build-toolbox.sh ]; then \
+		echo "Error: scripts/build-toolbox.sh not found or not executable"; \
+		exit 1; \
+	fi
+	./scripts/build-toolbox.sh
+
+
 
 # Create a full release (requires git tag)
 release: check-release-deps
@@ -305,9 +311,10 @@ help:
 	@echo "  flatpak-run       Run installed Flatpak"
 	@echo "  flatpak-clean     Remove Flatpak build dirs"
 	@echo "  flatpak-rebuild   Clean + build + install"
+	@echo "  flatpak-bundle    Create distributable .flatpak file"
+	@echo "  flatpak-release   Upload .flatpak to latest GitHub release"
 	@echo "  release-snapshot  Build snapshot release with GoReleaser"
-	@echo "  release-rpm       Build generic RPMs with GoReleaser"
-	@echo "  release-rpm-fedora Build Fedora-specific RPMs"
+	@echo "  release-rpm       Build RPMs using build-toolbox.sh"
 	@echo "  release           Create full release (requires git tag)"
 	@echo "  print-vars        Show variable values"
 	@echo "  help              This message"
@@ -325,7 +332,9 @@ help:
 	@echo ""
 	@echo "Release examples:"
 	@echo "  make release-snapshot    # Test build without publishing"
-	@echo "  make release-rpm         # Build RPMs for distribution"
+	@echo "  make release-rpm         # Build RPMs in Fedora toolbox"
+	@echo "  make flatpak-bundle      # Create .flatpak file"
+	@echo "  make flatpak-release     # Upload .flatpak to GitHub"
 	@echo "  git tag -a v1.0.0 -m 'Release v1.0.0'"
 	@echo "  make release             # Create GitHub release"
 	@echo ""

scripts/build-toolbox.sh

@@ -253,7 +253,7 @@ DEPS_EOF
 
 # Function to run the build
 run_build() {
-    print_info "Running make release-rpm in toolbox..."
+    print_info "Running goreleaser in toolbox..."
 
     # Check if project is under home directory
     if [[ "$PROJECT_ROOT" != "$HOME"* ]]; then
@@ -263,7 +263,7 @@ run_build() {
 
     # Run build in toolbox (home directory is automatically mounted)
     if ! toolbox run --container "$TOOLBOX_NAME" \
-         bash -c "cd '$PROJECT_ROOT' && source ~/.bashrc && make release-rpm"; then
+         bash -c "cd '$PROJECT_ROOT' && source ~/.bashrc && FEDORA_VERSION=\$(rpm -E %fedora) goreleaser release --config .goreleaser.yml --snapshot --clean"; then
         print_error "Build failed in toolbox"
         exit 1
     fi