diff --git a/apt-0.5.15cnc6-alt-rpm-order.patch b/apt-0.5.15cnc6-alt-rpm-order.patch deleted file mode 100644 index 554299b..0000000 --- a/apt-0.5.15cnc6-alt-rpm-order.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -upr apt-0.5.15cnc6.orig/apt-pkg/rpm/rpmpm.cc apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc ---- apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc.orig 2004-05-11 18:13:51 +0400 -+++ apt-0.5.15cnc6/apt-pkg/rpm/rpmpm.cc 2004-05-13 16:06:47 +0400 -@@ -496,7 +496,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps o - } - } - -- if (_config->FindB("RPM::Order", false) == false) -+ if (_config->FindB("RPM::Order", true) == false) - Args[n++] = "--noorder"; - - bool FilesInArgs = true; -@@ -864,10 +864,10 @@ - - rc = 0; - #if RPM_VERSION >= 0x040100 -- if (_config->FindB("RPM::Order", false) == true) -+ if (_config->FindB("RPM::Order", true) == true) - rc = rpmtsOrder(TS); - #else -- if (_config->FindB("RPM::Order", false) == true) -+ if (_config->FindB("RPM::Order", true) == true) - rc = rpmdepOrder(TS); - #endif - diff --git a/apt/apt-pkg/rpm/rpmpm.cc b/apt/apt-pkg/rpm/rpmpm.cc index a4c77d0..4ed2750 100644 --- a/apt/apt-pkg/rpm/rpmpm.cc +++ b/apt/apt-pkg/rpm/rpmpm.cc @@ -522,7 +522,7 @@ bool pkgRPMExtPM::ExecRPM(Item::RPMOps op, vector &files) } } - if (_config->FindB("RPM::Order", false) == false) + if (_config->FindB("RPM::Order", true) == false) Args[n++] = "--noorder"; string cmd; @@ -897,10 +897,10 @@ bool pkgRPMLibPM::Process(vector &install, rc = 0; #if RPM_VERSION >= 0x040100 - if (_config->FindB("RPM::Order", false) == true) + if (_config->FindB("RPM::Order", true) == true) rc = rpmtsOrder(TS); #else - if (_config->FindB("RPM::Order", false) == true) + if (_config->FindB("RPM::Order", true) == true) rc = rpmdepOrder(TS); #endif