From df58f72362b46b64240ca9b570bbe4fde1894240 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Wed, 9 Sep 2020 14:45:41 +0200 Subject: [PATCH 1/5] Fix double level 1 headings in Printing & Scanning --- modules/release-notes/pages/sysadmin/Printing_Scanning.adoc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/modules/release-notes/pages/sysadmin/Printing_Scanning.adoc b/modules/release-notes/pages/sysadmin/Printing_Scanning.adoc index 948f729..88043b3 100644 --- a/modules/release-notes/pages/sysadmin/Printing_Scanning.adoc +++ b/modules/release-notes/pages/sysadmin/Printing_Scanning.adoc @@ -1,7 +1,7 @@ include::{partialsdir}/entities.adoc[] [[sect-printing-scanning]] -= Printing += Printing and Scanning == Added support for driverless printing with Dymo LabelWriter and Zebra ZPL printers @@ -9,8 +9,6 @@ Fedora now ships the `lprint` package, which provides driverless support for Dym `lprint` is capable of running with CUPS or without CUPS and it provides its own web UI. -= Scanning - == Added driverless scanning support for devices with WSD and eSCL protocols Fedora now ships the `sane-airscan` package, which provides driverless support for scanners and multi-functions devices, which supports the WSD (WS-Scan) and eSCL (Apple Airscan) protocols. From 08e4c27a9b0940ea88e27b7c94a4b668b0491b57 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Wed, 9 Sep 2020 15:14:14 +0200 Subject: [PATCH 2/5] Remove an extra pages/ directory --- pages/developers/Development_Python.adoc | 8 -------- pages/sysadmin/Distribution.adoc | 17 ----------------- 2 files changed, 25 deletions(-) delete mode 100644 pages/developers/Development_Python.adoc delete mode 100644 pages/sysadmin/Distribution.adoc diff --git a/pages/developers/Development_Python.adoc b/pages/developers/Development_Python.adoc deleted file mode 100644 index 062f129..0000000 --- a/pages/developers/Development_Python.adoc +++ /dev/null @@ -1,8 +0,0 @@ -== Deprecated support - -=== Deprecated support for Nose - -Support for Nose is now deprecated. However for now, the python3-nose package continues to be available in the Fedora repositories. -No specific release it yet targeted to remove the python3-nose package. - -Users and packagers of dependent packages are encouraged to switch to python3-pytest or python3-nose2. diff --git a/pages/sysadmin/Distribution.adoc b/pages/sysadmin/Distribution.adoc deleted file mode 100644 index 8ee3df3..0000000 --- a/pages/sysadmin/Distribution.adoc +++ /dev/null @@ -1,17 +0,0 @@ -== Packaging changes in clang-libs package - -The clang-libs package now does not include the individual component libraries like libclangBasic.so, libclangAST.so and so on. -Packages that depend on the clang libraries are now linked to libclang-cpp.so. - -As a result of this change, - -* There is an improved stability in Fedora and application start-up time. -* End-users who develop applications using clang libraries must update their applications to use libclang-cpp.so instead of the individual component libraries. -However, the end-users using Fedora packages that depend on clang libraries do not have any impact of this change. - - -== Added support for AArch64 and ppc64le packages with extended availability of FPC-dependent packages - -An updated version (3.2.0) of Free Pascal Compiler is now available with Fedora 32. -With the updated Free Pascal Compiler you can now build the AArch64 and ppc64le packages. -Also, the Free Pascal Compiler now supports new architectures. As a result, the programs that are compiled using FPC are available to run on more architectures that Fedora supports. From 06bab3321ca15b18e2a4e30216f5fa008c4bed0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 12 Jan 2022 19:02:50 +0100 Subject: [PATCH 3/5] build & preview: Update with latest version from template --- build.sh | 35 ++++++++++++++++++++--------------- preview.sh | 6 +++--- 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/build.sh b/build.sh index 1e4db2d..e7330ef 100755 --- a/build.sh +++ b/build.sh @@ -3,25 +3,29 @@ image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" -if [ "$(uname)" == "Darwin" ]; then +if uname | grep -iwq darwin; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "" echo "This build script is using Docker container runtime to run the build in an isolated environment." echo "" - docker run --rm -it -v $(pwd):/antora $image $cmd + docker run --rm -it -v "$(pwd):/antora" "${image}" "${cmd}" -elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then +elif uname | grep -iq linux; then # Running on Linux. # Check whether podman is available, else faill back to docker # which requires root. - if [ -f /usr/bin/podman ]; then + if [ -f /usr/local/bin/antora ]; then + /usr/local/bin/antora "${cmd}" + elif uname -m | grep -iwq aarch64; then + echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + elif [ -f /usr/bin/podman ]; then echo "" echo "This build script is using Podman to run the build in an isolated environment." echo "" - podman run --rm -it -v $(pwd):/antora:z $image $cmd + podman run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" elif [ -f /usr/bin/docker ]; then echo "" @@ -29,18 +33,19 @@ elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then echo "" if groups | grep -wq "docker"; then - docker run --rm -it -v $(pwd):/antora:z $image $cmd - else + docker run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + else + echo "You might be asked for your password." + echo "You can avoid this by adding your user to the 'docker' group," + echo "but be aware of the security implications." + echo "See https://docs.docker.com/install/linux/linux-postinstall/" echo "" - echo "This build script is using $runtime to run the build in an isolated environment. You might be asked for your password." - echo "You can avoid this by adding your user to the 'docker' group, but be aware of the security implications. See https://docs.docker.com/install/linux/linux-postinstall/." - echo "" - sudo docker run --rm -it -v $(pwd):/antora:z $image $cmd - fi + sudo docker run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + fi else echo "" - echo "Error: Container runtime haven't been found on your system. Fix it by:" - echo "$ sudo dnf install podman" - exit 1 + echo "Error: Container runtime haven't been found on your system. Fix it by:" + echo "$ sudo dnf install podman" + exit 1 fi fi diff --git a/preview.sh b/preview.sh index acc52af..4270107 100755 --- a/preview.sh +++ b/preview.sh @@ -1,13 +1,13 @@ #!/bin/sh -if [ "$(uname)" == "Darwin" ]; then +if [ "$(uname)" = "Darwin" ]; then # Running on macOS. # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "The preview will be available at http://localhost:8080/" - docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx + docker run --rm -v "$(pwd):/antora:ro" -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro" -p 8080:80 nginx -elif [ "$(expr substr $(uname -s) 1 5)" == "Linux" ]; then +elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then # Running on Linux. # Fedora Workstation has python3 installed as a default, so using that echo "" From dbd435c667580dfb21858b89543566f2aa2d46e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 12 Jan 2022 19:02:39 +0100 Subject: [PATCH 4/5] Update configuration for Antora 3.0 --- site.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/site.yml b/site.yml index f4d43ac..4690d47 100644 --- a/site.yml +++ b/site.yml @@ -1,6 +1,6 @@ site: title: Local Preview - start_page: fedora:release-notes:index + start_page: fedora:release-notes:index.adoc content: sources: - url: . @@ -18,5 +18,5 @@ output: destinations: - provider: archive runtime: - pull: true + fetch: true cache_dir: ./cache From fab84398d3dd3fe254417bac2d00fbe5d19db733 Mon Sep 17 00:00:00 2001 From: Petr Bokoc Date: Wed, 9 Mar 2022 16:21:36 +0100 Subject: [PATCH 5/5] Fix build/preview scripts --- build.sh | 22 +++++++++++----------- preview.sh | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/build.sh b/build.sh index e7330ef..87daa14 100755 --- a/build.sh +++ b/build.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash image="docker.io/antora/antora" cmd="--html-url-extension-style=indexify site.yml" @@ -8,24 +8,24 @@ if uname | grep -iwq darwin; then # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "" - echo "This build script is using Docker container runtime to run the build in an isolated environment." + echo "This build script is using Docker to run the build in an isolated environment." echo "" - docker run --rm -it -v "$(pwd):/antora" "${image}" "${cmd}" + docker run --rm -it -v $(pwd):/antora ${image} ${cmd} elif uname | grep -iq linux; then # Running on Linux. - # Check whether podman is available, else faill back to docker + # Let's assume that it's running the Docker deamon # which requires root. if [ -f /usr/local/bin/antora ]; then - /usr/local/bin/antora "${cmd}" + /usr/local/bin/antora ${cmd} elif uname -m | grep -iwq aarch64; then - echo "no antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" + echo "No antora/aarch64 container try just \`npm install -g @antora/cli @antora/site-generator-default\`" elif [ -f /usr/bin/podman ]; then echo "" echo "This build script is using Podman to run the build in an isolated environment." echo "" - podman run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + podman run --rm -it -v $(pwd):/antora:z ${image} ${cmd} elif [ -f /usr/bin/docker ]; then echo "" @@ -33,19 +33,19 @@ elif uname | grep -iq linux; then echo "" if groups | grep -wq "docker"; then - docker run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + docker run --rm -it -v $(pwd):/antora:z ${image} ${cmd} else echo "You might be asked for your password." echo "You can avoid this by adding your user to the 'docker' group," echo "but be aware of the security implications." echo "See https://docs.docker.com/install/linux/linux-postinstall/" echo "" - sudo docker run --rm -it -v "$(pwd):/antora:z" "${image}" "${cmd}" + sudo docker run --rm -it -v $(pwd):/antora:z ${image} ${cmd} fi else echo "" - echo "Error: Container runtime haven't been found on your system. Fix it by:" - echo "$ sudo dnf install podman" + echo "Error: Container runtime has not been found on your system. Fix it by running this command:" + echo "sudo dnf install podman" exit 1 fi fi diff --git a/preview.sh b/preview.sh index 4270107..05f8455 100755 --- a/preview.sh +++ b/preview.sh @@ -5,7 +5,7 @@ if [ "$(uname)" = "Darwin" ]; then # Let's assume that the user has the Docker CE installed # which doesn't require a root password. echo "The preview will be available at http://localhost:8080/" - docker run --rm -v "$(pwd):/antora:ro" -v "$(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro" -p 8080:80 nginx + docker run --rm -v $(pwd):/antora:ro -v $(pwd)/nginx.conf:/etc/nginx/conf.d/default.conf:ro -p 8080:80 nginx elif [ "$(expr substr "$(uname -s)" 1 5)" = "Linux" ]; then # Running on Linux.