From c4943d64455151f05226ab4da7beaacc1862a59a Mon Sep 17 00:00:00 2001 From: Hirotaka Wakabayashi Date: Sep 24 2021 09:11:38 +0000 Subject: [PATCH 1/2] Fixes the wrong hyper links --- diff --git a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc index 4eb0793..87f2f5a 100644 --- a/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc +++ b/guidelines/modules/ROOT/pages/AutoProvidesAndRequiresFiltering.adoc @@ -155,4 +155,4 @@ By policy, nothing under `+%{_docdir}+` is allowed to either "provide" or "requi == Additional Information -Additional information about RPM's dependency generator can be found here: http://rpm.org/user_doc/dependency_generators.html +Additional information about RPM's dependency generator can be found here: https://rpm-software-management.github.io/rpm/manual/dependency_generators.html diff --git a/guidelines/modules/ROOT/pages/Python.adoc b/guidelines/modules/ROOT/pages/Python.adoc index b626bfb..29c3577 100644 --- a/guidelines/modules/ROOT/pages/Python.adoc +++ b/guidelines/modules/ROOT/pages/Python.adoc @@ -649,7 +649,7 @@ then `+Requires: python3-requests+` is redundant.) The automatically generated requirements are in the form `+python3.Xdist(DISTNAME)+`, potentially augmented with version requirements or combined together -with https://rpm.org/user_doc/boolean_dependencies.html[rich dependencies]. +with https://rpm-software-management.github.io/rpm/manual/boolean_dependencies.html[rich dependencies]. Any `+.0+` suffixes are removed from version numbers to match the behavior of Python tools. (https://www.python.org/dev/peps/pep-0440/[PEP 440] specifies @@ -997,7 +997,7 @@ or ignore its result to solve a build failure. As an exception, you *MAY* disable tests with an appropriate `+%if+` conditional -(e.g. http://rpm.org/user_doc/conditional_builds.html[bcond]) +(e.g. https://rpm-software-management.github.io/rpm/manual/conditionalbuilds.html[bcond]) when xref:index.adoc#bootstrapping[bootstrapping]. Most errors in Python happen at run-time, diff --git a/guidelines/modules/ROOT/pages/Scriptlets.adoc b/guidelines/modules/ROOT/pages/Scriptlets.adoc index 74cb395..9a6507e 100644 --- a/guidelines/modules/ROOT/pages/Scriptlets.adoc +++ b/guidelines/modules/ROOT/pages/Scriptlets.adoc @@ -9,11 +9,11 @@ with information from the package. This page offers a quick overview of RPM scriptlets and a number of common recipes for scriptlets in packages. For a more complete treatment of scriptlets, -please see the http://www.rpm.org/max-rpm-snapshot/[Maximum RPM book]. +please see the https://ftp.osuosl.org/pub/rpm/max-rpm/[Maximum RPM book]. The version of RPM in Fedora also has functionality to automatically run scripts when files are placed in certain locations. -(See http://rpm.org/user_doc/file_triggers.html[1].) +(See https://rpm-software-management.github.io/rpm/manual/file_triggers.html[1].) This potentially obviates the need for most of the scriptlets on this page, but is not currently implemented in all cases where it could be. @@ -120,7 +120,7 @@ The scriptlets in %pre and %post are respectively run before and after a package [#pretrans] === The %pretrans Scriptlet -Note that the `+%pretrans+` scriptlet will, in the particular case of system installation, run before anything at all has been installed. This implies that it cannot have any dependencies at all. For this reason, `+%pretrans+` is best avoided, but if used it MUST (by necessity) be written in Lua. See http://rpm.org/user_doc/lua.html for more information. +Note that the `+%pretrans+` scriptlet will, in the particular case of system installation, run before anything at all has been installed. This implies that it cannot have any dependencies at all. For this reason, `+%pretrans+` is best avoided, but if used it MUST (by necessity) be written in Lua. See https://rpm-software-management.github.io/rpm/manual/lua.html for more information. == Writing Scriptlets diff --git a/guidelines/modules/ROOT/pages/index.adoc b/guidelines/modules/ROOT/pages/index.adoc index 7b01cab..86b6df8 100644 --- a/guidelines/modules/ROOT/pages/index.adoc +++ b/guidelines/modules/ROOT/pages/index.adoc @@ -1181,7 +1181,7 @@ rpm -q --specfile foo.spec --qf "$(grep -i ^Source foo.spec)\n" === `+%autosetup+` -As an alternative to the usual `+%setup+` macro, the `+%autosetup+` can be used. In addition to the normal %setup tasks, it will apply all defined Patch# items in the spec automatically. It is also capable of handling VCS formatted patch files, but this will require additional BuildRequires, and assumes that _all_ patch files in the spec are formatted for that single VCS type. For this reason, it is not recommended that you specify a VCS with `+%autosetup+`. For more details on proper use of `+%autosetup+`, refer to the http://rpm.org/user_doc/autosetup.html[RPM documentation]. +As an alternative to the usual `+%setup+` macro, the `+%autosetup+` can be used. In addition to the normal %setup tasks, it will apply all defined Patch# items in the spec automatically. It is also capable of handling VCS formatted patch files, but this will require additional BuildRequires, and assumes that _all_ patch files in the spec are formatted for that single VCS type. For this reason, it is not recommended that you specify a VCS with `+%autosetup+`. For more details on proper use of `+%autosetup+`, refer to the https://rpm-software-management.github.io/rpm/manual/lua.html[RPM documentation]. === Using %\{buildroot} and %\{optflags} vs $RPM_BUILD_ROOT and $RPM_OPT_FLAGS From d8ca61855dd19567e01edb6cb8f88a4b7065f51b Mon Sep 17 00:00:00 2001 From: Hirotaka Wakabayashi Date: Sep 24 2021 09:21:27 +0000 Subject: [PATCH 2/2] Fixes the wrong link --- diff --git a/guidelines/modules/ROOT/pages/index.adoc b/guidelines/modules/ROOT/pages/index.adoc index 86b6df8..7c75854 100644 --- a/guidelines/modules/ROOT/pages/index.adoc +++ b/guidelines/modules/ROOT/pages/index.adoc @@ -1181,7 +1181,7 @@ rpm -q --specfile foo.spec --qf "$(grep -i ^Source foo.spec)\n" === `+%autosetup+` -As an alternative to the usual `+%setup+` macro, the `+%autosetup+` can be used. In addition to the normal %setup tasks, it will apply all defined Patch# items in the spec automatically. It is also capable of handling VCS formatted patch files, but this will require additional BuildRequires, and assumes that _all_ patch files in the spec are formatted for that single VCS type. For this reason, it is not recommended that you specify a VCS with `+%autosetup+`. For more details on proper use of `+%autosetup+`, refer to the https://rpm-software-management.github.io/rpm/manual/lua.html[RPM documentation]. +As an alternative to the usual `+%setup+` macro, the `+%autosetup+` can be used. In addition to the normal %setup tasks, it will apply all defined Patch# items in the spec automatically. It is also capable of handling VCS formatted patch files, but this will require additional BuildRequires, and assumes that _all_ patch files in the spec are formatted for that single VCS type. For this reason, it is not recommended that you specify a VCS with `+%autosetup+`. For more details on proper use of `+%autosetup+`, refer to the https://rpm-software-management.github.io/rpm/manual/autosetup.html[RPM documentation]. === Using %\{buildroot} and %\{optflags} vs $RPM_BUILD_ROOT and $RPM_OPT_FLAGS