X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=bash-completion.spec;h=8da9a1b9957e7c425d6649e52753a65ccf1c2395;hb=8fe2d40464015803db2d0660979a4b6c6cd36555;hp=c578c6fe03e8f87e11f0780cdcf96e71cdf5f862;hpb=f4acb17af709884def32e89532b148528794b487;p=packages%2Fbash-completion.git

diff --git a/bash-completion.spec b/bash-completion.spec
index c578c6f..8da9a1b 100644
--- a/bash-completion.spec
+++ b/bash-completion.spec
@@ -1,70 +1,438 @@
+# vim:ft=spec
+# TODO
+# - bittorrent complete doesn't actually handle our prognames
+# - use mkinitrd and update for geninitrd
+# - can we have duplicate trigger on pwdutils pkg? merge files?
+# - fix vim not to mark this file as bash
+%define		snap	20090916
+%define		rel		0.3
 Summary:	bash-completion offers programmable completion for bash
-Summary(pl):	Programowalne uzupe³nianie nazw dla basha
+Summary(pl.UTF-8):	Programowalne uzupełnianie nazw dla basha
 Name:		bash-completion
-Version:	20030721
-Release:	1
+Version:	1.0
+Release:	3.%{snap}.%{rel}
+Epoch:		1
 License:	GPL
 Group:		Applications/Shells
-Source0:	http://www.caliban.org/files/bash/%{name}-%{version}.tar.bz2
-# Source0-md5:	1776b63e25a16e36fb63c9cd215ae343
-URL:		http://www.caliban.org/bash/
-Requires(post,preun):	bash
-Requires(post):	grep
-Requires(post):	textutils
-Requires(postun):	fileutils
-Requires(postun):	sed
-BuildArch:	noarch
+#Source0:	http://bash-completion.alioth.debian.org/files/%{name}-%{version}.tar.gz
+Source0:	%{name}.tar.bz2
+# Source0-md5:	83271aa683e1cc1ebd27fd28e300d39e
+Source1:	%{name}-poldek.sh
+Source2:	%{name}.sh
+Patch0:		%{name}-rpm-cache.patch
+Patch1:		%{name}-mplayer.patch
+Patch2:		%{name}-service.patch
+Patch3:		%{name}-psheader.patch
+URL:		http://bash-completion.alioth.debian.org/
+Requires(triggerpostun):	sed >= 4.0
 Requires:	bash >= 2.05a-3
+Obsoletes:	bash-completion-rpm-cache
+Conflicts:	rpm < 4.4.9-44
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 bash-completion is a collection of shell functions that take advantage
 of the programmable completion feature of bash 2.04 and later.
 
-%description -l pl
-bash-completion jest kolekcj± funkcji shella, które opieraj± siê na
-wbudowanych rozszerzeniach basha 2.04 lub pó¼niejszego umo¿liwiaj±cego
-kompletowanie parametrów linii poleceñ.
+%description -l pl.UTF-8
+bash-completion jest kolekcją funkcji shella, które opierają się na
+wbudowanych rozszerzeniach basha 2.04 lub późniejszego umożliwiającego
+kompletowanie parametrów linii poleceń.
 
 %prep
