- rel 44; install --caplookup added and local trurlib check fixed

Changed files:
    poldek-caplookup.patch -> 1.5
    poldek-local_trurlib_check.patch -> 1.1
    poldek.spec -> 1.403

diff --git a/poldek-caplookup.patch b/poldek-caplookup.patch
new file mode 100644 (file)
index 0000000..262078f
--- /dev/null
+++ b/poldek-caplookup.patch
@@ -0,0 +1,43 @@
+commit c59795d297536a43c8047dfab2ddea7bef3eb91e
+Author: Bartlomiej Zimon <uzi18@o2.pl>
+Date:   Tue Jun 1 05:42:21 2010 +0200
+
+    - add --caplookup to install command in interactive mode
+    
+    Signed-off-by: Bartlomiej Zimon <uzi18@o2.pl>
+
+diff --git a/cli/install.c b/cli/install.c
+index ee83515..19fcb40 100644
+--- a/cli/install.c
++++ b/cli/install.c
+@@ -69,6 +69,7 @@ static int install(struct cmdctx *cmdctx);
+ #define OPT_INST_NOFETCH          (OPT_GID + 36)
+ #define OPT_INST_PARSABLETS       (OPT_GID + 37)
+ #define OPT_INST_MKDIR            (OPT_GID + 38)
++#define OPT_INST_CAPLOOKUP        (OPT_GID + 39)
+ 
+ static struct argp_option options[] = {
+ {0, 'I', 0, 0, N_("Install, not upgrade packages"), OPT_GID },
+@@ -138,7 +139,10 @@ N_("Same as --force but applied to PM (rpm) only)"), OPT_GID },
+ 
+ /* hidden, for debugging/testing purposes */
+ {"nofetch", OPT_INST_NOFETCH, 0, OPTION_HIDDEN, 
+-     N_("Do not download packages"), OPT_GID },    
++     N_("Do not download packages"), OPT_GID },
++    
++{"caplookup", OPT_INST_CAPLOOKUP, 0, 0,
++N_("Look into package capabilities and files to resolve packages"), OPT_GID },
+ 
+ { 0, 0, 0, 0, 0, 0 },
+ };
+@@ -490,6 +494,10 @@ error_t parse_opt(int key, char *arg, struct argp_state *state)
+             ts->setop(ts, POLDEK_OP_NOFETCH, 1);
+             break;
+  
++        case OPT_INST_CAPLOOKUP:
++            ts->setop(ts, POLDEK_OP_CAPLOOKUP, 1);
++            break;
++
+         case OPT_INST_FETCH:
+             if (arg) {
+                 if (!poldek_util_is_rwxdir(arg)) {

diff --git a/poldek-local_trurlib_check.patch b/poldek-local_trurlib_check.patch
new file mode 100644 (file)
index 0000000..3d0dc95
--- /dev/null
+++ b/poldek-local_trurlib_check.patch
@@ -0,0 +1,22 @@
+--- configure.in.old   2010-06-03 04:15:33.000000000 +0200
++++ configure.in       2010-06-03 04:19:07.000000000 +0200
+@@ -421,8 +421,8 @@
+ if test -n "$TRURL_DIR"; then
+       AC_MSG_CHECKING(for local trurlib copy in $TRURL_DIR)
+       AC_MSG_RESULT([yes])
+-      TRURL_INCLUDE="-I\$(top_srcdir)/$TRURL_DIR/include"
+-      TRURL_LDFLAG="-L\$(top_srcdir)/$TRURL_DIR/"
++      TRURL_INCLUDE="-I$srcdir/$TRURL_DIR/include"
++      TRURL_LDFLAG="-L$srcdir/$TRURL_DIR/"
+       LDFLAGS="$LDFLAGS $TRURL_LDFLAG"
+       CPPFLAGS="$CPPFLAGS $TRURL_INCLUDE"
+       LIBS="-ltrurl $LIBS"
+@@ -452,7 +452,7 @@
+         #endif
+        ], is_valid_trurlib_ver=yes, is_valid_trurlib_ver=no)
+ 
+-if test "${is_valid_trurlib_ver}." = "no." ; then
++if test "${is_valid_trurlib_ver}." == "no." ; then
+       AC_MSG_RESULT(no)               
+       AC_MSG_ERROR(["trurlib >= 0.44.0 not found"])
+ else

diff --git a/poldek.spec b/poldek.spec
index 3f2a2b85585b1653644ab6484b296f33ce3aa5aa..74c95bb04db9aaa95fb5526fb91eeab0775f359e 100644 (file)
--- a/poldek.spec
+++ b/poldek.spec
@@ -17,7 +17,7 @@
 %define        ver_rpm 4.5-5
 #
 %define                snap    20080820.23
-%define                rel             43
+%define                rel             44
 Summary:       RPM packages management helper tool
 Summary(pl.UTF-8):     Pomocnicze narzędzie do zarządzania pakietami RPM
 Name:          poldek
@@ -74,6 +74,8 @@ Patch32:      %{name}-prepare_url_fix.patch
 Patch33:       %{name}-noloop_on_terminal_loos.patch
 Patch34:       %{name}-show_only_relative_used_space.patch
 Patch35:       %{name}-zlib.patch
+Patch36:       %{name}-caplookup.patch
+Patch37:       %{name}-local_trurlib_check.patch
 URL:           http://poldek.pld-linux.org/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -245,6 +247,8 @@ Moduły języka Python dla poldka.
 %patch34 -p1
 # fixes failures with zlib >= 1.2.3.7
 %patch35 -p0
+%patch36 -p1
+%patch37 -p0
 
 # cleanup backups after patching
 find . '(' -name '*~' -o -name '*.orig' ')' -print0 | xargs -0 -r -l512 rm -f