From 4c180976852d859fb7e9a433039118efad63f655 Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jun 09 2024 19:51:16 +0000 Subject: [PATCH 1/2] Add main page for packaging tutorial To make it simpler to link to the packaging tutorial, add a main page for it. The content is very simplistic, at least for now. All the actual content is in tutorial sections, and it does not seem worthwhile to repeat any of it in the main page. --- diff --git a/modules/ROOT/nav.adoc b/modules/ROOT/nav.adoc index f879fb6..c608d8a 100644 --- a/modules/ROOT/nav.adoc +++ b/modules/ROOT/nav.adoc @@ -11,7 +11,7 @@ ** xref:New_Package_Process_for_Existing_Contributors.adoc[for Existing Contributors] ** xref:New_Package_Process_for_New_Contributors.adoc[for New Contributors] -* Packaging Tutorial +* xref:Packaging_Tutorial.adoc[Packaging Tutorial] ** xref:Packaging_Tutorial_1_banner.adoc[Packaging Tutorial 1: banner] ** xref:Packaging_Tutorial_2_GNU_Hello.adoc[Packaging Tutorial 2: GNU Hello] diff --git a/modules/ROOT/pages/Joining_the_Package_Maintainers.adoc b/modules/ROOT/pages/Joining_the_Package_Maintainers.adoc index 621a8cd..cbfbedb 100644 --- a/modules/ROOT/pages/Joining_the_Package_Maintainers.adoc +++ b/modules/ROOT/pages/Joining_the_Package_Maintainers.adoc @@ -22,7 +22,7 @@ you are prepared for it. === Read the Guidelines If you do not know how to create an RPM package, -refer to xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello]. +refer to xref:Packaging_Tutorial.adoc[Packaging Tutorial]. Read the xref:packaging-guidelines::index.adoc[Packaging Guidelines]. You need to be thoroughly familiar with these. 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 31ab339..1f83757 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 xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello]. +** Some information on how to create an RPM package is in xref:Packaging_Tutorial.adoc[Packaging Tutorial]. ** Make sure that your package meets the xref:packaging-guidelines::index.adoc[Packaging Guidelines] and xref:packaging-guidelines::Naming.adoc[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 c492ba1..be4ff87 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 xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello]. +see the xref:Packaging_Tutorial.adoc[Packaging Tutorial]. * Make sure that your package meets the xref:packaging-guidelines::index.adoc[Packaging Guidelines] and xref:packaging-guidelines::Naming.adoc[Package Naming Guidelines]. diff --git a/modules/ROOT/pages/Package_Maintenance_Guide.adoc b/modules/ROOT/pages/Package_Maintenance_Guide.adoc index ff51afd..16ac612 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: -* xref:Packaging_Tutorial_GNU_Hello.adoc[Packaging Tutorial: GNU Hello] +* xref:Packaging_Tutorial.adoc[Packaging Tutorial] * xref:packaging-guidelines::index.adoc[Packaging Guidelines] [#installing_fedpkg_and_doing_initial_setup] diff --git a/modules/ROOT/pages/Packaging_Tutorial.adoc b/modules/ROOT/pages/Packaging_Tutorial.adoc new file mode 100644 index 0000000..ba4af80 --- /dev/null +++ b/modules/ROOT/pages/Packaging_Tutorial.adoc @@ -0,0 +1,8 @@ +include::{partialsdir}/attributes.adoc[] + += Packaging Tutorial + +Packaging tutorial demonstrates RPM packaging for Fedora. + +* xref:Packaging_Tutorial_1_banner.adoc[Packaging Tutorial 1: banner] +* xref:Packaging_Tutorial_2_GNU_Hello.adoc[Packaging Tutorial 2: GNU Hello] From d9ddad66f5525678ab79b4e53381ab3987c0660a Mon Sep 17 00:00:00 2001 From: Otto Liljalaakso Date: Jun 09 2024 19:53:49 +0000 Subject: [PATCH 2/2] Redirect `quick-docs::creating-rpm-packages.adoc` to tutorial main page The previous way to having two `:page-aliases:` entries for the GNU Hello page also did not work. Fixes #160 --- diff --git a/modules/ROOT/pages/Packaging_Tutorial.adoc b/modules/ROOT/pages/Packaging_Tutorial.adoc index ba4af80..965d46f 100644 --- a/modules/ROOT/pages/Packaging_Tutorial.adoc +++ b/modules/ROOT/pages/Packaging_Tutorial.adoc @@ -1,6 +1,7 @@ include::{partialsdir}/attributes.adoc[] = Packaging Tutorial +:page-aliases: quick-docs::creating-rpm-packages.adoc Packaging tutorial demonstrates RPM packaging for Fedora. diff --git a/modules/ROOT/pages/Packaging_Tutorial_2_GNU_Hello.adoc b/modules/ROOT/pages/Packaging_Tutorial_2_GNU_Hello.adoc index 7c53687..7e5e588 100644 --- a/modules/ROOT/pages/Packaging_Tutorial_2_GNU_Hello.adoc +++ b/modules/ROOT/pages/Packaging_Tutorial_2_GNU_Hello.adoc @@ -1,7 +1,6 @@ include::{partialsdir}/attributes.adoc[] = Packaging Tutorial 2: GNU Hello -:page-aliases: quick-docs::creating-rpm-packages.adoc :page-aliases: Packaging_Tutorial_GNU_Hello.adoc This tutorial demonstrates RPM packaging