Merge branch 'f22' into f23

Conflicts:
	beep.spec

beep.spec

@@ -8,7 +8,7 @@
 Summary:        Beep the PC speaker any number of ways
 Name:           beep
 Version:        1.3
-Release:        10%{?dist}
+Release:        11%{?dist}
 
 Group:          Applications/System
 License:        GPLv2+
@@ -96,11 +96,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/beep.1.gz
 %if %{ship_modprobe_config}
 %doc README.fedora
-%attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf
+%config(noreplace) %attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf
 %endif
 
 
 %changelog
+* Sun Jan 17 2016 Hans Ulrich Niedermann <hun@n-dimensional.de> - 1.3-11
+- Do not replace config file modprobe.d/beep.conf (#1087616)
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild