X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bash-completion.spec;h=9558fc71a43addba332ad6c6561092aaa2edae9f;hb=f4f5d91d887edce672d3a1ba596ab83e63593fa3;hp=efef84357cdaab95131522510a81e1c7099333c1;hpb=43469ebcf83fe235afa91f785a15098ec7293fc8;p=packages%2Fbash-completion.git

diff --git a/bash-completion.spec b/bash-completion.spec
index efef843..9558fc7 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,18 +1,22 @@
 Summary:	bash-completion offers programmable completion for bash
 Summary(pl):	Programowalne uzupe³nianie nazw dla basha
 Name:		bash-completion
-Version:	20050121
+Version:	20060301
 Release:	1
 License:	GPL
 Group:		Applications/Shells
 Source0:	http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-# Source0-md5:	fafeed562b01a8dee079eb851579f2d2
-Source1:	%{name}.cron
-Patch0:		%{name}-FHS.patch
+# Source0-md5:	ed95a89f57357a42b8e4eb95487bf9d0
+Source1:	%{name}-poldek.sh
+Source2:	%{name}.sh
+Patch0:		%{name}-rpm-cache.patch
+Patch1:		%{name}-rpm-arch.patch
+Patch2:		%{name}-FHS.patch
 URL:		http://www.caliban.org/bash/
 Requires(triggerpostun):	sed >= 4.0
-BuildArch:	noarch
 Requires:	bash >= 2.05a-3
+Obsoletes:	bash-completion-rpm-cache
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -24,68 +28,47 @@ bash-completion jest kolekcj
 wbudowanych rozszerzeniach basha 2.04 lub pó¼niejszego umo¿liwiaj±cego
 kompletowanie parametrów linii poleceñ.
 
-%package rpm-cache
-Summary:	Cache result of rpm -qa
-Summary(pl):	Buforowanie wyniku rpm -qa
-Group:		Applications/Shells
-
-%description rpm-cache
-This package contains cached version of rpm -qa, which is used for rpm
-completion for faster completion.
-
-%description rpm-cache -l pl
-Ten pakiet zawiera skrypt buforuj±cy wynik rpm -qa w celu szybszego
-dope³niania linii poleceñ programu rpm.
-
 %prep
 %setup -q -n bash_completion
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/cron.daily,/etc/shrc.d,/var/cache}
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/shrc.d,/var/cache}
 
 install bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
 install contrib/*	$RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
-
-install %{SOURCE1} $RPM_BUILD_ROOT/etc/cron.daily/rpmpkgs
 > $RPM_BUILD_ROOT/var/cache/rpmpkgs.txt
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/poldek
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d
 
-# subversion comes with much better completion file
-rm $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/subversion
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-cat <<'EOF' > %{name}.sh
-# check for bash
-[ -z "$BASH_VERSION" ] && return
+%post
+if [ ! -f /var/cache/rpmpkgs.txt ]; then
+	touch /var/cache/rpmpkgs.txt
+	chown root:wheel /var/cache/rpmpkgs.txt
+	chmod 664 /var/cache/rpmpkgs.txt
 
-# check for correct version of bash
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ "$bmajor" -eq 2 -a "$bminor" '>' 04 ] || [ "$bmajor" -gt 2 ]; then
-	if [ "$PS1" ]; then # interactive shell
-		# Source completion code
-		. %{_sysconfdir}/bash_completion
+	# rpm binary check for vservers
+	if [ -x /bin/rpm ]; then
+		export LC_ALL=C
+		rpm -qa --qf '%%{name}-%%{version}-%%{release}.%%{arch}.rpm\n' 2>&1 | sort > /var/cache/rpmpkgs.txt
 	fi
 fi
-unset bash bminor bmajor
-EOF
-
-install %{name}.sh $RPM_BUILD_ROOT/etc/shrc.d
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%triggerpostun -- %{name} < 20050112-1
-# legacy clean-up
+%triggerpostun -- %{name} < 20050721-3.9
 sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc
+chown root:wheel /var/cache/rpmpkgs.txt
+chmod 664 /var/cache/rpmpkgs.txt
 
 %files
 %defattr(644,root,root,755)
 %doc README Changelog BUGS
 %{_sysconfdir}/bash_completion
-%{_sysconfdir}/bash_completion.d/
+%{_sysconfdir}/bash_completion.d
 %attr(755,root,root) /etc/shrc.d/%{name}.sh
-
-%files rpm-cache
-%defattr(644,root,root,755)
-%attr(755,root,root) /etc/cron.daily/*
-%ghost /var/cache/rpmpkgs.txt
+%ghost %attr(664,root,wheel) /var/cache/rpmpkgs.txt