rpms/bash-completion/devel bash-completion.spec,1.41,1.42

[Ville Skyttä]

Author: scop

Update of /cvs/pkgs/rpms/bash-completion/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14120

Modified Files:
	bash-completion.spec 
Log Message:
* Sun Sep 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.0-5
- Use svn completion from subversion instead of ours if available (#496456).



Index: bash-completion.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bash-completion/devel/bash-completion.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -p -r1.41 -r1.42
--- bash-completion.spec	24 Jul 2009 17:52:31 -0000	1.41
+++ bash-completion.spec	20 Sep 2009 18:44:04 -0000	1.42
@@ -1,6 +1,6 @@
 Name:           bash-completion
 Version:        1.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Summary:        Programmable completion for Bash
 
@@ -224,7 +224,11 @@ rm -rf $RPM_BUILD_ROOT
 %do_triggerun snownews
 
 %triggerin -- subversion
-%do_triggerin _subversion
+if [ -e %{_sysconfdir}/bash_completion.d/subversion ] ; then
+    rm -f %{_sysconfdir}/bash_completion.d/_subversion || :
+elif [ ! -e %{_sysconfdir}/bash_completion.d/_subversion ] ; then
+    ln -s %{_datadir}/%{name}/_subversion %{_sysconfdir}/bash_completion.d || :
+fi
 %triggerun -- subversion
 %do_triggerun _subversion
 
@@ -264,6 +268,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Sep 20 2009 Ville Skyttä <ville.skytta at iki.fi> - 1:1.0-5
+- Use svn completion from subversion instead of ours if available (#496456).
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:1.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild