From b8d4138ba1d5b0c22cb325bddabd3e9ef8f7dccc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jul 2019 19:10:24 +0000 Subject: [PATCH 01/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 9c10c5d..1e6b718 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -89,6 +89,9 @@ exit 0 %changelog +* Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Apr 2 2019 Hans Ulrich Niedermann - 1.4.4-1 - Update to beep-1.4.4 - Install default udev rules to /usr/lib/udev/rules.d/ (not /etc/udev/) From a794ec4747e64b92fbff56b62b0cad5644b670fa Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 20 Dec 2019 05:34:54 +0100 Subject: [PATCH 02/42] Update to the beep-1.4.6 release Summary of the changes compared to the beep-1.4.4 release: * Use va_copy() macro in function with va_list parameter to avoid possible bug * Use BEEP_LOG_LEVEL environment variable for default log level --- beep.spec | 9 +++++++-- sources | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/beep.spec b/beep.spec index 1e6b718..1413639 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep -Version: 1.4.4 -Release: 2%{?dist} +Version: 1.4.6 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -89,6 +89,11 @@ exit 0 %changelog +* Fri Dec 20 2019 Hans Ulrich Niedermann - 1.4.6-1 +- Update to beep-1.4.6 +- Use BEEP_LOG_LEVEL environment variable for default log level +- Avoid possible bug related to not using va_copy() with a va_list parameter + * Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 2a3eb9b..ea19b4e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beep-1.4.4.tar.gz) = cfaecbebbbd0596bee5f304c3bd74968d06873037d054def0907dfd36e5bd6e7fbd7d7051eacedd20480b88f8b4e343db05eb5d3dde0fdced33756545b630373 +SHA512 (beep-1.4.6.tar.gz) = 753ab7f22624defba5645c2fceb1382137641fa8f219875783d5809d0bd344c530176b46a61a1d783bb2e5feb17c8137868e02744e1ee5d9e7ec331dbe1fe417 From 4f70157bb9541936026be36fd60daf55fd280f9e Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 1 Jan 2020 22:44:23 +0100 Subject: [PATCH 03/42] Grammatical fixes for %description --- beep.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/beep.spec b/beep.spec index 1413639..a39ac39 100644 --- a/beep.spec +++ b/beep.spec @@ -38,10 +38,10 @@ Requires: systemd-udev %description Beep allows the user to control the PC speaker with precision, allowing different sounds to indicate different events. While it -can be run quite happily on the command line, its intended place -of residence is within shell/Perl scripts, notifying the user when -something interesting occurs. Of course, it has no notion of -what's interesting, but it's real good at that notifying part. +can be run quite happily from the command line, its intended place +of use is within scripts, notifying the user when something +interesting occurs. Of course, it has no notion of what is +interesting, but it is really good at the notifying part. %prep From 24330ac51ee74d75cf27629597fb6176a6fcde75 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 1 Jan 2020 22:51:17 +0100 Subject: [PATCH 04/42] Update to beep-1.4.7 Update to beep-1.4.7: - Install contrib scripts for both successfully and failing sounding beeps. - beep installs its man page uncompressed, so the spec file can stop unzipping it for the packaging scripts to be able to do their compression magic. --- beep.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/beep.spec b/beep.spec index a39ac39..bae9ece 100644 --- a/beep.spec +++ b/beep.spec @@ -1,6 +1,6 @@ Summary: Beep the PC speaker any number of ways Name: beep -Version: 1.4.6 +Version: 1.4.7 Release: 1%{?dist} License: GPLv2+ @@ -65,9 +65,6 @@ install -d -m 0755 "$RPM_BUILD_ROOT%{_udevrulesdir}/" install -p -m 0644 "%{SOURCE2}" "$RPM_BUILD_ROOT%{_udevrulesdir}/" install -p -m 0644 "%{SOURCE3}" "$RPM_BUILD_ROOT%{_udevrulesdir}/" -# Fedora Packaging GL says Fedora wants to choose and do the compression itself -gunzip "$RPM_BUILD_ROOT%{_mandir}/man1/beep.1.gz" - %pre getent group beep >/dev/null || groupadd -r beep @@ -81,6 +78,8 @@ exit 0 %doc %{_pkgdocdir}/CREDITS %doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/PERMISSIONS.md +%doc %{_pkgdocdir}/contrib/failure-beeps +%doc %{_pkgdocdir}/contrib/success-beeps %attr(0755,root,root) %{_bindir}/beep %{_mandir}/man1/beep.1* %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf @@ -89,6 +88,10 @@ exit 0 %changelog +* Wed Jan 1 2020 Hans Ulrich Niedermann - 1.4.7-1 +- Update to beep-1.4.7 +- Install contrib scripts for both successfully and failing sounding beeps. + * Fri Dec 20 2019 Hans Ulrich Niedermann - 1.4.6-1 - Update to beep-1.4.6 - Use BEEP_LOG_LEVEL environment variable for default log level diff --git a/sources b/sources index ea19b4e..886e63a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beep-1.4.6.tar.gz) = 753ab7f22624defba5645c2fceb1382137641fa8f219875783d5809d0bd344c530176b46a61a1d783bb2e5feb17c8137868e02744e1ee5d9e7ec331dbe1fe417 +SHA512 (beep-1.4.7.tar.gz) = a1482a16f971c56dc6a62047fa449c96519c897d2e8cb18dcc06178564943c1eb3b9d9106ca6b76054e0fa109e3b161fb8e9ec1966a02d0d739222b5434b71c7 From b17da1af4c5d191cfdbab099cb2488087b0330ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jan 2020 12:51:16 +0000 Subject: [PATCH 05/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index bae9ece..f7d5c4f 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -88,6 +88,9 @@ exit 0 %changelog +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Wed Jan 1 2020 Hans Ulrich Niedermann - 1.4.7-1 - Update to beep-1.4.7 - Install contrib scripts for both successfully and failing sounding beeps. From c0fc04897881374971184c92f14742de47067f43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Mon, 27 Jul 2020 13:02:28 +0000 Subject: [PATCH 06/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index f7d5c4f..f71af90 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -88,6 +88,9 @@ exit 0 %changelog +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From e3e5a10920f19b6640e9cc52ff016b31c196e508 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 17 Dec 2020 02:48:56 +0000 Subject: [PATCH 07/42] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- beep.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/beep.spec b/beep.spec index f71af90..1c8adad 100644 --- a/beep.spec +++ b/beep.spec @@ -26,6 +26,7 @@ BuildRequires: gcc BuildRequires: glibc-kernheaders # for the udev macros BuildRequires: systemd +BuildRequires: make Requires(pre): shadow-utils From 05b52566e256a933264815adcb65b558316a8cf9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 01:03:25 +0000 Subject: [PATCH 08/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 1c8adad..b757f65 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -89,6 +89,9 @@ exit 0 %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Mon Jul 27 2020 Fedora Release Engineering - 1.4.7-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 47695ab28190633d3c87aae5c9e06dad931d1557 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 25 Mar 2021 15:57:53 +0100 Subject: [PATCH 09/42] Fix indentation of "BuildRequires: make" The "BuildRequires: make" was added by a script running through all of Fedora, so they did not check that the indentation matches that of the surrounding lines of spec file. This adapts this line to match the indentation of the other lines in the spec file. --- beep.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index b757f65..4dd4980 100644 --- a/beep.spec +++ b/beep.spec @@ -26,7 +26,7 @@ BuildRequires: gcc BuildRequires: glibc-kernheaders # for the udev macros BuildRequires: systemd -BuildRequires: make +BuildRequires: make Requires(pre): shadow-utils From c3ad7fc60d3c917fd21ea3101fcf9ce73bb75810 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 25 Mar 2021 00:40:54 +0100 Subject: [PATCH 10/42] Update README.fedora to match beep-1.4.x permission setup --- README.fedora | 68 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/README.fedora b/README.fedora index cafd144..d4e3561 100644 --- a/README.fedora +++ b/README.fedora @@ -1,14 +1,14 @@ Content ======= - 1. Load the pkspkr.ko Kernel Driver Module (required) - 2. Add non-root users to the "beep" group - 3. Avoid using `beep` - 4. Example Usage + 1. Load the `pkspkr.ko` Kernel Driver Module (required) + 2. Permission setup for non-root users (for non-local logins) + 3. When and how to avoid using `beep` + 4. Example usage of `beep` -1. Load the pkspkr.ko Kernel Driver Module (required) ------------------------------------------------------ +1. Load the `pkspkr.ko` Kernel Driver Module (required) +------------------------------------------------------- To have a working PC speaker beep on Fedora >= 12, you must load the kernel driver module `pcspkr.ko` first. @@ -18,31 +18,45 @@ You can do this manually as root as follows: [root@host ~]# modprobe pcspkr If you want the system to automatically load the pcspkr driver the -next time it boots, uncomment the +next time it boots (very much recommended), uncomment the line alias platform:pcspkr pcspkr -line in the `/etc/modprobe.d/beep.conf` config file. +in the `/etc/modprobe.d/beep.conf` config file. You can check whether pcspkr.ko is loaded by running - [root@host ~]# lsmod | grep pcspkr - -as root. + [user@host ~]$ lsmod | grep pcspkr When pcspkr is loaded, you can run [root@host ~]# beep -as root and verify that you hear the beep coming from the PC speaker. +as root and as a non-root user + + [user@host ~]$ beep + +and verify that you hear the beep coming from the PC speaker. -2. Add non-root users to the "beep" group ------------------------------------------ +2. Permission setup for non-root users (for non-local logins) +------------------------------------------------------------- For more information on permission setup, please consult /usr/share/doc/beep/PERMISSIONS.md file. +On Fedora, if a user is currently logged in locally via either a +graphical session or a getty@ttyN.service text session on the virtual +console, that user will automatically be able to access the device +special file `/dev/input/by-path/platform-pcspkr-event-spkr` which +`beep` uses to access the PC speaker. + +This means that for many cases, no special permission setup is +required for a user to run beep. + +For other cases (such as e.g. users only logged in via ssh sessions), +you can add the respective user to the `beep` group. + To add user `jane` to the `beep` group, have root run [root@host ~]# usermod jane -a -G beep @@ -64,43 +78,43 @@ their group membership as follows: To check the permission of the PC speaker device file, run [user@host ~]$ ls -lH /dev/input/by-path/platform-pcspkr-event-spkr - crw-rw----+ 1 root input 13, 85 29. Dez 02:52 /dev/input/by-path/platform-pcspkr-event-spkr + crw-rw----+ 1 root input 13, 85 Dec 29 13:52 /dev/input/by-path/platform-pcspkr-event-spkr [user@host ~]$ getfacl /dev/input/by-path/platform-pcspkr-event-spkr getfacl: Removing leading '/' from absolute path names # file: dev/input/by-path/platform-pcspkr-event-spkr # owner: root # group: input user::rw- - group:beep:-w- + user:user:rw- group::rw- + group:beep:-w- mask::rw- other::--- [user@host ~]$ -3. Avoid using `beep` ---------------------- +3. When and how to avoid using `beep` +------------------------------------- An alternative way to get sound output for non-root users works if the system has a sound card set up with a speaker connected to it. -The standard 440Hz square wave which `beep` emits can be played +E.g. the standard 440Hz square wave which `beep` emits can be played through the standard sound infrastructure with the command `play` from -the `sox` package (more pleasant examples are in the `sox(1)` man -page): +the `sox` package (more pleasant examples are shown in the `sox(1)` +man page): [jane@host ~]$ play -q -n synth 0.3 square 440 However, modern desktop systems with the freedesktop.org suite of middleware (systemd user sessions, pulseaudio audio routing, etc.) -will probably not be set up to allow use of the sound infrastructure -for users other than the user currently logged into the current -virtual console. +may not be set up to allow use of the sound infrastructure for users +other than the user currently logged into the current virtual console. -4. Example Usage ----------------- +4. Example Usage of `beep` +-------------------------- An acoustic notification when a long running compile job finishes (whether the build was successful or not) could be done with @@ -109,4 +123,4 @@ An acoustic notification when a long running compile job finishes or - [bill@host ~/rpms/foobar]$ fedpkg mockbuild; beep + [bill@host ~/rpms/foobar]$ if fedpkg mockbuild; then /usr/share/doc/beep/contrib/success-beeps; else /usr/share/doc/beep/contrib/failure-beeps; fi From 2b9e64956b2dea3bc2daa7f80ec0765e6c24586a Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 25 Mar 2021 00:43:55 +0100 Subject: [PATCH 11/42] Add "Recommends: kmod(pcspkr.ko)" We "recommend" the kernel driver and do not "require" it in order to not break cases where beep is installed on systems other than bare-metal PC hardware such as containers. This assumes the people using the "beep" package can deal with a "beep" invocation not producing a beep on those other systems. The alternative would be to "require" the kernel driver which would mean that you could not install beep inside a container, even if that container is run in a priviledged way with access to the host's pcspkr.ko. While the kernel supports more speaker drivers, the only hardware platforms with a speaker driver supported by Fedora use pcspkr.ko (PCSPKR_PLATFORM in the kernel config). Slightly (but not quite) similar packages would be floppy-support and joystick-support which both "require" their respective kernel drivers, but they make less sense inside containers. --- README.fedora | 11 ++++++++--- beep.spec | 22 +++++++++++++++++++++- pcspkr-beep.conf | 17 +++++++++++++++-- 3 files changed, 44 insertions(+), 6 deletions(-) diff --git a/README.fedora b/README.fedora index d4e3561..5d47f80 100644 --- a/README.fedora +++ b/README.fedora @@ -10,10 +10,15 @@ Content 1. Load the `pkspkr.ko` Kernel Driver Module (required) ------------------------------------------------------- -To have a working PC speaker beep on Fedora >= 12, you must load the -kernel driver module `pcspkr.ko` first. +To have a working PC speaker beep, the kernel driver module +`pcspkr.ko` must be loaded. -You can do this manually as root as follows: +On Fedora >= 32, you need to install the `kernel-modules-extra` +package first which contains the `pcspkr.ko` kernel driver module. + +On Fedora >= 12, you need to explicitly make the kernel load the +driver module `pcspkr.ko`. You can do this manually as root as +follows: [root@host ~]# modprobe pcspkr diff --git a/beep.spec b/beep.spec index 4dd4980..02938d4 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -28,6 +28,23 @@ BuildRequires: glibc-kernheaders BuildRequires: systemd BuildRequires: make +# We "recommend" the kernel driver and do not "require" it in order to +# not break cases where beep is installed on systems other than +# bare-metal PC hardware such as containers. +# +# This assumes the people using the "beep" package can deal with a +# "beep" invocation not producing a beep on those other systems. +# +# The alternative would be to "require" the kernel driver which would +# mean that you could not install beep inside a container, even if +# that container is run in a priviledged way with access to the host's +# pcspkr.ko. +# +# While the kernel supports more speaker drivers, the only hardware +# platforms with a speaker driver supported by Fedora use pcspkr.ko +# (PCSPKR_PLATFORM in the kernel config). +Recommends: kmod(pcspkr.ko) + Requires(pre): shadow-utils # /etc/modprobe.d/ @@ -89,6 +106,9 @@ exit 0 %changelog +* Wed Mar 24 2021 Hans Ulrich Niedermann - 1.4.7-5 +- Add "Recommends: kmod(pcspkr.ko)" to install the driver if available (#1942670) + * Tue Jan 26 2021 Fedora Release Engineering - 1.4.7-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/pcspkr-beep.conf b/pcspkr-beep.conf index a9fbe0c..6fd4aee 100644 --- a/pcspkr-beep.conf +++ b/pcspkr-beep.conf @@ -1,3 +1,16 @@ -# Uncomment the following line to have the pcspkr.ko driver -# load automatically on boot +# Uncomment the alias line to have the pcspkr.ko driver load +# automatically on boot. +# +# The pcspkr.ko driver module is shipped in the kernel-modules-extra +# RPM package has probably been installed by default if it is +# possible, but you still might need to install it. +# +# Note that the kernel-modules-extra package and the pcspkr.ko module +# might not be available inside a container, while the hosts's actual +# pcspkr.ko API might or might not be available inside the container. +# +# So inside a container, the "beep" command might or might not produce +# sound depending on things entirely outside of the control of "beep" +# or even the container. +# # alias platform:pcspkr pcspkr From c856d6be9c9e29f21dd7191266b9cb53f9631b7a Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 25 Mar 2021 20:24:31 +0100 Subject: [PATCH 12/42] Remove all module dependencies Remove all kmod(pcspkr.ko) dependencies as https://bugzilla.redhat.com/show_bug.cgi?id=1652823 shows dnf would just install the wrong package. So instead, we document that the user has to explicitly install the kernel-modules-extra package. --- beep.spec | 26 +++++++++++++++++++++----- pcspkr-beep.conf | 13 +++++++++---- 2 files changed, 30 insertions(+), 9 deletions(-) diff --git a/beep.spec b/beep.spec index 02938d4..353fe15 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -28,9 +28,19 @@ BuildRequires: glibc-kernheaders BuildRequires: systemd BuildRequires: make -# We "recommend" the kernel driver and do not "require" it in order to -# not break cases where beep is installed on systems other than -# bare-metal PC hardware such as containers. +# Until https://bugzilla.redhat.com/show_bug.cgi?id=1652823 has been +# fixed (which makes dnf pull in a completely new debug kernel, while +# absolutely not installing the kernel module for the non-debug kernel +# actually in use), we cannot use the kmod(pcspkr.ko) recommends +# below. The boolean recommends also do not work (they do not pull in +# any package on "dnf install"), so we can only keep those here to +# document that they do not work. +# +# So people need to install the required package by hand. +# +# We would "recommend" the kernel driver and not "require" it in +# order to not break cases where beep is installed on systems other +# than bare-metal PC hardware such as containers. # # This assumes the people using the "beep" package can deal with a # "beep" invocation not producing a beep on those other systems. @@ -43,7 +53,10 @@ BuildRequires: make # While the kernel supports more speaker drivers, the only hardware # platforms with a speaker driver supported by Fedora use pcspkr.ko # (PCSPKR_PLATFORM in the kernel config). -Recommends: kmod(pcspkr.ko) +# +# Recommends: kmod(pcspkr.ko) +# Recommends: (kernel-modules-extras if kernel-modules) +# Recommends: (kernel-debug-modules-extras if kernel-debug-modules) Requires(pre): shadow-utils @@ -106,6 +119,9 @@ exit 0 %changelog +* Thu Mar 25 2021 Hans Ulrich Niedermann - 1.4.7-6 +- Remove any kmod(pcspkr.ko) dependencies as they install the wrong package + * Wed Mar 24 2021 Hans Ulrich Niedermann - 1.4.7-5 - Add "Recommends: kmod(pcspkr.ko)" to install the driver if available (#1942670) diff --git a/pcspkr-beep.conf b/pcspkr-beep.conf index 6fd4aee..cfe1e8f 100644 --- a/pcspkr-beep.conf +++ b/pcspkr-beep.conf @@ -2,12 +2,17 @@ # automatically on boot. # # The pcspkr.ko driver module is shipped in the kernel-modules-extra -# RPM package has probably been installed by default if it is -# possible, but you still might need to install it. +# which you need to install manually at this time. +# +# An automatic installation via "requires" or "recommends" is not +# possible due to "dnf install 'kmod(pcspkr.ko)'" likely installing an +# unrelated (-debug) kernel (see +# https://bugzilla.redhat.com/show_bug.cgi?id=1652823). # # Note that the kernel-modules-extra package and the pcspkr.ko module -# might not be available inside a container, while the hosts's actual -# pcspkr.ko API might or might not be available inside the container. +# might also not be available inside a container, while the hosts's +# actual pcspkr.ko API might or might not be available inside the +# container depending on how the container is launched. # # So inside a container, the "beep" command might or might not produce # sound depending on things entirely outside of the control of "beep" From 6585171286b66b28964e7dab2db1127e73ca3d97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 13:34:58 +0000 Subject: [PATCH 13/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering From cf0ac04709a9a1774eeb68a40e8642dd185cb013 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 21 Jul 2021 18:31:19 +0000 Subject: [PATCH 14/42] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 353fe15..bebb860 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.7 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -119,6 +119,9 @@ exit 0 %changelog +* Wed Jul 21 2021 Fedora Release Engineering - 1.4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Thu Mar 25 2021 Hans Ulrich Niedermann - 1.4.7-6 - Remove any kmod(pcspkr.ko) dependencies as they install the wrong package From eeec5749f33861648b81b9f730f986f5f4469499 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 15 Jan 2022 13:53:03 +0100 Subject: [PATCH 15/42] Use underscore as cursor in command prompt depiction --- README.fedora | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.fedora b/README.fedora index 5d47f80..0f9b27e 100644 --- a/README.fedora +++ b/README.fedora @@ -70,7 +70,7 @@ You can check which users are members of the `beep` group by running [user@host ~]$ getent group beep beep:x:951:jane,bill - [user@host ~]$ + [user@host ~]$ _ However, any user newly added to the `beep` group must re-login so their processes can pick up the group membership. A user can check @@ -78,7 +78,7 @@ their group membership as follows: [jane@host ~]$ id uid=1000(jane) gid=1000(jane) groups=1000(jane),10(wheel),951(beep) context=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023 - [jane@host ~]$ + [jane@host ~]$ _ To check the permission of the PC speaker device file, run @@ -96,7 +96,7 @@ To check the permission of the PC speaker device file, run mask::rw- other::--- - [user@host ~]$ + [user@host ~]$ _ 3. When and how to avoid using `beep` From b89de01c88f1ba692dc93d5e357f75fe330dc94c Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 15 Jan 2022 13:53:34 +0100 Subject: [PATCH 16/42] Update README.fedora regarding alsamixer requirements --- README.fedora | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/README.fedora b/README.fedora index 0f9b27e..276126a 100644 --- a/README.fedora +++ b/README.fedora @@ -99,7 +99,39 @@ To check the permission of the PC speaker device file, run [user@host ~]$ _ -3. When and how to avoid using `beep` +3. Set up the audio mixer (required on some hardware) +----------------------------------------------------- + +On some systems with integrated speakers like e.g. laptops from the +IBM/Lenovo Thinkpad series, there is no separate physical speaker for +the PC speaker. + +Instead, the square wave sound generated by the PC speaker goes to the +integrated speakers through a mixer chip, where it is mixed with PCM +sound, CD drive audio, line in, microphone in, and other sources. + +On these systems, you might need to configure the mixer to make the PC +speaker audible through the laptop speakers, e.g. + + * Start alsamixer. + * Find the correct card (switch with the `F6` key). + * Maybe enable loopback. + * Unmute the appropriate PC speaker source (`m` key) and turn up + its volume. + * Weirdly, a microphone volume below 0% apparently can also + silence the PC speaker beeps. + +Some experimentation might be required. + +Of course, these mixer settings must be saved before the next system +reboot so that the reboot can restore the mixer settings. Some systems +save the mixer settings as part of their shutdown procedure, others +may need you to save them explicitly. + +TBD: How does Fedora handle saving alsamixer state across reboots? + + +4. When and how to avoid using `beep` ------------------------------------- An alternative way to get sound output for non-root users works if the @@ -118,7 +150,7 @@ may not be set up to allow use of the sound infrastructure for users other than the user currently logged into the current virtual console. -4. Example Usage of `beep` +5. Example Usage of `beep` -------------------------- An acoustic notification when a long running compile job finishes From 97bcb978d453007d6b387c6269a0bba47f3fc675 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 15 Jan 2022 13:53:59 +0100 Subject: [PATCH 17/42] Update to beep-1.4.10 --- beep.spec | 13 ++++++++----- sources | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/beep.spec b/beep.spec index bebb860..ce66957 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep -Version: 1.4.7 -Release: 7%{?dist} +Version: 1.4.10 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -105,10 +105,10 @@ exit 0 %files %doc README.fedora %license %{_pkgdocdir}/COPYING -%doc %{_pkgdocdir}/CHANGELOG -%doc %{_pkgdocdir}/CREDITS -%doc %{_pkgdocdir}/README.md +%doc %{_pkgdocdir}/CREDITS.md +%doc %{_pkgdocdir}/NEWS.md %doc %{_pkgdocdir}/PERMISSIONS.md +%doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/contrib/failure-beeps %doc %{_pkgdocdir}/contrib/success-beeps %attr(0755,root,root) %{_bindir}/beep @@ -119,6 +119,9 @@ exit 0 %changelog +* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.10-1 +- Update to beep-1.4.10 + * Wed Jul 21 2021 Fedora Release Engineering - 1.4.7-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index 886e63a..defe8cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beep-1.4.7.tar.gz) = a1482a16f971c56dc6a62047fa449c96519c897d2e8cb18dcc06178564943c1eb3b9d9106ca6b76054e0fa109e3b161fb8e9ec1966a02d0d739222b5434b71c7 +SHA512 (beep-1.4.10.tar.gz) = b2e8325c1560b066073dbb9965c4566f7040f42eb8345e332218b5da73889cd6fd72ede8b91f171500e26766ff00de19b3ff82bc57d555dfb18365a0efbc76d8 From 9ac4e16ee104e73d4c7c5816e212796fa912d310 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Sat, 15 Jan 2022 15:53:00 +0100 Subject: [PATCH 18/42] Update to beep-1.4.11 --- beep.spec | 7 ++++++- sources | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/beep.spec b/beep.spec index ce66957..07da527 100644 --- a/beep.spec +++ b/beep.spec @@ -1,6 +1,6 @@ Summary: Beep the PC speaker any number of ways Name: beep -Version: 1.4.10 +Version: 1.4.11 Release: 1%{?dist} License: GPLv2+ @@ -110,6 +110,8 @@ exit 0 %doc %{_pkgdocdir}/PERMISSIONS.md %doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/contrib/failure-beeps +%doc %{_pkgdocdir}/contrib/morse2beep.pl +%doc %{_pkgdocdir}/contrib/morse2beep.sed %doc %{_pkgdocdir}/contrib/success-beeps %attr(0755,root,root) %{_bindir}/beep %{_mandir}/man1/beep.1* @@ -119,6 +121,9 @@ exit 0 %changelog +* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.11-1 +- Update to beep-1.4.11 + * Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.10-1 - Update to beep-1.4.10 diff --git a/sources b/sources index defe8cb..6ae0569 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beep-1.4.10.tar.gz) = b2e8325c1560b066073dbb9965c4566f7040f42eb8345e332218b5da73889cd6fd72ede8b91f171500e26766ff00de19b3ff82bc57d555dfb18365a0efbc76d8 +SHA512 (beep-1.4.11.tar.gz) = 8849e18b2dbd85d412b71215deec87e81a141438c632ca2c3e95a340ea7adf83054b5643be310eacfe47e37a0c448256adc5d594623cc7f8cb7ceaae223e753a From 74674faf18b1549564e7a640c1c93e2a49874f51 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 19 Jan 2022 11:28:51 +0100 Subject: [PATCH 19/42] Support versioned pkgdocdir for epel7 Apparently, epel7 uses a versioned directory name /usr/share/doc/$(PACKAGE)-$(VERSION)/ to store documentation files instead of the more common (f34 and f35 and fNN for along time, and epel8, and presumably epel9 as well, also Debian 10, FreeBSD13, etc.) /usr/share/doc/$(PACKAGE)/ --- beep.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/beep.spec b/beep.spec index 07da527..99887db 100644 --- a/beep.spec +++ b/beep.spec @@ -77,6 +77,8 @@ interesting, but it is really good at the notifying part. %prep %setup -q +%{?el7:sed -i 's|^pkgdocdir=.*|pkgdocdir=$(docdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)|' GNUmakefile} +grep ^pkgdocdir= GNUmakefile install -m 0644 -p %{SOURCE1} README.fedora sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && : #" @@ -87,6 +89,7 @@ make %{?_smp_mflags} COMPILERS=gcc CFLAGS_gcc="-Wall -Wextra -std=gnu99 -pedanti %install rm -rf "$RPM_BUILD_ROOT" +ls -l "/usr/share/doc" ||: make install DESTDIR="$RPM_BUILD_ROOT" COMPILERS=gcc CFLAGS_gcc="-Wall -Wextra -std=gnu99 -pedantic -Werror ${RPM_OPT_FLAGS}" LDFLAGS="${RPM_LD_FLAGS}" CPPFLAGS_gcc="" install -d -m 0755 "$RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/" From 3926561aa5f522f2e2b381f147249da93471558e Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 19 Jan 2022 19:04:48 +0100 Subject: [PATCH 20/42] package.cfg: Add epel, remove master --- package.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.cfg b/package.cfg index 6b189b9..1cb0d1a 100644 --- a/package.cfg +++ b/package.cfg @@ -1,2 +1,2 @@ [koji] -targets = master fedora +targets = epel fedora From 8d050db7cc825936e5aab95563d33b22ec75694d Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 19 Jan 2022 19:07:03 +0100 Subject: [PATCH 21/42] remove package.cfg Trying to get this to build for both Fedora and Epel, and package.cfg appears to be confusing fedpkg --- package.cfg | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 package.cfg diff --git a/package.cfg b/package.cfg deleted file mode 100644 index 1cb0d1a..0000000 --- a/package.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[koji] -targets = epel fedora From 4989d4a7f3a91e2b72dfd12ae68b834be969d465 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 19 Jan 2022 19:21:32 +0100 Subject: [PATCH 22/42] rebuild to have common sources for all branches --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 99887db..d0004c0 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.11 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -124,6 +124,9 @@ exit 0 %changelog +* Wed Jan 19 2022 Hans Ulrich Niedermann - 1.4.11-2 +- rebuild to have common sources for all branches + * Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.11-1 - Update to beep-1.4.11 From 3e678feefd8d7e4f69acc2d867ba823f2d4372d8 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Mon, 24 Jan 2022 23:34:49 +0100 Subject: [PATCH 23/42] Use more RPM macros in %build and %install steps Use %{build_cflags} and %{build_ldflags} to hopefully use more of what default flags are available in default builds, and switch to more %{...} rpm macros instead of ${RPM_*} shell vars. --- beep.spec | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/beep.spec b/beep.spec index d0004c0..32a03fa 100644 --- a/beep.spec +++ b/beep.spec @@ -84,20 +84,19 @@ sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && %build -make %{?_smp_mflags} COMPILERS=gcc CFLAGS_gcc="-Wall -Wextra -std=gnu99 -pedantic -Werror ${RPM_OPT_FLAGS}" LDFLAGS="${RPM_LD_FLAGS}" CPPFLAGS_gcc="" +make %{?_smp_mflags} COMPILERS=gcc COMPILER_gcc=gcc COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} %install -rm -rf "$RPM_BUILD_ROOT" -ls -l "/usr/share/doc" ||: -make install DESTDIR="$RPM_BUILD_ROOT" COMPILERS=gcc CFLAGS_gcc="-Wall -Wextra -std=gnu99 -pedantic -Werror ${RPM_OPT_FLAGS}" LDFLAGS="${RPM_LD_FLAGS}" CPPFLAGS_gcc="" +rm -rf "%{buildroot}" +make install DESTDIR="%{buildroot}" COMPILER_gcc=false COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} -install -d -m 0755 "$RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/" -install -p -m 0644 "%{SOURCE4}" "$RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/beep.conf" +install -d -m 0755 "%{buildroot}%{_sysconfdir}/modprobe.d/" +install -p -m 0644 "%{SOURCE4}" "%{buildroot}%{_sysconfdir}/modprobe.d/beep.conf" -install -d -m 0755 "$RPM_BUILD_ROOT%{_udevrulesdir}/" -install -p -m 0644 "%{SOURCE2}" "$RPM_BUILD_ROOT%{_udevrulesdir}/" -install -p -m 0644 "%{SOURCE3}" "$RPM_BUILD_ROOT%{_udevrulesdir}/" +install -d -m 0755 "%{buildroot}%{_udevrulesdir}/" +install -p -m 0644 "%{SOURCE2}" "%{buildroot}%{_udevrulesdir}/" +install -p -m 0644 "%{SOURCE3}" "%{buildroot}%{_udevrulesdir}/" %pre From c7032d376536d854e9e56aa3dafed4e566220b48 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 25 Jan 2022 20:26:57 +0100 Subject: [PATCH 24/42] Stop using %doc with relative paths Stop using %doc with relative paths and absolute paths: Only use %doc with absolute paths (%{_pkgdocdir}). Why? It's in the Fedora Packaging Guidelines, and epel7 builds complain about doc files being listed twice. --- beep.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/beep.spec b/beep.spec index 32a03fa..1b4f73d 100644 --- a/beep.spec +++ b/beep.spec @@ -79,7 +79,6 @@ interesting, but it is really good at the notifying part. %setup -q %{?el7:sed -i 's|^pkgdocdir=.*|pkgdocdir=$(docdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)|' GNUmakefile} grep ^pkgdocdir= GNUmakefile -install -m 0644 -p %{SOURCE1} README.fedora sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && : #" @@ -91,6 +90,8 @@ make %{?_smp_mflags} COMPILERS=gcc COMPILER_gcc=gcc COMPILER_clang=false CPPFLAG rm -rf "%{buildroot}" make install DESTDIR="%{buildroot}" COMPILER_gcc=false COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} +install -p -m 0644 "%{SOURCE1}" "%{buildroot}%{_pkgdocdir}/README.fedora" + install -d -m 0755 "%{buildroot}%{_sysconfdir}/modprobe.d/" install -p -m 0644 "%{SOURCE4}" "%{buildroot}%{_sysconfdir}/modprobe.d/beep.conf" @@ -105,11 +106,11 @@ exit 0 %files -%doc README.fedora %license %{_pkgdocdir}/COPYING %doc %{_pkgdocdir}/CREDITS.md %doc %{_pkgdocdir}/NEWS.md %doc %{_pkgdocdir}/PERMISSIONS.md +%doc %{_pkgdocdir}/README.fedora %doc %{_pkgdocdir}/README.md %doc %{_pkgdocdir}/contrib/failure-beeps %doc %{_pkgdocdir}/contrib/morse2beep.pl From 4a513c887f2a9d2be65e6d39b148f48b54fd5770 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 26 Jan 2022 23:39:26 +0100 Subject: [PATCH 25/42] Remove explicit non-functional %attr() statements If it is not needed, we can remove it. --- beep.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/beep.spec b/beep.spec index 1b4f73d..887145c 100644 --- a/beep.spec +++ b/beep.spec @@ -116,9 +116,9 @@ exit 0 %doc %{_pkgdocdir}/contrib/morse2beep.pl %doc %{_pkgdocdir}/contrib/morse2beep.sed %doc %{_pkgdocdir}/contrib/success-beeps -%attr(0755,root,root) %{_bindir}/beep +%{_bindir}/beep %{_mandir}/man1/beep.1* -%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf +%config(noreplace) %{_sysconfdir}/modprobe.d/beep.conf %{_udevrulesdir}/70-pcspkr-beep.rules %{_udevrulesdir}/90-pcspkr-beep.rules From ef038e4ea781794e8f76c3f599d323d40337bf57 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 27 Jan 2022 23:22:45 +0100 Subject: [PATCH 26/42] fix broken rpm build from 1.4.11-3 (missing COMPILERS= in %install) --- beep.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/beep.spec b/beep.spec index a4d79ca..578873b 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -88,7 +88,7 @@ make %{?_smp_mflags} COMPILERS=gcc COMPILER_gcc=gcc COMPILER_clang=false CPPFLAG %install rm -rf "%{buildroot}" -make install DESTDIR="%{buildroot}" COMPILER_gcc=false COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} +make install DESTDIR="%{buildroot}" COMPILERS=gcc COMPILER_gcc=false COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} install -p -m 0644 "%{SOURCE1}" "%{buildroot}%{_pkgdocdir}/README.fedora" @@ -124,6 +124,9 @@ exit 0 %changelog +* Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-4 +- fix broken rpm build from 1.4.11-3 (missing COMPILERS= in %%install) + * Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-3 - only use %%doc with absolute paths (removes duplicate listings) - stop using env vars in favour of rpm macros From e4571393b1999532e197b189019f821ba7bd7827 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Thu, 27 Jan 2022 23:25:24 +0100 Subject: [PATCH 27/42] Update to beep-1.4.12 beep-1.4.12 mainly uses a simplified build system. --- beep.spec | 26 ++++++++++++++++++++------ sources | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/beep.spec b/beep.spec index 578873b..4575c7d 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep -Version: 1.4.11 -Release: 4%{?dist} +Version: 1.4.12 +Release: 1%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -24,6 +24,8 @@ Source4: pcspkr-beep.conf BuildRequires: gcc BuildRequires: glibc-kernheaders +%{!?el7:BuildRequires: libubsan} + # for the udev macros BuildRequires: systemd BuildRequires: make @@ -77,18 +79,27 @@ interesting, but it is really good at the notifying part. %prep %setup -q -%{?el7:sed -i 's|^pkgdocdir=.*|pkgdocdir=$(docdir)/$(PACKAGE_TARNAME)-$(PACKAGE_VERSION)|' GNUmakefile} -grep ^pkgdocdir= GNUmakefile sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && : #" %build -make %{?_smp_mflags} COMPILERS=gcc COMPILER_gcc=gcc COMPILER_clang=false CPPFLAGS_gcc="" CFLAGS_gcc="-std=gnu99 -pedantic -Wall -Wextra -Werror %{build_cflags}" LDFLAGS_gcc="%{build_ldflags}" prefix=%{_prefix} bindir=%{_bindir} pkgdocdir=%{_pkgdocdir} +cat>local.mk< - 1.4.12-1 +- Update to beep-1.4.12 with simplified makefile + * Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-4 - fix broken rpm build from 1.4.11-3 (missing COMPILERS= in %%install) diff --git a/sources b/sources index 6ae0569..7052993 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (beep-1.4.11.tar.gz) = 8849e18b2dbd85d412b71215deec87e81a141438c632ca2c3e95a340ea7adf83054b5643be310eacfe47e37a0c448256adc5d594623cc7f8cb7ceaae223e753a +SHA512 (beep-1.4.12.tar.gz) = 18fed77bc4820ecc84ac12e903d516d5228fa2038df1788cc68db76e40b3c47a271911cc45bc48ce94e3f215803c5c05cb6c08ebb47ae6d7fcf1e0bc1ac169cd From 698582ac49c027175dee6c06cc617401abbfae9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 20 Jul 2022 21:53:41 +0000 Subject: [PATCH 28/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- beep.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 4575c7d..3d74629 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.12 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -135,6 +135,9 @@ exit 0 %changelog +* Wed Jul 20 2022 Fedora Release Engineering - 1.4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Fri Jan 28 2022 Hans Ulrich Niedermann - 1.4.12-1 - Update to beep-1.4.12 with simplified makefile From bd4f8addeb0bded643a8edae98917093f95513c3 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 16 Aug 2022 22:02:04 +0200 Subject: [PATCH 29/42] Move package to rpmautospec --- beep.spec | 179 +----------------------------------------------------- changelog | 176 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 178 insertions(+), 177 deletions(-) create mode 100644 changelog diff --git a/beep.spec b/beep.spec index 3d74629..3b3f24c 100644 --- a/beep.spec +++ b/beep.spec @@ -1,7 +1,7 @@ Summary: Beep the PC speaker any number of ways Name: beep Version: 1.4.12 -Release: 2%{?dist} +Release: %autorelease License: GPLv2+ URL: https://github.com/spkr-beep/beep/ @@ -135,179 +135,4 @@ exit 0 %changelog -* Wed Jul 20 2022 Fedora Release Engineering - 1.4.12-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Fri Jan 28 2022 Hans Ulrich Niedermann - 1.4.12-1 -- Update to beep-1.4.12 with simplified makefile - -* Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-4 -- fix broken rpm build from 1.4.11-3 (missing COMPILERS= in %%install) - -* Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-3 -- only use %%doc with absolute paths (removes duplicate listings) -- stop using env vars in favour of rpm macros -- remove non-functional explicit %%attr - -* Wed Jan 19 2022 Hans Ulrich Niedermann - 1.4.11-2 -- rebuild to have common sources for all branches - -* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.11-1 -- Update to beep-1.4.11 - -* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.10-1 -- Update to beep-1.4.10 - -* Wed Jul 21 2021 Fedora Release Engineering - 1.4.7-7 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Thu Mar 25 2021 Hans Ulrich Niedermann - 1.4.7-6 -- Remove any kmod(pcspkr.ko) dependencies as they install the wrong package - -* Wed Mar 24 2021 Hans Ulrich Niedermann - 1.4.7-5 -- Add "Recommends: kmod(pcspkr.ko)" to install the driver if available (#1942670) - -* Tue Jan 26 2021 Fedora Release Engineering - 1.4.7-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Mon Jul 27 2020 Fedora Release Engineering - 1.4.7-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - -* Tue Jan 28 2020 Fedora Release Engineering - 1.4.7-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - -* Wed Jan 1 2020 Hans Ulrich Niedermann - 1.4.7-1 -- Update to beep-1.4.7 -- Install contrib scripts for both successfully and failing sounding beeps. - -* Fri Dec 20 2019 Hans Ulrich Niedermann - 1.4.6-1 -- Update to beep-1.4.6 -- Use BEEP_LOG_LEVEL environment variable for default log level -- Avoid possible bug related to not using va_copy() with a va_list parameter - -* Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - -* Tue Apr 2 2019 Hans Ulrich Niedermann - 1.4.4-1 -- Update to beep-1.4.4 -- Install default udev rules to /usr/lib/udev/rules.d/ (not /etc/udev/) -- Give the currently locally logged in user PC speaker access out of the box -- Have beep(1) man page mention README.fedora - -* Thu Jan 31 2019 Fedora Release Engineering - 1.4.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild - -* Fri Jan 18 2019 Hans Ulrich Niedermann - 1.4.3-1 -- Update to beep-1.4.3 - -* Tue Jan 8 2019 Hans Ulrich Niedermann - 1.4.1-1 -- Update to beep-1.4.1 - -* Fri Jan 4 2019 Hans Ulrich Niedermann - 1.4.0-1 -- Update to beep-1.4.0 - -* Sat Dec 29 2018 Hans Ulrich Niedermann - 1.3-26 -- Stop shipping old sudo related config files -- Refuse to run when run via sudo -- Set up group 'beep' for write access to evdev device with new udev rule -- Update README.fedora to reflect new group permission setup on evdev device - -* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-25 -- guard against directory traversal in /dev/input/ check -- refuse to run if setuid or setgid root -- make the evdev device the first device to look for (does not require root) - -* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-24 -- Actually apply the patches -- Update COPYING with new FSF address -- Fix Patch9 to work as non-git patch (do the rest with shell) -- Proper naming of Patch14 -- Exit beep when error accessing API - -* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-23 -- Fix CVE-2018-1000532 and mitigate against related issues (#1595592) -- Fix a number of potential integer overflows - -* Thu Jul 12 2018 Fedora Release Engineering - 1.3-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Tue Apr 3 2018 Hans Ulrich Niedermann - 1.3-21 -- Add CVE-2018-0492 fix. -- Behaviour of multiple -f parameters matches documentation now. - -* Wed Feb 07 2018 Fedora Release Engineering - 1.3-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Wed Aug 02 2017 Fedora Release Engineering - 1.3-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Wed Jul 26 2017 Fedora Release Engineering - 1.3-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Fri Feb 10 2017 Fedora Release Engineering - 1.3-17 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-16 -- Use more appropriate sox play example in README.fedora -- Make command line examples more readable in README.fedora - -* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-15 -- Add shell aliases to allow non-root users to run beep from the shell -- Fix mail address in %%changelog - -* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-14 -- Document how non-root users can run beep via sudo (#1133231) -- Remove spec file conditional required in Fedora 12 times - -* Mon May 16 2016 Hans Ulrich Niedermann - 1.3-13 -- Remove useless %%defattr for clarity - -* Wed Feb 03 2016 Fedora Release Engineering - 1.3-12 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Sun Jan 17 2016 Hans Ulrich Niedermann - 1.3-11 -- Do not replace config file modprobe.d/beep.conf (#1087616) - -* Wed Jun 17 2015 Fedora Release Engineering - 1.3-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Fri Aug 15 2014 Fedora Release Engineering - 1.3-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Sat Jun 07 2014 Fedora Release Engineering - 1.3-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Tue Nov 19 2013 Hans Ulrich Niedermann - 1.3-7 -- Use new upstream tarball beep-1.3.tar.gz (yes, it has changed!) -- Add a few fixes from upstream git repo -- Move our Makefile cleanup to upstream pull request - -* Sat Aug 03 2013 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Wed Feb 13 2013 Fedora Release Engineering - 1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Wed Jul 18 2012 Fedora Release Engineering - 1.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Thu Jan 12 2012 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Mon Feb 07 2011 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Fri Jul 16 2010 Hans Ulrich Niedermann - 1.3-1 -- Update to upstream release beep-1.3 - -* Fri Jan 22 2010 Hans Ulrich Niedermann - 1.2.2-6 -- Ship modprobe config file with alias for pcspkr on F12 and later - -* Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Mon Feb 23 2009 Fedora Release Engineering - 1.2.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Sun Sep 7 2008 Hans Ulrich Niedermann - 1.2.2-3 -- Initial package for submission to Fedora +%autochangelog diff --git a/changelog b/changelog new file mode 100644 index 0000000..e448e07 --- /dev/null +++ b/changelog @@ -0,0 +1,176 @@ +* Wed Jul 20 2022 Fedora Release Engineering - 1.4.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Fri Jan 28 2022 Hans Ulrich Niedermann - 1.4.12-1 +- Update to beep-1.4.12 with simplified makefile + +* Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-4 +- fix broken rpm build from 1.4.11-3 (missing COMPILERS= in %%install) + +* Thu Jan 27 2022 Hans Ulrich Niedermann - 1.4.11-3 +- only use %%doc with absolute paths (removes duplicate listings) +- stop using env vars in favour of rpm macros +- remove non-functional explicit %%attr + +* Wed Jan 19 2022 Hans Ulrich Niedermann - 1.4.11-2 +- rebuild to have common sources for all branches + +* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.11-1 +- Update to beep-1.4.11 + +* Sat Jan 15 2022 Hans Ulrich Niedermann - 1.4.10-1 +- Update to beep-1.4.10 + +* Wed Jul 21 2021 Fedora Release Engineering - 1.4.7-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Mar 25 2021 Hans Ulrich Niedermann - 1.4.7-6 +- Remove any kmod(pcspkr.ko) dependencies as they install the wrong package + +* Wed Mar 24 2021 Hans Ulrich Niedermann - 1.4.7-5 +- Add "Recommends: kmod(pcspkr.ko)" to install the driver if available (#1942670) + +* Tue Jan 26 2021 Fedora Release Engineering - 1.4.7-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.4.7-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 1.4.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Wed Jan 1 2020 Hans Ulrich Niedermann - 1.4.7-1 +- Update to beep-1.4.7 +- Install contrib scripts for both successfully and failing sounding beeps. + +* Fri Dec 20 2019 Hans Ulrich Niedermann - 1.4.6-1 +- Update to beep-1.4.6 +- Use BEEP_LOG_LEVEL environment variable for default log level +- Avoid possible bug related to not using va_copy() with a va_list parameter + +* Wed Jul 24 2019 Fedora Release Engineering - 1.4.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Tue Apr 2 2019 Hans Ulrich Niedermann - 1.4.4-1 +- Update to beep-1.4.4 +- Install default udev rules to /usr/lib/udev/rules.d/ (not /etc/udev/) +- Give the currently locally logged in user PC speaker access out of the box +- Have beep(1) man page mention README.fedora + +* Thu Jan 31 2019 Fedora Release Engineering - 1.4.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jan 18 2019 Hans Ulrich Niedermann - 1.4.3-1 +- Update to beep-1.4.3 + +* Tue Jan 8 2019 Hans Ulrich Niedermann - 1.4.1-1 +- Update to beep-1.4.1 + +* Fri Jan 4 2019 Hans Ulrich Niedermann - 1.4.0-1 +- Update to beep-1.4.0 + +* Sat Dec 29 2018 Hans Ulrich Niedermann - 1.3-26 +- Stop shipping old sudo related config files +- Refuse to run when run via sudo +- Set up group 'beep' for write access to evdev device with new udev rule +- Update README.fedora to reflect new group permission setup on evdev device + +* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-25 +- guard against directory traversal in /dev/input/ check +- refuse to run if setuid or setgid root +- make the evdev device the first device to look for (does not require root) + +* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-24 +- Actually apply the patches +- Update COPYING with new FSF address +- Fix Patch9 to work as non-git patch (do the rest with shell) +- Proper naming of Patch14 +- Exit beep when error accessing API + +* Fri Dec 28 2018 Hans Ulrich Niedermann - 1.3-23 +- Fix CVE-2018-1000532 and mitigate against related issues (#1595592) +- Fix a number of potential integer overflows + +* Thu Jul 12 2018 Fedora Release Engineering - 1.3-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Tue Apr 3 2018 Hans Ulrich Niedermann - 1.3-21 +- Add CVE-2018-0492 fix. +- Behaviour of multiple -f parameters matches documentation now. + +* Wed Feb 07 2018 Fedora Release Engineering - 1.3-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Wed Aug 02 2017 Fedora Release Engineering - 1.3-19 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Wed Jul 26 2017 Fedora Release Engineering - 1.3-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Fri Feb 10 2017 Fedora Release Engineering - 1.3-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-16 +- Use more appropriate sox play example in README.fedora +- Make command line examples more readable in README.fedora + +* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-15 +- Add shell aliases to allow non-root users to run beep from the shell +- Fix mail address in %%changelog + +* Tue May 31 2016 Hans Ulrich Niedermann - 1.3-14 +- Document how non-root users can run beep via sudo (#1133231) +- Remove spec file conditional required in Fedora 12 times + +* Mon May 16 2016 Hans Ulrich Niedermann - 1.3-13 +- Remove useless %%defattr for clarity + +* Wed Feb 03 2016 Fedora Release Engineering - 1.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Sun Jan 17 2016 Hans Ulrich Niedermann - 1.3-11 +- Do not replace config file modprobe.d/beep.conf (#1087616) + +* Wed Jun 17 2015 Fedora Release Engineering - 1.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Fri Aug 15 2014 Fedora Release Engineering - 1.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.3-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Tue Nov 19 2013 Hans Ulrich Niedermann - 1.3-7 +- Use new upstream tarball beep-1.3.tar.gz (yes, it has changed!) +- Add a few fixes from upstream git repo +- Move our Makefile cleanup to upstream pull request + +* Sat Aug 03 2013 Fedora Release Engineering - 1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Wed Feb 13 2013 Fedora Release Engineering - 1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Wed Jul 18 2012 Fedora Release Engineering - 1.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Thu Jan 12 2012 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + +* Mon Feb 07 2011 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Fri Jul 16 2010 Hans Ulrich Niedermann - 1.3-1 +- Update to upstream release beep-1.3 + +* Fri Jan 22 2010 Hans Ulrich Niedermann - 1.2.2-6 +- Ship modprobe config file with alias for pcspkr on F12 and later + +* Fri Jul 24 2009 Fedora Release Engineering - 1.2.2-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + +* Mon Feb 23 2009 Fedora Release Engineering - 1.2.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + +* Sun Sep 7 2008 Hans Ulrich Niedermann - 1.2.2-3 +- Initial package for submission to Fedora From 24958d483177725e12a22783dbf0a50fa7c97dd9 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 16 Aug 2022 22:16:45 +0200 Subject: [PATCH 30/42] Pass through some more package flags Pass through some more package flags, mostly so that the rpmautospec change can be tested. --- beep.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/beep.spec b/beep.spec index 3b3f24c..a4fa3cb 100644 --- a/beep.spec +++ b/beep.spec @@ -83,11 +83,20 @@ sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && %build +if test "x%{build_cppflags}" = "x%%{build_cppflags}"; then + BUILD_CPPFLAGS="" +else + BUILD_CPPFLAGS="%{build_cppflags}" +fi cat>local.mk< Date: Wed, 18 Jan 2023 22:47:18 +0000 Subject: [PATCH 31/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering From bdcc70091aa65c1852d0408c2f4c1c0f8c5bc178 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 27 Jan 2023 13:39:09 +0100 Subject: [PATCH 32/42] On EL7, Require: systemd instead of systemd-udev (#2157788) It appears that the udev directories /etc/udev/rules.d/ /usr/lib/udev/rules.d/ were split off from the systemd package into the systemd-udev package some time after EL7, so a beep package for EL7 and earlier can only "Require:" systemd, not the systemd-udev package introduced later. Closes: https://bugzilla.redhat.com/show_bug.cgi?id=2157788 --- beep.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/beep.spec b/beep.spec index a4fa3cb..9b35454 100644 --- a/beep.spec +++ b/beep.spec @@ -65,7 +65,11 @@ Requires(pre): shadow-utils # /etc/modprobe.d/ Requires: kmod # /etc/udev/rules.d/ and /usr/lib/udev/rules.d/ +%if 0%{?rhel} <= 7 +Requires: systemd +%else Requires: systemd-udev +%endif %description From cc7b64aeed1fc28786a705c7e2b1f40ce6474866 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Fri, 27 Jan 2023 22:19:40 +0100 Subject: [PATCH 33/42] Require: systemd only on EL7, not on Fedora (#2157788) We got the range wrong the last time. This does the correct Requires: el7 systemd el8 systemd-udev el9 systemd-udev fc36 systemd-udev fc37 systemd-udev fc38 systemd-udev --- beep.spec | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/beep.spec b/beep.spec index 9b35454..dc90672 100644 --- a/beep.spec +++ b/beep.spec @@ -64,12 +64,10 @@ Requires(pre): shadow-utils # /etc/modprobe.d/ Requires: kmod + # /etc/udev/rules.d/ and /usr/lib/udev/rules.d/ -%if 0%{?rhel} <= 7 -Requires: systemd -%else -Requires: systemd-udev -%endif +%{?el7:Requires: systemd} +%{!?el7:Requires: systemd-udev} %description From e11898073c3e675da0c31256182d254c965cf3ed Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 19 Jul 2023 14:30:40 +0000 Subject: [PATCH 34/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering From 1cb1544375936c1c444f5cc51032b8b4e683a3bb Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 30 Aug 2023 18:18:29 +0200 Subject: [PATCH 35/42] On EL7, use #!/bin/sed instead of #!/usr/bin/sed --- beep.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/beep.spec b/beep.spec index dc90672..5843a3c 100644 --- a/beep.spec +++ b/beep.spec @@ -107,6 +107,8 @@ mandir = %{_mandir} EOF make %{?_smp_mflags} +%{?el7:sed -i '1s|.*|#!/bin/sed -f|' contrib/morse/morse2beep.sed} + %install rm -rf "%{buildroot}" From ac4e09a02c24fab0f4a99106e3053f54814d9172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jan 2024 14:18:27 +0000 Subject: [PATCH 36/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From d05d757b644363754bad734a632c065542169291 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 23 Jan 2024 00:15:34 +0000 Subject: [PATCH 37/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 3207e186bf7bbd037e819af2e2ed30612cda25ea Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 18:12:00 +0000 Subject: [PATCH 38/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 4697af52e03b7b79022918b79be1f9aa49f5dfce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Thu, 25 Jul 2024 23:06:43 +0200 Subject: [PATCH 39/42] convert GPLv2+ license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- beep.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beep.spec b/beep.spec index 5843a3c..8c040d1 100644 --- a/beep.spec +++ b/beep.spec @@ -3,7 +3,8 @@ Name: beep Version: 1.4.12 Release: %autorelease -License: GPLv2+ +# Automatically converted from old format: GPLv2+ - review is highly recommended. +License: GPL-2.0-or-later URL: https://github.com/spkr-beep/beep/ # Upstream github repo: https://github.com/spkr-beep/beep From 57e1d336b8c4f3a48434d12d5c3e4f5e23f198c1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 12:24:15 +0000 Subject: [PATCH 40/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 3c133d9e347a3ba569d4315c64c8816e436c1506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 11 Feb 2025 14:36:19 +0100 Subject: [PATCH 41/42] Add sysusers.d config file to allow rpm to create users/groups automatically See https://fedoraproject.org/wiki/Changes/RPMSuportForSystemdSysusers. --- beep.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/beep.spec b/beep.spec index 8c040d1..84ce491 100644 --- a/beep.spec +++ b/beep.spec @@ -61,7 +61,6 @@ BuildRequires: make # Recommends: (kernel-modules-extras if kernel-modules) # Recommends: (kernel-debug-modules-extras if kernel-debug-modules) -Requires(pre): shadow-utils # /etc/modprobe.d/ Requires: kmod @@ -84,6 +83,11 @@ interesting, but it is really good at the notifying part. %setup -q sed -i 's|^\.\\" \(\.BR .*\)README.Distro\(.*\)|\1README.fedora\2|' beep.1.in && : #" +# Create a sysusers.d config file +cat >beep.sysusers.conf </dev/null || groupadd -r beep -exit 0 %files @@ -146,6 +149,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/modprobe.d/beep.conf %{_udevrulesdir}/70-pcspkr-beep.rules %{_udevrulesdir}/90-pcspkr-beep.rules +%{_sysusersdir}/beep.conf %changelog From 03c83cc47758c6f1f233ecf7e1a4fd1048d5b5d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 17:39:01 +0000 Subject: [PATCH 42/42] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild