rpms/beep/F-11 beep-README.fedora, NONE, 1.1 beep-modprobe.conf, NONE, 1.1 beep.spec, 1.2, 1.3

[Hans Ulrich Niedermann]

Author: ndim

Update of /cvs/pkgs/rpms/beep/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9644

Modified Files:
	beep.spec 
Added Files:
	beep-README.fedora beep-modprobe.conf 
Log Message:
* Fri Jan 22 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-6
- Ship modprobe config file with alias for pcspkr on F12 and later



--- NEW FILE beep-README.fedora ---
On systems with Fedora 12 or later, the kernel does not by default
alias the system device to the pcspkr.ko kernel driver any more. This
means that the pcspkr.ko driver is not loaded by default any more on
system startup.

You can check whether pcspkr.ko is loaded by running "lsmod | grep
pcspkr".

On these systems, the beep package ships a config file
/etc/modprobe.d/beep.conf with a configuration line that reintroduces
the default loading of pcspkr.ko. Due to possible side effects, you
will need to manually uncomment that line in the beep.conf file, though.

You do not need to reboot your system in order to get pcspkr.ko
loaded, though. Running "modprobe pcspkr" should do the job without a
reboot.

Caution: There appear to be some issues with access to the
/dev/console device which beep uses, possibly related to
ConsoleKit. This means that sometimes, just having pcspkr.ko loaded is
not enough for beep to actually beep. This issue is being
investigated.


--- NEW FILE beep-modprobe.conf ---
# Uncomment the following line to have the pcspkr driver loaded
# automatically on boot
# alias platform:pcspkr pcspkr


Index: beep.spec
===================================================================
RCS file: /cvs/pkgs/rpms/beep/F-11/beep.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- beep.spec	24 Feb 2009 04:24:56 -0000	1.2
+++ beep.spec	22 Jan 2010 14:07:48 -0000	1.3
@@ -1,12 +1,21 @@
+%if 0%{?fedora} >= 12
+%global ship_modprobe_config 1
+%else
+%global ship_modprobe_config 0
+%endif
+
+
 Summary:        Beep the PC speaker any number of ways
 Name:           beep
 Version:        1.2.2
-Release:        4%{?dist}
+Release:        6%{?dist}
 
 Group:          Applications/System
 License:        GPLv2+
 URL:            http://www.johnath.com/beep/
 Source0:        http://www.johnath.com/beep/%{name}-%{version}.tar.gz
+Source1:        %{name}-README.fedora
+Source2:        %{name}-modprobe.conf
 Patch0:         beep-1.2.2-install-fixes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,6 +34,7 @@ what's interesting, but it's real good a
 %prep
 %setup -q
 %patch0 -p1 -b .install-fixes
+cp -p %{SOURCE1} README.fedora
 
 
 %build
@@ -35,6 +45,11 @@ make %{?_smp_mflags} CFLAGS="${RPM_OPT_F
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+%if %{ship_modprobe_config}
+install -d -m 0755 "$RPM_BUILD_ROOT/etc/modprobe.d/"
+install -p -m 0644 %{SOURCE2} "$RPM_BUILD_ROOT/etc/modprobe.d/beep.conf"
+%endif
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,9 +60,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc CHANGELOG COPYING CREDITS README
 %attr(0755,root,root) %{_bindir}/beep
 %{_mandir}/man1/beep.1.gz
+%if %{ship_modprobe_config}
+%doc README.fedora
+%attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf
+%endif
 
 
 %changelog
+* Fri Jan 22 2010 Hans Ulrich Niedermann <hun at n-dimensional.de> - 1.2.2-6
+- Ship modprobe config file with alias for pcspkr on F12 and later
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.2.2-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild