diff --git a/beep.spec b/beep.spec index caed7f4..19fd0b2 100644 --- a/beep.spec +++ b/beep.spec @@ -1,10 +1,3 @@ -%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.3 @@ -80,10 +73,8 @@ make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}" 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 +install -d -m 0755 "$RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/" +install -p -m 0644 %{SOURCE2} "$RPM_BUILD_ROOT/%{_sysconfdir}/modprobe.d/beep.conf" install -d -m 0700 "$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/" install -p -m 0600 %{SOURCE3} "$RPM_BUILD_ROOT/%{_sysconfdir}/sudoers.d/beep" @@ -97,16 +88,15 @@ 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 %config(noreplace) %attr(0644,root,root) %{_sysconfdir}/modprobe.d/beep.conf -%endif %config(noreplace) %attr(0600,root,root) %{_sysconfdir}/sudoers.d/beep %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