-%setup -q -n bash_completion
+%setup -q -n %{name}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+cp -a %{SOURCE1} contrib/poldek
+
+# this is dir
+rm -r doc/html~
+
+# cleanup backups after patching
+find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f
+
+# packaged by subversion.spec
+rm contrib/_subversion
+# soon packaged by yum, but not yet
+mv contrib/{_,}yum
+
+# No package matches '*/apache2ctl'
+rm contrib/apache2ctl
+
+# No PLD package or no such binary to complete on
+rm contrib/{harbour,larch,lisp,modules,monodevelop,p4,cowsay,cpan2dist}
+rm contrib/{cfengine,mkinitrd,repomanage,rpmcheck}
+rm contrib/{kldload,pkg_install,portupgrade,pkgtools} # FreeBSD Stuff
+rm contrib/{apt-build,dselect,mock,reportbug,sysv-rc,update-alternatives}
+
+# no package to hook to
+rm contrib/configure
+
+# split freeciv-client,freeciv-server as we have these in separate packages
+mv contrib/freeciv .
+%{__sed} -ne '1,/complete -F _civserver civserver/p' freeciv > contrib/freeciv-server
+%{__sed} -ne '1,3p;/civclient/,$p' freeciv > contrib/freeciv-client
+if [ $(md5sum freeciv | awk '{print $1}') != "2d3df0051726f87c11795b7292c332fc" ]; then
+	: check that split out contrib/freeciv-{client,server} are ok and update md5sum
+	exit 1
+fi
+
+# split munin as we have subpackage for node
+mv contrib/munin-node .
+%{__sed} -ne '1,/complete -F _munin-update munin-update/p' munin-node > contrib/munin
+%{__sed} -ne '1,3p;/munin-node-configure/,$p' munin-node > contrib/munin-node
+if [ $(md5sum munin-node | awk '{print $1}') != "05a418afed08983a852145e472d5b2e9" ]; then
+	: check that split out contrib/munin{,-node} are ok and update md5sum
+	exit 1
+fi
+
+# we have lastlog in sysvinit package
+mv contrib/shadow .
+%{__sed} -ne '1,/complete -F _faillog faillog/p' shadow > contrib/shadow
+%{__sed} -ne '1,3p;/lastlog/,$p' shadow > contrib/sysvinit
+if [ $(md5sum shadow | awk '{print $1}') != "4dfef3151921fd9644566a3244038f85" ]; then
+	: check that split out contrib/{shadow,sysvinit} are ok and update md5sum
+	exit 1
+fi
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/shrc.d,%{_datadir}/%{name}}
+
+T=$(grep -c '^%%bashcomp_trigger' %{_specdir}/%{name}.spec)
+F=$(grep -c '^%%{_datadir}/%%{name}/' %{_specdir}/%{name}.spec)
+if [ $T != $F ]; then
+	check_triggers() {
+		echo >&2 "ERROR: triggers count and packaged files mismatch"
+		for f in $(awk '/^%%bashcomp_trigger/{print $3 ? $3 : $2}' %{_specdir}/%{name}.spec); do
+			A=$(awk -vf=$f '$0 == "%%{_datadir}/%%{name}/" f {print}' %{_specdir}/%{name}.spec)
+			if [ -z "$A" ]; then
+				echo >&2 "!! $f not listed in %%files"
+			fi
+		done
+		for f in $(awk -F/ '$0 ~ "^%%{_datadir}/%%{name}/"{print $NF}' %{_specdir}/%{name}.spec); do
+			A=$(awk -vf=$f '/^%%bashcomp_trigger/ && ($3 ? $3 : $2) == f' %{_specdir}/%{name}.spec)
+			if [ -z "$A" ]; then
+				echo >&2 "!! $f has no trigger"
+			fi
+		done
+	}
+	check_triggers
+	exit 1
+fi
+
+cp -a bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
+cp -a contrib/* $RPM_BUILD_ROOT%{_datadir}/%{name}
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/shrc.d
 
-install bash_completion $RPM_BUILD_ROOT%{_sysconfdir}
+# Take care of contrib files
+for a in contrib/*; do
+	f=${a##*/}
+	ln -s ../..%{_datadir}/%{name}/$f $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d
+	echo "%ghost %{_sysconfdir}/bash_completion.d/$f"
+done > %{name}-ghost.list
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post
-if ! grep -q '\[ -f '%{_sysconfdir}'/bash_completion \]' \
-	%{_sysconfdir}/bashrc 2>/dev/null; then
-		umask 022
-		cat <<'EOF' >> %{_sysconfdir}/bashrc
-# START bash completion -- do not remove this line
-bash=${BASH_VERSION%.*}; bmajor=${bash%.*}; bminor=${bash#*.}
-if [ "$PS1" ] && [ "$bmajor" -eq 2 ] && [ "$bminor" '>' 04 ] \
-	&& [ -f %{_sysconfdir}/bash_completion ]; then	# interactive shell
-	# Source completion code
-	. %{_sysconfdir}/bash_completion
+%triggerpostun -- %{name} < 20050721-3.9
+sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc
+
+%triggerpostun -- %{name} < 20081219-0.1
+# don't do anything on --downgrade
+if [ $1 -le 1 ]; then
+	exit 0
 fi
-unset bash bmajor bminor
-# END bash completion -- do not remove this line
-EOF
+# No rpm in vservers
+if [ ! -x /bin/rpm ]; then
+	exit 0
 fi
 
-%postun
-if [ "$1" -eq 0 ]; then
-	umask 022
-	sed -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc \
-		> /etc/bashrc.tmp
-	mv -f /etc/bashrc.tmp /etc/bashrc
-fi
+# This ugly trigger is here because we package same pathnames as ghost
+# meaning the files will lay around from previous package version.
+
+# get files which are ghost for us
+files=$(rpm -ql %{name}-%{version}-%{release} | grep %{_sysconfdir}/bash_completion.d/)
+
+# this is to get old pkg NVR, actually gives list of files that are
+# packaged by other versions than this installed one, which is ok even for
+# multiple bash-completion pkgs being installed.
+oldpkg=$(rpm -qf $(echo "$files") 2>/dev/null | grep -v 'is not' | sort -u | grep -v %{name}-%{version}-%{release})
+for a in $(rpm -ql $oldpkg | grep %{_sysconfdir}/bash_completion.d/); do
+	# remove files from old package (which are ghost in new pkg),
+	# if not already converted to symlink
+	[ -L $a ] || rm -f $a
+done
+
+# Usage: bashcomp_trigger PACKAGENAME [SCRIPTNAME]
+%define bashcomp_trigger() \
+%triggerin -- %1\
+if [ ! -L %{_sysconfdir}/bash_completion.d/%{?2}%{!?2:%1} ] ; then\
+	ln -sf ../..%{_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 ant
+%bashcomp_trigger apt
+%bashcomp_trigger aptitude
+%bashcomp_trigger aspell
+%bashcomp_trigger autorpm
+%bashcomp_trigger bash bash-builtins
+%bashcomp_trigger bind-utils
+%bashcomp_trigger bitkeeper
+%bashcomp_trigger BitTorrent bittorrent
+%bashcomp_trigger bluez bluez-utils
+%bashcomp_trigger bridge-utils brctl
+%bashcomp_trigger bzip2
+%bashcomp_trigger cdrkit,cdrtools wodim
+%bashcomp_trigger cdrtools-mkisofs,dvdrtools-mkisofs genisoimage
+%bashcomp_trigger chkconfig
+%bashcomp_trigger cksfv
+%bashcomp_trigger clisp
+%bashcomp_trigger coreutils dd
+%bashcomp_trigger cpio
+%bashcomp_trigger cups-clients cups
+%bashcomp_trigger cvsnt,cvs cvs
+%bashcomp_trigger dhcp-client dhclient
+%bashcomp_trigger dict
+%bashcomp_trigger dpkg
+%bashcomp_trigger dsniff
+%bashcomp_trigger expat xmlwf
+%bashcomp_trigger findutils
+%bashcomp_trigger freeciv-client
+%bashcomp_trigger freeciv-server
+%bashcomp_trigger gcc-ada gnatmake
+%bashcomp_trigger gcc,gcc-java,fortran,gcc-c++ gcc
+%bashcomp_trigger gcl
+%bashcomp_trigger gdb
+%bashcomp_trigger gkrellm
+%bashcomp_trigger glibc iconv
+%bashcomp_trigger glibc-misc getent
+%bashcomp_trigger gnupg2 gpg2
+%bashcomp_trigger gnupg gpg
+%bashcomp_trigger gzip
+%bashcomp_trigger heimdal
+%bashcomp_trigger ImageMagick imagemagick
+%bashcomp_trigger info,pinfo info
+%bashcomp_trigger ipmitool
+%bashcomp_trigger iptables
+%bashcomp_trigger jar
+%bashcomp_trigger java-sun-jre,java-gcj-compat java
+%bashcomp_trigger kdelibs dcop
+%bashcomp_trigger ldapvi
+%bashcomp_trigger lftp
+%bashcomp_trigger libxml2-progs xmllint
+%bashcomp_trigger lilo
+%bashcomp_trigger lilypond
+%bashcomp_trigger links
+%bashcomp_trigger lvm2 lvm
+%bashcomp_trigger lzma,xz lzma
+%bashcomp_trigger lzop
+%bashcomp_trigger mailman
+%bashcomp_trigger make
+%bashcomp_trigger man
+%bashcomp_trigger mc
+%bashcomp_trigger mcrypt
+%bashcomp_trigger mdadm
+%bashcomp_trigger minicom
+%bashcomp_trigger mplayer
+%bashcomp_trigger mtx
+%bashcomp_trigger multisync-msynctool,msynctool msynctool
+%bashcomp_trigger munin
+%bashcomp_trigger munin-node
+%bashcomp_trigger mutt
+%bashcomp_trigger mysql-client mysqladmin
+%bashcomp_trigger ncftp
+%bashcomp_trigger net-tools
+%bashcomp_trigger nfs-utils rpcdebug
+%bashcomp_trigger ntp-client ntpdate
+%bashcomp_trigger openldap
+%bashcomp_trigger openssh-clients ssh
+%bashcomp_trigger openssl-tools openssl
+%bashcomp_trigger pcmciautils cardctl
+%bashcomp_trigger perl-base perl
+%bashcomp_trigger pine
+%bashcomp_trigger pkgconfig pkg-config
+%bashcomp_trigger poldek
+%bashcomp_trigger postfix
+%bashcomp_trigger postgresql-clients postgresql
+%bashcomp_trigger povray
+%bashcomp_trigger procps sysctl
+%bashcomp_trigger pwdutils shadow
+%bashcomp_trigger pwdutils,shadow-extras chsh
+%bashcomp_trigger python
+%bashcomp_trigger qemu
+%bashcomp_trigger QtDBus qdbus
+%bashcomp_trigger quota-tools
+%bashcomp_trigger rcs
+%bashcomp_trigger rdesktop
+%bashcomp_trigger resolvconf
+%bashcomp_trigger rpm
+%bashcomp_trigger rrdtool
+%bashcomp_trigger rsync
+%bashcomp_trigger ruby-modules ri
+%bashcomp_trigger samba-client samba
+%bashcomp_trigger sbcl
+%bashcomp_trigger screen
+%bashcomp_trigger sitecopy
+%bashcomp_trigger smartmontools,smartsuite smartctl
+%bashcomp_trigger snownews
+%bashcomp_trigger strace
+%bashcomp_trigger svk
+%bashcomp_trigger tar
+%bashcomp_trigger tcpdump
+%bashcomp_trigger tightvnc vncviewer
+%bashcomp_trigger unace
+%bashcomp_trigger unixODBC isql
+%bashcomp_trigger unrar
+%bashcomp_trigger upstart-SysVinit,SysVinit sysvinit
+%bashcomp_trigger vpnc
+%bashcomp_trigger wireless-tools
+%bashcomp_trigger wvdial
+%bashcomp_trigger X11,xorg-app-xhost xhost
+%bashcomp_trigger X11,xorg-app-xrandr xrandr
+%bashcomp_trigger xen xm
+%bashcomp_trigger xmms
+%bashcomp_trigger xz
+%bashcomp_trigger yp-tools
+%bashcomp_trigger yum
+%bashcomp_trigger yum-arch
 
-%files
+%files -f %{name}-ghost.list
 %defattr(644,root,root,755)
-%doc README Changelog contrib BUGS
+%doc README TODO
+/etc/shrc.d/%{name}.sh
 %{_sysconfdir}/bash_completion
 %dir %{_sysconfdir}/bash_completion.d
+%dir %{_datadir}/%{name}
+# we list all files to be sure we have all of them handled by triggers
+%{_datadir}/%{name}/ant
+%{_datadir}/%{name}/apt
+%{_datadir}/%{name}/aptitude
+%{_datadir}/%{name}/aspell
+%{_datadir}/%{name}/autorpm
+%{_datadir}/%{name}/bash-builtins
+%{_datadir}/%{name}/bind-utils
+%{_datadir}/%{name}/bitkeeper
+%{_datadir}/%{name}/bittorrent
+%{_datadir}/%{name}/bluez-utils
+%{_datadir}/%{name}/brctl
+%{_datadir}/%{name}/bzip2
+%{_datadir}/%{name}/cardctl
+%{_datadir}/%{name}/chkconfig
+%{_datadir}/%{name}/chsh
+%{_datadir}/%{name}/cksfv
+%{_datadir}/%{name}/clisp
+%{_datadir}/%{name}/cpio
+%{_datadir}/%{name}/cups
+%{_datadir}/%{name}/cvs
+%{_datadir}/%{name}/dcop
+%{_datadir}/%{name}/dd
+%{_datadir}/%{name}/dhclient
+%{_datadir}/%{name}/dict
+%{_datadir}/%{name}/dpkg
+%{_datadir}/%{name}/dsniff
+%{_datadir}/%{name}/findutils
+%{_datadir}/%{name}/freeciv-client
+%{_datadir}/%{name}/freeciv-server
+%{_datadir}/%{name}/gcc
+%{_datadir}/%{name}/gcl
+%{_datadir}/%{name}/gdb
+%{_datadir}/%{name}/genisoimage
+%{_datadir}/%{name}/getent
+%{_datadir}/%{name}/gkrellm
+%{_datadir}/%{name}/gnatmake
+%{_datadir}/%{name}/gpg
+%{_datadir}/%{name}/gpg2
+%{_datadir}/%{name}/gzip
+%{_datadir}/%{name}/heimdal
+%{_datadir}/%{name}/iconv
+%{_datadir}/%{name}/imagemagick
+%{_datadir}/%{name}/info
+%{_datadir}/%{name}/ipmitool
+%{_datadir}/%{name}/iptables
+%{_datadir}/%{name}/isql
+%{_datadir}/%{name}/jar
+%{_datadir}/%{name}/java
+%{_datadir}/%{name}/ldapvi
+%{_datadir}/%{name}/lftp
+%{_datadir}/%{name}/lilo
+%{_datadir}/%{name}/lilypond
+%{_datadir}/%{name}/links
+%{_datadir}/%{name}/lvm
+%{_datadir}/%{name}/lzma
+%{_datadir}/%{name}/lzop
+%{_datadir}/%{name}/mailman
+%{_datadir}/%{name}/make
+%{_datadir}/%{name}/man
+%{_datadir}/%{name}/mc
+%{_datadir}/%{name}/mcrypt
+%{_datadir}/%{name}/mdadm
+%{_datadir}/%{name}/minicom
+%{_datadir}/%{name}/mplayer
+%{_datadir}/%{name}/msynctool
+%{_datadir}/%{name}/mtx
+%{_datadir}/%{name}/munin
+%{_datadir}/%{name}/munin-node
+%{_datadir}/%{name}/mutt
+%{_datadir}/%{name}/mysqladmin
+%{_datadir}/%{name}/ncftp
+%{_datadir}/%{name}/net-tools
+%{_datadir}/%{name}/ntpdate
+%{_datadir}/%{name}/openldap
+%{_datadir}/%{name}/openssl
+%{_datadir}/%{name}/perl
+%{_datadir}/%{name}/pine
+%{_datadir}/%{name}/pkg-config
+%{_datadir}/%{name}/poldek
+%{_datadir}/%{name}/postfix
+%{_datadir}/%{name}/postgresql
+%{_datadir}/%{name}/povray
+%{_datadir}/%{name}/python
+%{_datadir}/%{name}/qdbus
+%{_datadir}/%{name}/qemu
+%{_datadir}/%{name}/quota-tools
+%{_datadir}/%{name}/rcs
+%{_datadir}/%{name}/rdesktop
+%{_datadir}/%{name}/resolvconf
+%{_datadir}/%{name}/ri
+%{_datadir}/%{name}/rpcdebug
+%{_datadir}/%{name}/rpm
+%{_datadir}/%{name}/rrdtool
+%{_datadir}/%{name}/rsync
+%{_datadir}/%{name}/samba
+%{_datadir}/%{name}/sbcl
+%{_datadir}/%{name}/screen
+%{_datadir}/%{name}/shadow
+%{_datadir}/%{name}/sitecopy
+%{_datadir}/%{name}/smartctl
+%{_datadir}/%{name}/snownews
+%{_datadir}/%{name}/ssh
+%{_datadir}/%{name}/strace
+%{_datadir}/%{name}/svk
+%{_datadir}/%{name}/sysctl
+%{_datadir}/%{name}/sysvinit
+%{_datadir}/%{name}/tar
+%{_datadir}/%{name}/tcpdump
+%{_datadir}/%{name}/unace
+%{_datadir}/%{name}/unrar
+%{_datadir}/%{name}/vncviewer
+%{_datadir}/%{name}/vpnc
+%{_datadir}/%{name}/wireless-tools
+%{_datadir}/%{name}/wodim
+%{_datadir}/%{name}/wvdial
+%{_datadir}/%{name}/xhost
+%{_datadir}/%{name}/xm
+%{_datadir}/%{name}/xmllint
+%{_datadir}/%{name}/xmlwf
+%{_datadir}/%{name}/xmms
+%{_datadir}/%{name}/xrandr
+%{_datadir}/%{name}/xz
+%{_datadir}/%{name}/yp-tools
+%{_datadir}/%{name}/yum
+%{_datadir}/%{name}/yum-arch