From: Kacper Kornet <draenog@pld-linux.org>
Date: Sat, 22 Mar 2014 19:20:48 +0000 (+0100)
Subject: remove --noorder option during package removal
X-Git-Tag: auto/th/poldek-0.30.0-8~4
X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=9303febc9476af12c073a7f0e87aa0b1ede789a1;p=packages%2Fpoldek.git

remove --noorder option during package removal

Poldek assumption that rpm -e --noorder removes packages starting from
the last one is wrong for rpm 5.4. This causes error for packages with
Requires(preun). At the same time rpm 5.4 is able to sort them correctly
by itself.
---

diff --git a/poldek-noorder.patch b/poldek-noorder.patch
new file mode 100644
index 0000000..b2187d4
--- /dev/null
+++ b/poldek-noorder.patch
@@ -0,0 +1,14 @@
+diff --git a/pm/rpm/rpminstall.c b/pm/rpm/rpminstall.c
+index c128216..1a3fed8 100644
+--- a/pm/rpm/rpminstall.c
++++ b/pm/rpm/rpminstall.c
+@@ -534,7 +534,9 @@ int pm_rpm_packages_uninstall(struct pkgdb *db, const tn_array *pkgs,
+         argv[nargs++] = (char*)ts->rootdir;
+     }
+     
++#ifndef HAVE_RPM_VERSION_GE_5
+     argv[nargs++] = "--noorder";
++#endif
+     
+     if (ts->rpmopts) 
+         for (i=0; i<n_array_size(ts->rpmopts); i++)
diff --git a/poldek.spec b/poldek.spec
index 8817c09..d676fd0 100644
--- a/poldek.spec
+++ b/poldek.spec
@@ -22,7 +22,7 @@
 %endif
 %define		ver_rpm		5.4.10
 
-%define		rel	7
+%define		rel	8
 Summary:	RPM packages management helper tool
 Summary(hu.UTF-8):	RPM csomagkezelést segítő eszköz
 Summary(pl.UTF-8):	Pomocnicze narzędzie do zarządzania pakietami RPM
@@ -51,6 +51,7 @@ Patch1:		%{name}-Os-fail-workaround.patch
 Patch2:		%{name}-config.patch
 Patch3:		at-char-completion.patch
 Patch4:		%{name}-ignore-too-long-paths.patch
+Patch5:		%{name}-noorder.patch
 URL:		http://poldek.pld-linux.org/
 BuildRequires:	%{db_pkg}-devel >= %{ver_db}-%{ver_db_rel}
 BuildRequires:	autoconf
@@ -220,6 +221,7 @@ Moduły języka Python dla poldka.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %{__rm} m4/libtool.m4 m4/lt*.m4