From cfcf1cada7142a7df63a929ccd6f7b1c7c221575 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Oct 11 2021 18:19:53 +0000 Subject: [PATCH 1/4] Use HTTPS and correct links in OCaml guidelines --- diff --git a/guidelines/modules/ROOT/examples/ocaml-example.spec b/guidelines/modules/ROOT/examples/ocaml-example.spec index fba4a1a..0a1c5d2 100644 --- a/guidelines/modules/ROOT/examples/ocaml-example.spec +++ b/guidelines/modules/ROOT/examples/ocaml-example.spec @@ -7,8 +7,8 @@ Release: 1%{?dist} Summary: OCaml library for fooing bars License: LGPL+ -URL: http://www.example.com/foolib -Source0: http://www.example.com/foolib-1.2.3.tar.gz +URL: https://www.example.com/foolib +Source0: https://www.example.com/foolib-1.2.3.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: ocaml, ocaml-findlib-devel diff --git a/guidelines/modules/ROOT/pages/OCaml.adoc b/guidelines/modules/ROOT/pages/OCaml.adoc index 118be4b..69ddbf0 100644 --- a/guidelines/modules/ROOT/pages/OCaml.adoc +++ b/guidelines/modules/ROOT/pages/OCaml.adoc @@ -39,7 +39,7 @@ In order to allow OCaml scripts and the toplevel to use a library, the main pack If the package contains *.so files, then they should have rpaths removed, as per Fedora packaging guidelines. -The packager should check the META file footnote:[http://www.ocaml-programming.de/packages/documentation/findlib/guide-html/x131.html[Findlib users guide - writing META files.]]. If there is no META file, then the packager should create one, include it in the package, and pass it to the upstream maintainer. +The packager should check the META file footnote:[http://projects.camlcity.org/projects/dl/findlib-1.9.1/doc/ref-html/r759.html[findlib Reference Manual - META files.]]. If there is no META file, then the packager should create one, include it in the package, and pass it to the upstream maintainer. Rationale: OCaml does not support dynamic linking of binaries, and even if it did with the current module hash system for expressing strict typing requirements almost any conceivable change to a library would require the binary to be recompiled. OCaml scripts are the closest we come to dynamic linking, in as much as they do not usually depend on a specific version of a library (albeit this only works because the scripts are recompiled each time they run). From d45d9706d282c3c480f4ca1e391abe39ac7e97d1 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Oct 11 2021 18:19:53 +0000 Subject: [PATCH 2/4] Use HTTPS and correct links in Modules guidelines --- diff --git a/guidelines/modules/ROOT/pages/EnvironmentModules.adoc b/guidelines/modules/ROOT/pages/EnvironmentModules.adoc index 8b3d55f..b87d1bd 100644 --- a/guidelines/modules/ROOT/pages/EnvironmentModules.adoc +++ b/guidelines/modules/ROOT/pages/EnvironmentModules.adoc @@ -12,7 +12,7 @@ To see what modules are available, run `+$ module avail+`. To load a module run e.g. `+$ module load mpi/openmpi-x86_64+`. To unload a module, run e.g. `+$module unload mpi/openmpi-x86_64+`. -The upstream documentation for the module command is available http://modules.sourceforge.net/man/module1.html[here] or with `+man module+`. +The upstream documentation for the module command is available https://modules.readthedocs.io/en/stable/module.html[here] or with `+man module+`. == Creating environment modules @@ -48,7 +48,7 @@ The above commands prepends the path with the bindir of the 64-bit OpenMPI (comp It is also possible to set `+CFLAGS+` and `+LDFLAGS+` with the above manner, but in the case of MPI compilers it is not necessary since the compilers are invoked with the `+mpicc+`, `+mpicxx+`, `+mpif77+` and `+mpif90+` wrappers that already contain the necessary include and library paths. Also, in the case of development packages an override of `+CFLAGS+` and/or `+LDFLAGS+` is not sane, as it may cause trouble in building RPMs as it overrides `+%{optflags}+`. -The upstream documentation for module files is available http://modules.sourceforge.net/man/modulefile4.html[here] or with `+man modulefile+`. +The upstream documentation for module files is available https://modules.readthedocs.io/en/stable/modulefile.html[here] or with `+man modulefile+`. == Switching between module implementations From 692e30a027b8f2aa898e958f08699ad8e7c39662 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Oct 11 2021 18:19:53 +0000 Subject: [PATCH 3/4] Use HTTPS and correct links in Tcl guidelines --- diff --git a/guidelines/modules/ROOT/pages/Tcl.adoc b/guidelines/modules/ROOT/pages/Tcl.adoc index 680b9f4..8b2dc4a 100644 --- a/guidelines/modules/ROOT/pages/Tcl.adoc +++ b/guidelines/modules/ROOT/pages/Tcl.adoc @@ -126,4 +126,4 @@ Some arch-specific Tcl extensions provide a shared library and a corresponding ` If the extension does *not* provide a `+fooConfig.sh+` file, then the shared library *must not* be installed directly in `+%{_libdir}+`, but in the package-specific installation directory in `+%{tcl_sitearch}+` instead. This may require a patch to update the extension's `+pkgIndex.tcl+` file to look for the shared library in the correct location. *Stubs are ok if put in -devel subpackage:* -Some Tcl extensions provide a static 'stub' library. Stub libraries are a Tcl-ism to provide version-independent dynamic linking on a variety of platforms. These are not normal static libraries that provide the library's actual functionality, but instead provide a level of indirection pointing to the shared library. These stub libraries do not have the same static linking issues that are generally frowned upon in Fedora, and thus are acceptable. If a package provides such a stub library, it must be placed in a -devel subpackage. More information on stubs can be found on the Tcl wiki: http://wiki.tcl.tk/285 +Some Tcl extensions provide a static 'stub' library. Stub libraries are a Tcl-ism to provide version-independent dynamic linking on a variety of platforms. These are not normal static libraries that provide the library's actual functionality, but instead provide a level of indirection pointing to the shared library. These stub libraries do not have the same static linking issues that are generally frowned upon in Fedora, and thus are acceptable. If a package provides such a stub library, it must be placed in a -devel subpackage. More information on stubs can be found on the Tcl wiki: https://wiki.tcl-lang.org/page/Stubs From fc86c8a2ffea1026195845c996d03458fc077e06 Mon Sep 17 00:00:00 2001 From: Malcolm Inglis Date: Oct 11 2021 18:19:53 +0000 Subject: [PATCH 4/4] Use HTTPS SemBr link in README --- diff --git a/README.md b/README.md index c52dc61..591ce37 100644 --- a/README.md +++ b/README.md @@ -91,6 +91,6 @@ Some useful information about AsciiDoc can be found below: The Packaging Committee tries to follow the following, and it is preferred that pull requests do the same. -* Use [Semantic Line Breaks](http://sembr.org/) to make diffing simpler. +* Use [Semantic Line Breaks](https://sembr.org/) to make diffing simpler. * Prefer `https://example.com[here]` over `link:https://example.com[here]` * Prefer `[#some-ref]` over `[[some-ref]]`