diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2016-12-02 08:53:56 +0100 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2016-12-02 08:53:56 +0100 |
| commit | 44d2cc99a47fd2a3201785bc558716c162b081ab (patch) | |
| tree | 587dea90d03c9f90ca8fc3bd1f1ae6c01449b800 /package/rpm/0005-no-parentdirs.patch | |
| parent | 18bd407ba441606b7782c7fc1c6902a96a1c5505 (diff) | |
| parent | 6013266e58fccb59a406d45648985e307111445a (diff) | |
Merge branch 'next'
My local 'next' branch was not uptodate, so the previous merge was missing
the most recent changes.
Thanks to François Perrad for noticing.
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/rpm/0005-no-parentdirs.patch')
| -rw-r--r-- | package/rpm/0005-no-parentdirs.patch | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/package/rpm/0005-no-parentdirs.patch b/package/rpm/0005-no-parentdirs.patch deleted file mode 100644 index d05c99ad6..000000000 --- a/package/rpm/0005-no-parentdirs.patch +++ /dev/null @@ -1,14 +0,0 @@ -Reduce parentdirs we use, parentdirs are used for ordering -Included upstream -diff -u --new-file --recursive rpm-5.1.9_vanilla/lib/depends.c rpm-5.1.9_no-parentdirs/lib/depends.c ---- rpm-5.1.9_vanilla/lib/depends.c 2009-04-12 19:46:17.000000000 +0000 -+++ rpm-5.1.9_no-parentdirs/lib/depends.c 2009-06-13 15:21:43.504999639 +0000 -@@ -2257,7 +2257,7 @@ - #define isAuto(_x) ((_x) & _autobits) - - /*@unchecked@*/ --static int slashDepth = 100; /* #slashes pemitted in parentdir deps. */ -+static int slashDepth = 2; /* #slashes pemitted in parentdir deps. */ - - static int countSlashes(const char * dn) - /*@*/ |