From daf672ab32f5cc7382e7a7739387e118b524d842 Mon Sep 17 00:00:00 2001 From: Ville Skyttä Date: Feb 12 2006 15:48:26 +0000 Subject: - Revert back to expanded triggers, rpmbuild < 4.4 doesn't like the macroized syntax. --- diff --git a/bash-completion.spec b/bash-completion.spec index 5f5c55f..214d360 100644 --- a/bash-completion.spec +++ b/bash-completion.spec @@ -1,6 +1,6 @@ Name: bash-completion Version: 20050721 -Release: 4%{?dist} +Release: 4%{?dist}.1 Summary: Programmable completion for Bash Group: System Environment/Shells @@ -58,34 +58,138 @@ cd - rm -rf $RPM_BUILD_ROOT -%define bashcomp_trigger() \ -%triggerin -- %1\ -if [ ! -e %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\ - ln -s %{_datadir}/%{name}/%{?2}%{!?2:%1} %{_sysconfdir}/bash_completion.d\ -fi\ -%triggerun -- %1\ -[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1}\ -%{nil} - -%bashcomp_trigger bittorrent -%bashcomp_trigger cksfv -%bashcomp_trigger clisp -%bashcomp_trigger freeciv -%bashcomp_trigger gcc-gnat gnatmake -%bashcomp_trigger gkrellm -%bashcomp_trigger mailman -%bashcomp_trigger mcrypt -%bashcomp_trigger mock -%bashcomp_trigger mtx -%bashcomp_trigger plague-client -%bashcomp_trigger ruby-ri ri -%bashcomp_trigger sbcl -%bashcomp_trigger snownews -%bashcomp_trigger subversion -%bashcomp_trigger unace -%bashcomp_trigger unixODBC isql -%bashcomp_trigger unrar -%bashcomp_trigger yum-utils repomanage +%triggerin -- bittorrent +if [ ! -e %{_sysconfdir}/bash_completion.d/bittorrent ] ; then + ln -s %{_datadir}/%{name}/bittorrent %{_sysconfdir}/bash_completion.d +fi +%triggerun -- bittorrent +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/bittorrent + +%triggerin -- cksfv +if [ ! -e %{_sysconfdir}/bash_completion.d/cksfv ] ; then + ln -s %{_datadir}/%{name}/cksfv %{_sysconfdir}/bash_completion.d +fi +%triggerun -- cksfv +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/cksfv + +%triggerin -- clisp +if [ ! -e %{_sysconfdir}/bash_completion.d/clisp ] ; then + ln -s %{_datadir}/%{name}/clisp %{_sysconfdir}/bash_completion.d +fi +%triggerun -- clisp +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/clisp + +%triggerin -- freeciv +if [ ! -e %{_sysconfdir}/bash_completion.d/freeciv ] ; then + ln -s %{_datadir}/%{name}/freeciv %{_sysconfdir}/bash_completion.d +fi +%triggerun -- freeciv +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/freeciv + +%triggerin -- gcc-gnat +if [ ! -e %{_sysconfdir}/bash_completion.d/gnatmake ] ; then + ln -s %{_datadir}/%{name}/gnatmake %{_sysconfdir}/bash_completion.d +fi +%triggerun -- gcc-gnat +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gnatmake + +%triggerin -- gkrellm +if [ ! -e %{_sysconfdir}/bash_completion.d/gkrellm ] ; then + ln -s %{_datadir}/%{name}/gkrellm %{_sysconfdir}/bash_completion.d +fi +%triggerun -- gkrellm +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/gkrellm + +%triggerin -- mailman +if [ ! -e %{_sysconfdir}/bash_completion.d/mailman ] ; then + ln -s %{_datadir}/%{name}/mailman %{_sysconfdir}/bash_completion.d +fi +%triggerun -- mailman +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mailman + +%triggerin -- mcrypt +if [ ! -e %{_sysconfdir}/bash_completion.d/mcrypt ] ; then + ln -s %{_datadir}/%{name}/mcrypt %{_sysconfdir}/bash_completion.d +fi +%triggerun -- mcrypt +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mcrypt + +%triggerin -- mock +if [ ! -e %{_sysconfdir}/bash_completion.d/mock ] ; then + ln -s %{_datadir}/%{name}/mock %{_sysconfdir}/bash_completion.d +fi +%triggerun -- mock +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mock + +%triggerin -- mtx +if [ ! -e %{_sysconfdir}/bash_completion.d/mtx ] ; then + ln -s %{_datadir}/%{name}/mtx %{_sysconfdir}/bash_completion.d +fi +%triggerun -- mtx +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/mtx + +%triggerin -- plague-client +if [ ! -e %{_sysconfdir}/bash_completion.d/plague-client ] ; then + ln -s %{_datadir}/%{name}/plague-client %{_sysconfdir}/bash_completion.d +fi +%triggerun -- plague-client +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/plague-client + +%triggerin -- ruby-ri +if [ ! -e %{_sysconfdir}/bash_completion.d/ri ] ; then + ln -s %{_datadir}/%{name}/ri %{_sysconfdir}/bash_completion.d +fi +%triggerun -- ruby-ri +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/ri + +%triggerin -- sbcl +if [ ! -e %{_sysconfdir}/bash_completion.d/sbcl ] ; then + ln -s %{_datadir}/%{name}/sbcl %{_sysconfdir}/bash_completion.d +fi +%triggerun -- sbcl +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/sbcl + +%triggerin -- snownews +if [ ! -e %{_sysconfdir}/bash_completion.d/snownews ] ; then + ln -s %{_datadir}/%{name}/snownews %{_sysconfdir}/bash_completion.d +fi +%triggerun -- snownews +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/snownews + +%triggerin -- subversion +if [ ! -e %{_sysconfdir}/bash_completion.d/subversion ] ; then + ln -s %{_datadir}/%{name}/subversion %{_sysconfdir}/bash_completion.d +fi +%triggerun -- subversion +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/subversion + +%triggerin -- unace +if [ ! -e %{_sysconfdir}/bash_completion.d/unace ] ; then + ln -s %{_datadir}/%{name}/unace %{_sysconfdir}/bash_completion.d +fi +%triggerun -- unace +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unace + +%triggerin -- unixODBC +if [ ! -e %{_sysconfdir}/bash_completion.d/isql ] ; then + ln -s %{_datadir}/%{name}/isql %{_sysconfdir}/bash_completion.d +fi +%triggerun -- unixODBC +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/isql + +%triggerin -- unrar +if [ ! -e %{_sysconfdir}/bash_completion.d/unrar ] ; then + ln -s %{_datadir}/%{name}/unrar %{_sysconfdir}/bash_completion.d +fi +%triggerun -- unrar +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/unrar + +%triggerin -- yum-utils +if [ ! -e %{_sysconfdir}/bash_completion.d/repomanage ] ; then + ln -s %{_datadir}/%{name}/repomanage %{_sysconfdir}/bash_completion.d +fi +%triggerun -- yum-utils +[ $2 -gt 0 ] || rm -f %{_sysconfdir}/bash_completion.d/repomanage %files -f %{name}-ghosts.list @@ -98,6 +202,10 @@ fi\ %changelog +* Sun Feb 12 2006 Ville Skyttä - 20050721-4.1 +- Revert back to expanded triggers, rpmbuild < 4.4 doesn't like the + macroized syntax. + * Wed Feb 8 2006 Ville Skyttä - 20050721-4 - Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod). - Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.