rpms/bash-completion/FC-4 bash-completion.profile, 1.2, 1.3 bash-completion.spec, 1.11, 1.12

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/bash-completion/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11248

Modified Files:
	bash-completion.profile bash-completion.spec 
Log Message:
* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.

* Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi>
- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).

* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-3
- Patch to hopefully fix quoting problems with bash 3.1 (#177056).

* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-2
- Work around potential login problem in profile.d snippet (#174355).

* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi>
- Don't mark the main source file as %%config.
- Make profile.d snippet non-executable (#35714) and noreplace.
- Add mock, plague-client and repomanage completion.
- Allow "cvs stat" completion.
- Macroize trigger creation.



Index: bash-completion.profile
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.profile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bash-completion.profile	27 Nov 2004 15:44:30 -0000	1.2
+++ bash-completion.profile	11 Feb 2006 09:57:44 -0000	1.3
@@ -1,5 +1,8 @@
-# check for bash
-[ -z "$BASH_VERSION" ] && return
+# check for bash (and that we haven't already been sourced, see eg. #174355)
+[ -z "$BASH_VERSION" -o -n "$BASH_COMPLETION" ] && return
+
+# skip non-interactive shells
+[[ $- == *i* ]] || return
 
 # check for correct version of bash
 bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}


Index: bash-completion.spec
===================================================================
RCS file: /cvs/extras/rpms/bash-completion/FC-4/bash-completion.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- bash-completion.spec	22 Jul 2005 06:51:53 -0000	1.11
+++ bash-completion.spec	11 Feb 2006 09:57:44 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        20050721
-Release:        1%{?dist}
+Release:        4%{?dist}
 Summary:        Programmable completion for Bash
 
 Group:          System Environment/Shells
@@ -8,6 +8,12 @@
 URL:            http://www.caliban.org/bash/
 Source0:        http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
 Source1:        %{name}.profile
+Source2:        %{name}-mock
+Source3:        %{name}-repomanage
+Source4:        %{name}-plague-client
+Patch0:         %{name}-20050721-cvs-stat.patch
+Patch1:         %{name}-20050721-bash31quoting.patch
+Patch2:         %{name}-20050721-mtr.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
@@ -20,6 +26,12 @@
 
 %prep
 %setup -q -n bash_completion
+%patch0
+%patch1 -p1
+%patch2
+install -pm 644 %{SOURCE2} contrib/mock
+install -pm 644 %{SOURCE3} contrib/plague-client
+install -pm 644 %{SOURCE3} contrib/repomanage
 
 
 %build
@@ -46,87 +58,66 @@
 rm -rf $RPM_BUILD_ROOT
 
 
-%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 -- 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 -- 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 -- 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 -- 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 -- 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
+%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
 
 
 %files -f %{name}-ghosts.list
-%defattr(0644,root,root,0755)
+%defattr(-,root,root,-)
 %doc BUGS Changelog COPYING README
-%config %{_sysconfdir}/bash_completion
-%attr(0755,root,root) %config %{_sysconfdir}/profile.d/*
-%{_datadir}/%{name}
-%dir %{_sysconfdir}/bash_completion.d
+%config(noreplace) %{_sysconfdir}/profile.d/bash_completion.sh
+%{_sysconfdir}/bash_completion
+%dir %{_sysconfdir}/bash_completion.d/
+%{_datadir}/%{name}/
 
 
 %changelog
+* Wed Feb  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-4
+- Don't source ourselves in non-interactive shells (#180419, Behdad Esfahbod).
+- Trigger-install snippets for clisp, gnatmake, isql, ri, sbcl, and snownews.
+
+* Sat Feb  4 2006 Ville Skyttä <ville.skytta at iki.fi>
+- Add mtr(8) completion using known hosts (#179918, Yanko Kaneti).
+
+* Sun Jan  8 2006 Ville Skyttä <ville.skytta at iki.fi> - 20050721-3
+- Patch to hopefully fix quoting problems with bash 3.1 (#177056).
+
+* Mon Nov 28 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-2
+- Work around potential login problem in profile.d snippet (#174355).
+
+* Sat Nov 26 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Don't mark the main source file as %%config.
+- Make profile.d snippet non-executable (#35714) and noreplace.
+- Add mock, plague-client and repomanage completion.
+- Allow "cvs stat" completion.
+- Macroize trigger creation.
+
 * Fri Jul 22 2005 Ville Skyttä <ville.skytta at iki.fi> - 20050721-1
 - 20050721.