From c6901e3dd86efbad3a458c7ded5b874b5ef96a95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Such=C3=A1nek?= <msuchane@redhat.com>
Date: Mon, 27 Feb 2023 20:40:04 +0100
Subject: [PATCH] Update the version to 2.12.0

---
 CHANGELOG.md |  5 +++++
 Cargo.lock   | 11 ++++++-----
 Cargo.toml   |  6 ++++--
 PACKAGING.md | 26 +++++++-------------------
 newdoc.spec  |  5 +----
 5 files changed, 23 insertions(+), 30 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 09ae5e0..a2624c9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 The following is a summary of changes in each `newdoc` release, which is also a Git tag by the same name in this repository.
 
+## v2.12.0
+
+* Deprecate the `--validate` (`-l`) option. Please use `enki` instead: <https://github.com/Levi-Leah/enki/>.
+* Switch to the `bpaf` command-line argument parser.
+
 ## v2.11.0
 
 * Separate options for the module type prefix in IDs (anchors) and file names.
diff --git a/Cargo.lock b/Cargo.lock
index 30a4c14..323a190 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -354,7 +354,7 @@ dependencies = [
 
 [[package]]
 name = "newdoc"
-version = "2.11.0"
+version = "2.12.0"
 dependencies = [
  "askama",
  "bpaf",
@@ -363,6 +363,7 @@ dependencies = [
  "log",
  "regex",
  "simplelog",
+ "time",
 ]
 
 [[package]]
@@ -575,9 +576,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.20"
+version = "0.3.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0cbfecb4d19b5ea75bb31ad904eb5b9fa13f21079c3b92017ebdf4999a5890"
+checksum = "53250a3b3fed8ff8fd988587d8925d26a83ac3845d9e03b220b37f34c2b8d6c2"
 dependencies = [
  "itoa",
  "libc",
@@ -595,9 +596,9 @@ checksum = "2e153e1f1acaef8acc537e68b44906d2db6436e2b35ac2c6b42640fff91f00fd"
 
 [[package]]
 name = "time-macros"
-version = "0.2.8"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd80a657e71da814b8e5d60d3374fc6d35045062245d80224748ae522dd76f36"
+checksum = "a460aeb8de6dcb0f381e1ee05f1cd56fcf5a5f6eb8187ff3d8f0b11078d38b7c"
 dependencies = [
  "time-core",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 466db8e..a757ece 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "newdoc"
-version = "2.11.0"
+version = "2.12.0"
 description = "Generate pre-populated module files formatted with AsciiDoc that are used in Red Hat and Fedora documentation."
 authors = ["Marek Suchánek <msuchane@redhat.com>"]
 license = "GPL-3.0-or-later"
 edition = "2021"
 # Check the Rust version using `cargo msrv verify`.
-rust-version = "1.60"
+rust-version = "1.62"
 documentation = "https://docs.rs/newdoc"
 readme = "README.md"
 repository = "https://github.com/redhat-documentation/newdoc/"
@@ -25,6 +25,8 @@ askama = "0.11"
 # Disable support for tracing_error and SpanTrace in eyre
 color-eyre = { version = "0.6", default-features = false }
 dialoguer = "0.10"
+# Preserve MSRV at 1.62:
+time = "=0.3.19"
 
 [build-dependencies]
 bpaf = { version = "0.7", features = ["derive", "manpage"]}
diff --git a/PACKAGING.md b/PACKAGING.md
index 4463932..c1a8c1b 100644
--- a/PACKAGING.md
+++ b/PACKAGING.md
@@ -4,31 +4,19 @@ The following are instructions for the maintainers of `newdoc` to package and di
 
 ## Packaging and distributing newdoc as an RPM package
 
-1. Install the  `cargo` package manager. For details, see <https://rustup.rs/>.
+1. Log into the Copr repository administration: <https://copr.fedorainfracloud.org/coprs/mareksu/newdoc-rs/>.
 
-2. Install the `cargo-rpm` extension:
+2. Go to the **Builds** tab.
 
-    ```
-    $ cargo install cargo-rpm
-    ```
-
-3. In the `newdoc` project directory, build RPM packages:
-
-    ```
-    $ cargo rpm build
-    ```
-
-    This command build packages in the `target/release/rpmbuild/` directory.
-
-4. Log into the Copr repository administration: <https://copr.fedorainfracloud.org/coprs/mareksu/newdoc-rs/>.
+3. Click **New Build**.
 
-5. Go to the **Builds** tab.
+4. Select **SCM**.
 
-6. Click **New Build** and select **Upload**.
+5. In the **Clone url** field, paste `https://github.com/redhat-documentation/newdoc`.
 
-7. In the **Provide the source** section, upload the most recent SRPM package from the `target/release/rpmbuild/SRPMS/` directory.
+6. In the **Spec File** field, use `newdoc.spec`.
 
-8. Click **Build**.
+7. Click **Build**.
 
 ## Packaging and distributing newdoc on Crates.io
 
diff --git a/newdoc.spec b/newdoc.spec
index 113639e..02a1d1d 100644
--- a/newdoc.spec
+++ b/newdoc.spec
@@ -1,6 +1,6 @@
 Name: newdoc
 Summary: Generate an AsciiDoc file using a modular template
-Version: 2.11.0
+Version: 2.12.0
 Release: 1%{?dist}
 License: GPLv3+
 URL: https://github.com/redhat-documentation/newdoc
@@ -45,9 +45,6 @@ gzip -c target/release/build/%{name}-*/out/%{name}.1 > %{name}.1.gz
 # Install the man page into the chroot environment.
 install -m 0644 %{name}.1.gz %{buildroot}%{_mandir}/man1/%{name}.1.gz
 
-%clean
-rm -rf %{buildroot}
-
 %files
 # Pick documentation and license files from the source directory.
 %doc README.md