- rel 7; add llu -t fix - sort out also installed column

Changed files:
    poldek-git.patch -> 1.8
    poldek.spec -> 1.444

diff --git a/poldek-git.patch b/poldek-git.patch
index 80370a8acbce65946d2ff3ea65710e3c8d15555b..4d84660ce0fba36b12e91f74fcd7843648f2add6 100644 (file)
--- a/poldek-git.patch
+++ b/poldek-git.patch
@@ -117,3 +117,61 @@ index b85db3a..f233b1a 100644
              break;
              
          case HTTP_STATUS_FORBIDDEN:
+commit 0fcb9d8a7fe825c1a4c5f3cff2bd30312b615510
+Author: Bartlomiej Zimon <uzi18@o2.pl>
+Date:   Wed Mar 28 03:25:18 2012 +0200
+
+    - sort also installed evr column on llu -t,
+      just sort before evr array creation
+    
+    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
+
+diff --git a/cli/ls.c b/cli/ls.c
+index fe25dc3..13f2eaa 100644
+--- a/cli/ls.c
++++ b/cli/ls.c
+@@ -337,7 +337,6 @@ static tn_array *do_upgradeable(struct cmdctx *cmdctx, tn_array *ls_ents,
+     return ls_ents2;
+ }
+ 
+-    
+ 
+ static int ls(struct cmdctx *cmdctx) 
+ {
+@@ -346,6 +345,7 @@ static int ls(struct cmdctx *cmdctx)
+     int                  rc = 1;
+     char                 *path = NULL, pwdpath[PATH_MAX], *pwd;
+     unsigned             ldflags = 0;
++    tn_fn_cmp            cmpf;
+ 
+     if (cmdctx->_flags & OPT_LS_INSTALLED)
+         ldflags = POCLIDEK_LOAD_INSTALLED;
+@@ -364,6 +364,9 @@ static int ls(struct cmdctx *cmdctx)
+         goto l_end;
+     }
+ 
++    if ((cmpf = select_cmpf(cmdctx->_flags)))
++         n_array_sort_ex(ls_ents, cmpf);
++
+     if (cmdctx->_flags & OPT_LS_UPGRADEABLE) {
+         tn_array *tmp;
+ 
+@@ -379,10 +382,6 @@ static int ls(struct cmdctx *cmdctx)
+     }
+     
+     if (n_array_size(ls_ents)) {
+-        tn_fn_cmp cmpf;
+-        if ((cmpf = select_cmpf(cmdctx->_flags)))
+-            n_array_sort_ex(ls_ents, cmpf);
+-        
+         rc = do_ls(ls_ents, cmdctx, evrs);
+         
+         if (cmpf)
+@@ -419,6 +418,7 @@ static void ls_summary(struct cmdctx *cmdctx, struct pkg *pkg)
+     
+     if ((s = pkguinf_get(pkgu, PKGUINF_SUMMARY)))
+         cmdctx_printf(cmdctx, "    %s\n", s);
++
+     pkguinf_free(pkgu);
+ }
+ 

diff --git a/poldek.spec b/poldek.spec
index 7d112f22e4cc9903693ff9de478790bcd5ca500f..4f23eed4cfdef290b46341b5bdb9edc24b5d0ec9 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -17,7 +17,7 @@
 %define        ver_rpm 4.5-49
 
 %define                snap    rc5
-%define                rel     6
+%define                rel     7
 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