From 01b39aea26e29595c66e0f631e59d2bb9a945901 Mon Sep 17 00:00:00 2001
From: Gleb Fotengauer-Malinovskiy <glebfm@altlinux.org>
Date: Fri, 16 May 2014 21:04:21 +0400
Subject: [PATCH] Apply apt-0.5.15cnc6-alt-rpm-order.patch

Added in commit 6e5c25c:
0.5.15cnc6-alt1

- Updated to 0.5.15cnc6
- New:
  + apt-0.5.15cnc6-alt-rpm-order (fix RPM::Order default value)
- Updated:
  + apt-0.5.15cnc6-alt-fixes
  + apt-0.5.15cnc6-alt-defaults
  + apt-0.5.15cnc6-alt-rpm-fancypercent
  + apt-0.5.15cnc6-alt-virtual_scores
- Merged upstream:
  + apt-0.5.15cnc6-alt-install_virtual
---
 apt-0.5.15cnc6-alt-rpm-order.patch | 25 -------------------------
 apt/apt-pkg/rpm/rpmpm.cc           |  6 +++---
 2 files changed, 3 insertions(+), 28 deletions(-)
 delete mode 100644 apt-0.5.15cnc6-alt-rpm-order.patch

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<const char*> &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<const char*> &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