caldera patches (ray@Caldera.DE)

CVS patchset: 2584
CVS date: 1998/12/03 19:36:01

diff --git a/CHANGES b/CHANGES
index b24179c..2757078 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -34,6 +34,7 @@
        - there must be a { between two % in a query format (unless %% is used)
 
 2.5.5 -> 2.5.6:
+       - caldera patches (ray@Caldera.DE)
        - added ARM patches.
        - fix incorrect directory permissions using %attr/%defattr.
        - permit "rpm -q --specfile ... file.spec" queries.

diff --git a/autodeps/linux.req b/autodeps/linux.req
index da1e73a..cde3266 100644 (file)
--- a/autodeps/linux.req
+++ b/autodeps/linux.req
@@ -7,7 +7,7 @@ ulimit -c 0
 
 filelist=`sed "s/['\"]/\\\&/g"`
 exelist=`echo $filelist | xargs -r file | fgrep executable | cut -d: -f1 `
-scriptlist=`echo $filelist | xargs -r file | egrep ":.*(perl |script )" | cut -d: -f1 `
+scriptlist=`echo $filelist | xargs -r file | egrep ":.* (commands|script) " | cut -d: -f1 `
 liblist=`echo $filelist | xargs -r file | grep "shared object" | cut -d : -f1 `
 
 for f in $exelist; do

diff --git a/build/parsePrep.c b/build/parsePrep.c
index bf04260..e9e592d 100644 (file)
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -89,7 +89,7 @@ static char *doPatch(Spec spec, int c, int strip, char *db,
     if (compressed) {
        sprintf(buf,
                "echo \"Patch #%d:\"\n"
-               "%s -dc %s | patch -p%d %s -s\n"
+               "%s -d < %s | patch -p%d %s -s\n"
                "STATUS=$?\n"
                "if [ $STATUS -ne 0 ]; then\n"
                "  exit $STATUS\n"

diff --git a/lib/rebuilddb.c b/lib/rebuilddb.c
index 73e9e9d..7bf91e9 100644 (file)
--- a/lib/rebuilddb.c
+++ b/lib/rebuilddb.c
@@ -93,7 +93,7 @@ int rpmdbRebuild(char * rootdir) {
            return 1;
        }
        if (rmdir(newdbpath))
-           rpmMessage(RPMERR_RMDIR, _("failed to remove %s: %s\n"),
+           rpmMessage(RPMESS_ERROR, _("failed to remove directory %s: %s\n"),
                        newdbpath, strerror(errno));
     }