rust: Relicense some GPL-2.0-or-later to Apache-2.0 OR MIT

Explicit sign-off-by from authors:
Signed-off-by: Timothée Ravier <travier@redhat.com>

rust/src/cliwrap.rs

@@ -1,8 +1,8 @@
 //! Implements the `cliwrap` treefile option which intercepts/proxies
 //! other binaries like `/usr/bin/rpm`.
 
-// SPDX-License-Identifier: GPL-2.0-or-later
-// (FIXME: I think I really meant this to be Apache-2.0 OR MIT)
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::{anyhow, Result};
 use std::io::prelude::*;
 use std::path;

rust/src/cliwrap/cliutil.rs

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::Result;
 use nix::sys::statvfs;
 use std::os::unix::process::CommandExt;

rust/src/cliwrap/dracut.rs

@@ -1,4 +1,5 @@
 // SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::Result;
 
 use crate::cliwrap::cliutil;

rust/src/countme.rs

@@ -1,6 +1,7 @@
 //! Implementation of the "DNF Count Me" system.
-// SPDX-License-Identifier: GPL-2.0-or-later
-// (FIXME: Convert to Apache-2.0 OR MIT for consistency?)
+
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::{bail, Context, Result};
 use curl::easy::Easy;
 use os_release::OsRelease;

rust/src/countme/cookie.rs

@@ -1,5 +1,5 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-// (FIXME: Convert to Apache-2.0 OR MIT for consistency?)
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use anyhow::{bail, Result};
 use chrono::prelude::*;
 use openat_ext::OpenatDirExt;

rust/src/countme/repo.rs

@@ -1,5 +1,4 @@
-// SPDX-License-Identifier: GPL-2.0-or-later
-// (FIXME: Convert to Apache-2.0 OR MIT for consistency?)
+// SPDX-License-Identifier: Apache-2.0 OR MIT
 
 use anyhow::{Context, Result};
 use std::fs;

rust/src/history.rs

@@ -31,8 +31,8 @@
 //! than scanning the whole journal upfront. This can then be e.g. piped through
 //! a pager, stopped after N entries, etc...
 
-// SPDX-License-Identifier: GPL-2.0-or-later
-// (FIXME: Convert to Apache-2.0 OR MIT for consistency?)
+// SPDX-License-Identifier: Apache-2.0 OR MIT
+
 use crate::cxxrsutil::*;
 use crate::ffi::HistoryEntry;
 use anyhow::{anyhow, Result};