From 7ae85338ca0498fc137d50e4542380529bb277e4 Mon Sep 17 00:00:00 2001 From: Balazs Kosaras Date: Thu, 27 Feb 2025 12:14:21 -0500 Subject: [PATCH] CPack/RPM: Normalize documentation wording about quoting requirements The phrase "requires string" refers to the RPM `Requires` tag, but it had been copied from the description of `CPACK_RPM_PACKAGE_REQUIRES` without adjusting the text. --- Help/cpack_gen/rpm.rst | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Help/cpack_gen/rpm.rst b/Help/cpack_gen/rpm.rst index 050e654393..0fd69646db 100644 --- a/Help/cpack_gen/rpm.rst +++ b/Help/cpack_gen/rpm.rst @@ -324,7 +324,7 @@ List of CPack RPM generator specific variables: :Default: May be used to set RPM dependencies (requires). Note that you must enclose - the complete requires string between quotes, for example: + the entire value between quotes when setting this variable, for example: .. code-block:: cmake @@ -343,7 +343,8 @@ List of CPack RPM generator specific variables: :Default: May be used to set negative RPM dependencies (conflicts). Note that you must - enclose the complete requires string between quotes, for example: + enclose the entire value between quotes when setting this variable, + for example: .. code-block:: cmake @@ -364,7 +365,8 @@ List of CPack RPM generator specific variables: :Default: May be used to set RPM preinstall dependencies (requires(pre)). Note that - you must enclose the complete requires string between quotes, for example: + you must enclose the entire value between quotes when setting this variable, + for example: .. code-block:: cmake @@ -381,7 +383,8 @@ List of CPack RPM generator specific variables: :Default: May be used to set RPM postinstall dependencies (requires(post)). Note that - you must enclose the complete requires string between quotes, for example: + you must enclose the entire value between quotes when setting this variable, + for example: .. code-block:: cmake @@ -398,8 +401,8 @@ List of CPack RPM generator specific variables: :Default: May be used to set RPM postuninstall dependencies (requires(postun)). Note - that you must enclose the complete requires string between quotes, for - example: + that you must enclose the entire value between quotes when setting this + variable, for example: .. code-block:: cmake @@ -416,7 +419,8 @@ List of CPack RPM generator specific variables: :Default: May be used to set RPM preuninstall dependencies (requires(preun)). Note that - you must enclose the complete requires string between quotes, for example: + you must enclose the entire value between quotes when setting this variable, + for example: .. code-block:: cmake @@ -425,15 +429,15 @@ List of CPack RPM generator specific variables: .. variable:: CPACK_RPM_PACKAGE_SUGGESTS CPACK_RPM__PACKAGE_SUGGESTS - RPM spec suggest field. + RPM spec suggests field. :Mandatory: No :Default: May be used to set weak RPM dependencies (suggests). If ``rpmbuild`` doesn't support the ``Suggests`` tag, CPack will emit a warning and ignore this - variable. Note that you must enclose the complete requires string between - quotes. + variable. Note that you must enclose the entire value between quotes when + setting this variable. .. variable:: CPACK_RPM_PACKAGE_PROVIDES CPACK_RPM__PACKAGE_PROVIDES @@ -1087,8 +1091,8 @@ Source RPM packaging has its own set of variables: :Default: May be used to set source RPM build dependencies (BuildRequires). Note that - you must enclose the complete build requirements string between quotes, for - example: + you must enclose the entire value between quotes when setting this variable, + for example: .. code-block:: cmake