From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 29 Jun 2012 23:04:54 +0000 (+0200)
Subject: pakfire: Apply the patches in a better order.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67bbd71ef18fbad900e4f33edabc97f4fe8397ff;p=ipfire-3.x.git

pakfire: Apply the patches in a better order.

Patches are now automatically applied in an order
that is sorted by the version string of the package.
---

diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index eef125a4a..cba3786e6 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
 
 name       = pakfire
 version    = 0.9.22
-release    = 3
+release    = 4
 
 maintainer = Michael Tremer <michael.tremer@ipfire.org>
 groups     = System/Packaging
diff --git a/pakfire/patches/0009-Sort-patches-by-their-version-number.patch b/pakfire/patches/0009-Sort-patches-by-their-version-number.patch
new file mode 100644
index 000000000..a8756fc33
--- /dev/null
+++ b/pakfire/patches/0009-Sort-patches-by-their-version-number.patch
@@ -0,0 +1,19 @@
+commit 2d1d622ac9859c90363076aa2f44edf1efe53597
+Author: Michael Tremer <michael.tremer@ipfire.org>
+Date:   Tue Jun 26 19:32:11 2012 +0200
+
+    Sort patches by their version number (not in alphabetical order).
+
+diff --git a/macros/constants.macro b/macros/constants.macro
+index 07459a3..74484ea 100644
+--- a/macros/constants.macro
++++ b/macros/constants.macro
+@@ -11,7 +11,7 @@ DIR_SOURCE  = %{BASEDIR}
+ 
+ # By default, take all patches from the patches directory
+ # in alphabetical order.
+-patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort)
++patches = $(find %{DIR_PATCHES} -not -type d 2>/dev/null | sort --version-sort)
+ sources = %{thisapp}.tar.gz
+ 
+ # Macro definitions