From 8d539cc6203685d5d55701f88db771d3cf8793be Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Dec 30 2022 22:24:53 +0000
Subject: [PATCH 1/3] Packaging tutorial: Grammar improvement


---

diff --git a/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc b/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
index 18fa402..fc8656f 100644
--- a/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
+++ b/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
@@ -217,7 +217,7 @@ Installed (but unpackaged) file(s) found:
 /usr/share/man/man1/hello.1.gz
 ----
 
-The Packaging Guidelines have dedicated section for
+The Packaging Guidelines have a dedicated section for
 xref:packaging-guidelines::index.adoc#_manpages[Manpages].
 Following its instructions, manpages are list as follows:
 

From 2577b4dd2e32ad0273f16d17da8bac46f47cf963 Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Dec 30 2022 22:24:53 +0000
Subject: [PATCH 2/3] Packaging tutorial: Use Source instead of Source0


Fedora Packaging Guidelines prefer using just 'Source'
instead of 'Source0' in specfiled.
Adjust the tutorial to follow the same convention.

---

diff --git a/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc b/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
index fc8656f..acb9abd 100644
--- a/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
+++ b/modules/ROOT/pages/Packaging_Tutorial_GNU_Hello.adoc
@@ -72,7 +72,7 @@ Release:  1%{?dist}
 Summary:  Produces a familiar, friendly greeting
 License:  GPLv3+
 URL:      https://www.gnu.org/software/hello/
-Source0:  https://ftp.gnu.org/gnu/hello/hello-%{version}.tar.gz
+Source:   https://ftp.gnu.org/gnu/hello/hello-%{version}.tar.gz
 
 %description
 The GNU Hello program produces a familiar, friendly greeting. Yes, this is
@@ -167,7 +167,7 @@ by adding `+BuildRequires:+` rows to the specfile.
 In Fedora, GCC is the standard compiler,
 so we need to add a row for `+gcc+`.
 GNU Hello also uses `+make+`, so a row should be added for it, too.
-Add these lines after `Source0`:
+Add these lines after `Source`:
 
 [source, rpm-spec]
 ----
@@ -385,7 +385,7 @@ Summary:        Produces a familiar, friendly greeting
 
 License:        GPLv3+
 URL:            http://ftp.gnu.org/gnu/%{name}
-Source0:        http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
+Source:         http://ftp.gnu.org/gnu/%{name}/%{name}-%{version}.tar.gz
 
 BuildRequires:  gcc
 BuildRequires:  gettext

From 2ef1242323810fd72b0b30719301591a66d3690a Mon Sep 17 00:00:00 2001
From: Otto Liljalaakso <otto.liljalaakso@iki.fi>
Date: Dec 30 2022 22:24:53 +0000
Subject: [PATCH 3/3] Update links to the Packaging Tutorial


Old links were pointing to a Quick Docs page
that now redirects to Packaging Tutorial: GNU Hello.
Replace with direct link there.

---

diff --git a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc
index b317213..488a671 100644
--- a/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc
+++ b/modules/ROOT/pages/New_Package_Process_for_Existing_Contributors.adoc
@@ -13,7 +13,7 @@ Be comfortable with them.
 ** You should make sure that it is a new package.
 A list of existing packages in Fedora Packages is here: https://src.fedoraproject.org/projects/rpms/*
 
-** Some information on how to create an RPM package is in https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages[Creating RPM packages].
+** Some information on how to create an RPM package is in xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello].
 
 ** Make sure that your package meets the https://docs.fedoraproject.org/en-US/packaging-guidelines/[Packaging Guidelines]
 and https://docs.fedoraproject.org/en-US/packaging-guidelines/Naming/[Package Naming Guidelines]
diff --git a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc
index 6da6abf..be34e95 100644
--- a/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc
+++ b/modules/ROOT/pages/New_Package_Process_for_New_Contributors.adoc
@@ -35,7 +35,7 @@ for packages under review.
 == Make a Package
 
 * If you don't know how to create an RPM package,
-see the https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/index.html[How to create an RPM package].
+see the xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello].
 
 * Make sure that your package meets the https://docs.fedoraproject.org/en-US/packaging-guidelines/[Packaging Guidelines] and https://docs.fedoraproject.org/en-US/packaging-guidelines/Naming/[Package Naming Guidelines].
 
diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
index 307c297..6c119ee 100644
--- a/modules/ROOT/pages/Package_Maintenance_Guide.adoc
+++ b/modules/ROOT/pages/Package_Maintenance_Guide.adoc
@@ -14,7 +14,7 @@ In fact, Fedora packaging can be a relatively painless introduction to it.
 
 You may have been looking for, or also be interested in:
 
-* https://docs.fedoraproject.org/en-US/quick-docs/creating-rpm-packages/[Creating RPM packages]
+* xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello]
 * https://docs.fedoraproject.org/en-US/packaging-guidelines/[Packaging Guidelines]
 
 [#installing_fedpkg_and_doing_initial_setup]

