- merged to -rpm-cache.patch (hard to update otherwise)

Changed files:
    bash-completion-FHS.patch -> 1.5
    bash-completion-rpm-arch.patch -> 1.6

diff --git a/bash-completion-FHS.patch b/bash-completion-FHS.patch
deleted file mode 100644 (file)
index b6e6faa..0000000
--- a/bash-completion-FHS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- bash_completion/bash_completion    2006-03-01 22:00:59.000000000 +0200
-+++ bash_completion    2006-03-01 22:06:19.000000000 +0200
-@@ -1735,17 +1735,17 @@
-       local ver nodig nosig
- 
-       # refresh cache if writable
--      if [ /var/log/rpmpkgs -ot /var/lib/rpm/Packages -a -w /var/log/rpmpkgs ]; then
-+      if [ /var/cache/rpmpkgs.txt -ot /var/lib/rpm/Packages -a -w /var/cache/rpmpkgs.txt ]; then
-               # we grab the output to local variable to prevent possible race
-               local tmp=$(rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}.rpm\n' | LC_ALL=C sort)
--              echo "$tmp" > /var/log/rpmpkgs
-+              echo "$tmp" > /var/cache/rpmpkgs.txt
-       fi
- 
--      if [ -r /var/log/rpmpkgs -a /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
-+      if [ -r /var/cache/rpmpkgs.txt -a /var/cache/rpmpkgs.txt -nt /var/lib/rpm/Packages ]; then
-               # using RHL 7.2 or later - this is quicker than querying the DB
-               COMPREPLY=( $( sed -ne \
-               's|^\('$cur'.*\)\.rpm$|\1|p' \
--                              /var/log/rpmpkgs ) )
-+                              /var/cache/rpmpkgs.txt ) )
-       else
-               nodig=""
-               nosig=""

diff --git a/bash-completion-rpm-arch.patch b/bash-completion-rpm-arch.patch
deleted file mode 100644 (file)
index 051bc40..0000000
--- a/bash-completion-rpm-arch.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- bash_completion/bash_completion~   2006-03-01 21:23:16.000000000 +0200
-+++ bash_completion/bash_completion    2006-03-01 21:28:37.000000000 +0200
-@@ -1742,7 +1742,7 @@
-       if [ -r /var/log/rpmpkgs -a /var/log/rpmpkgs -nt /var/lib/rpm/Packages ]; then
-               # using RHL 7.2 or later - this is quicker than querying the DB
-               COMPREPLY=( $( sed -ne \
--              's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+.*\.rpm$|\1|p' \
-+              's|^\('$cur'.*\)\.rpm$|\1|p' \
-                               /var/log/rpmpkgs ) )
-       else
-               nodig=""
-@@ -1757,8 +1757,7 @@
-                       nosig="--nosignature"
-               fi
- 
--              COMPREPLY=( $( rpm -qa $nodig $nosig | sed -ne \
--              's|^\('$cur'.*\)-[0-9a-zA-Z._]\+-[0-9a-z.@]\+$|\1|p' ) )
-+              COMPREPLY=( $( rpm -qa $nodig $nosig --qf '%{name}-%{version}-%{release}.%{arch}\n' "$cur*" ) )
-       fi
- }
-