Minor fixes for release

Author: cracksalad

CONTRIBUTING.md

@@ -8,7 +8,7 @@
 `docker run -v ./pkg/network-journal.spec:/root/rpmbuild/SPECS/network-journal.spec -v ./pkg:/root/rpmbuild/target -it network-journal/rpmbuild:latest /bin/bash`
 1. Run the following commands inside the container while replacing `<version>` with the version to build (e.g. "0.1.0"):  
 ```bash
-wget http://github.com/nerou42/network-journal/archive/v<version>/network-journal-<version>.tar.gz -O SOURCES/network-journal-<version>.tar.gz
+wget http://github.com/nerou42/network-journal/archive/network-journal-<version>/network-journal-<version>.tar.gz -O SOURCES/network-journal-<version>.tar.gz
 rpmbuild -bb SPECS/network-journal.spec
 mv RPMS/x86_64/network-journal-<version>-1.el9.x86_64.rpm target/
 ```

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "network-journal"
-version = "0.5.1"
+version = "0.5.2"
 authors = ["nerou GmbH"]
 description = "Collect network reports (like CSP, NEL, DMARC etc.) and print them to file"
 repository = "https://github.com/nerou42/network-journal"

Cargo.toml

@@ -9,12 +9,11 @@ Summary:        Webserver and IMAP client to collect standardized browser and ma
 License:        GPL-3.0-or-later
 URL:            https://github.com/nerou42/network-journal
 
-Source0:        https://github.com/nerou42/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/nerou42/%{name}/archive/%{name}-%{version}/%{name}-%{version}.tar.gz
 
 BuildArch:      x86_64
 BuildRequires:  systemd-rpm-macros
-BuildRequires:  gcc, openssl-devel
-BuildRequires:  (cargo or /root/.cargo/bin/cargo)
+BuildRequires:  gcc, openssl-devel, cargo
 
 
 %description
@@ -23,7 +22,7 @@ All collected data is logged to a file that can be processed with, e.g. an ELK-s
 
 
 %prep
-%setup
+%setup -n %{name}-%{name}-%{version}
 cargo fetch --locked -q
 
 
@@ -76,6 +75,10 @@ cargo test -r
 
 
 %changelog
+* Sun Oct 26 2025 nerou GmbH <info@nerou.de>
+- Add cargo as build dependency
+- Fix license notation's SPDX compatibility
+
 * Wed Sep 24 2025 nerou GmbH <info@nerou.de>
 - Add configuration reference file
 - Fix compatibility issues

pkg/network-journal.spec

@@ -1,11 +1,11 @@
 FROM almalinux:9-minimal
 
 # microdnf install -y almalinux-release-devel && microdnf install -y python3-rust2rpm
+# (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y)
 RUN rpm -e --nodeps coreutils-single && \
     microdnf upgrade -y && \
-    microdnf install -y wget tar git chkconfig coreutils diffutils patch gcc openssl-devel && \
+    microdnf install -y wget tar git chkconfig coreutils diffutils patch gcc openssl-devel cargo && \
     microdnf install -y rpm-build rpm-devel rpmlint rpmdevtools && \
-    (curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y) && \
 	microdnf clean all && rm -rf /var/cache/yum && \
     mkdir /root/rpmbuild && cd /root/rpmbuild && \
     rpmdev-setuptree