diff --git a/dnssec-trigger.spec b/dnssec-trigger.spec index eb769ee..270c59f 100644 --- a/dnssec-trigger.spec +++ b/dnssec-trigger.spec @@ -28,12 +28,15 @@ dnssec-trigger-applet the option to go with insecure DNS only. %prep %setup -q +# Fixup the name to not include "panel" in the menu item or name +sed -i "s/ Panel//" panel/dnssec-trigger-panel.desktop.in +sed -i "s/-panel//" panel/dnssec-trigger-panel.desktop.in +# NM has no /usr/sbin in path +sed -i "s/^dnssec-trigger-control/\/usr\/sbin\/dnssec-trigger-control/" 01-dnssec-trigger-hook.sh.in %build %configure --with-keydir=/etc/dnssec-trigger %{__make} %{?_smp_mflags} -# Fixup the name to not include "Panel" in the menu item -sed -i "s/ Panel//" dnssec-trigger-panel.desktop %install rm -rf %{buildroot} @@ -44,7 +47,9 @@ install -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}d-keygen.service install -m 0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/%{name}/ desktop-file-install --dir=%{buildroot}%{_datadir}/applications dnssec-trigger-panel.desktop -sed -i "s/^dnssec-trigger-control/\/usr\/sbin\/dnssec-trigger-control/" %{buildroot}%{_sysconfdir}/NetworkManager/dispatcher.d/01-dnssec-trigger-hook + +# supress the panel name everywhere including the gnome3 panel at the bottom +ln -s dnssec-trigger-panel %{buildroot}%{_bindir}/dnssec-trigger %clean rm -rf ${RPM_BUILD_ROOT} @@ -60,6 +65,7 @@ rm -rf ${RPM_BUILD_ROOT} %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/%{name}/dnssec-trigger.conf %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/xdg/autostart/dnssec-trigger-panel.desktop %{_bindir}/dnssec-trigger-panel +%{_bindir}/dnssec-trigger %{_sbindir}/dnssec-trigger* %{_mandir}/*/* %attr(0755,root,root) %dir %{_datadir}/%{name} @@ -92,6 +98,9 @@ fi - Fix the systemd startup to require unbound - dnssec-triggerd no longer forks, giving systemd more control - Fire NM dispatcher in ExecStartPost of dnssec-triggerd.service +- Fix tcp80 entries in dnssec-triggerd.conf +- symlink dnssec-trigger-panel to dnssec-trigger to supress the + "-panel" in the applet name shown in gnome3 * Wed Feb 22 2012 Paul Wouters - 0.10-2 - The NM hook was not modified at the right time during build