Author: glen Date: Fri Apr 3 14:37:01 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - merged on demand install of completions from DEVEL; rel 2
---- Files affected: SPECS: bash-completion.spec (1.142 -> 1.143) ---- Diffs: ================================================================ Index: SPECS/bash-completion.spec diff -u SPECS/bash-completion.spec:1.142 SPECS/bash-completion.spec:1.143 --- SPECS/bash-completion.spec:1.142 Thu Apr 2 19:05:25 2009 +++ SPECS/bash-completion.spec Fri Apr 3 16:36:56 2009 @@ -1,9 +1,13 @@ # $Revision$, $Date$ +# TODO +# - bittorrent complete doesn't actually handle our prognames +# - handle multiple package links (freeciv case) +# - handle upgrade path to symlinks (see notes in install section) Summary: bash-completion offers programmable completion for bash Summary(pl.UTF-8): Programowalne uzupełnianie nazw dla basha Name: bash-completion Version: 20081219 -Release: 1 +Release: 2 License: GPL Group: Applications/Shells Source0: ftp://distfiles.gentoo.org/pub/gentoo/distfiles/%{name}-%{version}.tar.bz2 @@ -33,27 +37,162 @@ %setup -q -n %{name} %patch0 -p1 %patch1 -p1 +cp -a %{SOURCE1} contrib/poldek + +# cleanup backups after patching +find '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f + +# packaged by subversion.spec +rm contrib/_subversion + +# 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} %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{%{_sysconfdir}/bash_completion.d,/etc/shrc.d} -install bash_completion $RPM_BUILD_ROOT%{_sysconfdir} -install contrib/* $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d -install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/poldek +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 +# 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 %triggerpostun -- %{name} < 20050721-3.9 sed -i -e '/^# START bash completion/,/^# END bash completion/d' /etc/bashrc -%files +%triggerpostun -- %{name} < 20081219-0.1 +# don't do anything on --downgrade +if [ $1 -le 1 ]; then + exit 0 +fi +# No rpm in vservers +if [ ! -x /bin/rpm ]; then + exit 0 +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 bitkeeper +%bashcomp_trigger BitTorrent bittorrent +%bashcomp_trigger cksfv +%bashcomp_trigger clisp +%bashcomp_trigger dsniff +%bashcomp_trigger freeciv-client,freeciv-server freeciv +%bashcomp_trigger gcc-ada gnatmake +%bashcomp_trigger gcl +%bashcomp_trigger gkrellm +%bashcomp_trigger gnupg2 gpg2 +%bashcomp_trigger lilypond +%bashcomp_trigger mailman +%bashcomp_trigger mcrypt +%bashcomp_trigger mercurial hg +%bashcomp_trigger mtx +%bashcomp_trigger openssh-clients ssh +%bashcomp_trigger poldek +%bashcomp_trigger povray +%bashcomp_trigger QtDBus qdbus +%bashcomp_trigger ruby-modules ri +%bashcomp_trigger sbcl +%bashcomp_trigger sitecopy +%bashcomp_trigger snownews +%bashcomp_trigger svk +%bashcomp_trigger unace +%bashcomp_trigger unixODBC isql +%bashcomp_trigger unrar + +%files -f %{name}-ghost.list %defattr(644,root,root,755) %doc README TODO debian/changelog debian/copyright -%{_sysconfdir}/bash_completion -%{_sysconfdir}/bash_completion.d /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}/bitkeeper +%{_datadir}/%{name}/bittorrent +%{_datadir}/%{name}/cksfv +%{_datadir}/%{name}/clisp +%{_datadir}/%{name}/dsniff +%{_datadir}/%{name}/freeciv +%{_datadir}/%{name}/gcl +%{_datadir}/%{name}/gkrellm +%{_datadir}/%{name}/gnatmake +%{_datadir}/%{name}/gpg2 +%{_datadir}/%{name}/hg +%{_datadir}/%{name}/isql +%{_datadir}/%{name}/lilypond +%{_datadir}/%{name}/mailman +%{_datadir}/%{name}/mcrypt +%{_datadir}/%{name}/mtx +%{_datadir}/%{name}/poldek +%{_datadir}/%{name}/povray +%{_datadir}/%{name}/qdbus +%{_datadir}/%{name}/ri +%{_datadir}/%{name}/sbcl +%{_datadir}/%{name}/sitecopy +%{_datadir}/%{name}/snownews +%{_datadir}/%{name}/ssh +%{_datadir}/%{name}/svk +%{_datadir}/%{name}/unace +%{_datadir}/%{name}/unrar %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog @@ -61,6 +200,22 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.143 2009/04/03 14:36:56 glen +- merged on demand install of completions from DEVEL; rel 2 + +Revision 1.142.2.4 2009/04/02 21:41:36 glen +- skip "upgrade" trigger on "downgrade" + +Revision 1.142.2.3 2009/04/02 21:04:44 glen +- make relative symlinks (so they look good when browsing vserver/chroot) + +Revision 1.142.2.2 2009/04/02 18:43:35 glen +- handles files to ghost conversion via trigger + +Revision 1.142.2.1 2009/04/02 18:01:01 glen +- on demand completion install on triggers +- some problems with upgrade so commiting to DEVEL + Revision 1.142 2009/04/02 17:05:25 glen - remove rpmpkgs.txt completely ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/bash-completion.spec?r1=1.142&r2=1.143&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
