dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: cdargs
-# $Id$
-NAME := cdargs
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON := $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

cdargs-1.35_shebangs.patch

@@ -7,6 +7,27 @@ diff -Naur cdargs-1.35/contrib/cdargs-bash.sh cdargs-1.35_patched/contrib/cdargs
  # (C) 2002-2003 Dan Allen and Stefan Kamphausen
  
  # Written by Dan Allen <dan@mojavelinux.com>
+@@ -166,7 +164,7 @@
+     local tmpfile
+
+     # first clear any bookmarks with this same alias, if file exists
+-    if [[ "$CDARGS_NODUPS" && -e "$HOME/.cdargs" ]]; then
++    if [ "$CDARGS_NODUPS" -a -e "$HOME/.cdargs" ]; then
+         tmpfile=`echo ${TEMP:-${TMPDIR:-/tmp}} | sed -e "s/\\/$//"`
+         tmpfile=$tmpfile/cdargs.$USER.$$.$RANDOM
+         grep -v "^$1 " "$HOME/.cdargs" > $tmpfile && 'mv' -f $tmpfile "$HOME/.cdargs";
+@@ -256,4 +254,11 @@
+   complete $nospace -S / -X '*/' -F _cdargs_aliases cv cb cdb
+ }
+
++# we do not support anything besides bash completion
++# (however patches to support other shells are very welcome)
++
++if [ -z "${BASH_VERSION}" ]; then
++    return 100
++fi
++
+ _cdargs_complete
 diff -Naur cdargs-1.35/contrib/cdargs-tcsh.csh cdargs-1.35_patched/contrib/cdargs-tcsh.csh
 --- cdargs-1.35/contrib/cdargs-tcsh.csh	2005-11-06 11:58:13.000000000 +0100
 +++ cdargs-1.35_patched/contrib/cdargs-tcsh.csh	2008-03-08 11:02:29.000000000 +0100

cdargs.spec

@@ -2,7 +2,7 @@
 
 Name:		cdargs
 Version:	1.35
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	The shell cd with bookmarks and browser
 
 Group:		Applications/File
@@ -83,6 +83,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 
+* Sun Jan 11 2009 Milos Jakubicek <xjakub@fi.muni.cz> - 1.35-3
+- Fixed usage in other shells than bash: minor compatibility code changes and 
+  no complains because completion doesn't work (fix BZ#479398).
+
 * Tue Mar 25 2008 Milos Jakubicek <xjakub@fi.muni.cz> - 1.35-2
 - Fixed non-capital starting letter in the summary of emacs-cdargs subpackage.