- updated to 2007-03-09-18

Changed files:
    mc-rpmfs.patch -> 1.17
    mc-utf8.patch -> 1.6

diff --git a/mc-rpmfs.patch b/mc-rpmfs.patch
index 55c50fe875c3880510dc5b0e22264c30f0a36e99..f2ca012ac2a0b45d3078f9cef5a0838d31d7168e 100644 (file)
--- a/mc-rpmfs.patch
+++ b/mc-rpmfs.patch
@@ -65,22 +65,6 @@
       echo "$FILEPREF 0 $DATE INFO/SCRIPTS/ALL"
      fi
      if test "$MCFASTRPM" = 0 ; then
-@@ -117,11 +142,14 @@
-       echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-     $RPM -qp --qf "[%{OBSOLETES}\n]" "$f" | grep "(none)" > /dev/null ||
-       echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-+    $RPM -qp --qf "[%{CONFLICTS}\n]" "$1" | grep "(none)" > /dev/null ||
-+        echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-     $RPM -qp --qf "[%{PROVIDES}\n]" "$f" | grep "(none)" > /dev/null ||
-       echo "$FILEPREF 0 $DATE INFO/PROVIDES"
-     test "`$RPM -qp --qf \"%{CHANGELOGTEXT}\" \"$f\"`" = "(none)" ||
-        echo "$FILEPREF 0 $DATE INFO/CHANGELOG"
--    else 
-+    else
-+      echo "$FILEPREF 0 $DATE INFO/CONFLICTS"
-       echo "$FILEPREF 0 $DATE INFO/REQUIRENAME"
-       echo "$FILEPREF 0 $DATE INFO/OBSOLETES"
-       echo "$FILEPREF 0 $DATE INFO/PROVIDES"
 @@ -140,6 +168,7 @@
        UPGRADE) echo "# Run this to upgrade this RPM package" > "$3"; exit 0;;
        ERROR) $RPM -qip "$f" > /dev/null 2> "$3"; exit 0;;
@@ -89,12 +73,8 @@
        INFO/RELEASE)           $RPM -qp --qf "%{RELEASE}\n" "$f" > "$3"; exit 0;;
        INFO/GROUP)             $RPM -qp --qf "%{GROUP}\n" "$f" > "$3"; exit 0;;
        INFO/DISTRIBUTION)      $RPM -qp --qf "%{DISTRIBUTION}\n" "$f" > "$3"; exit 0;;
-@@ -155,12 +184,21 @@
-       INFO/LICENSE)           $RPM -qp --qf "%{LICENSE}\n" "$f" >"$3"; exit 0;;
-       INFO/RPMVERSION)        $RPM -qp --qf "%{RPMVERSION}\n" "$f" >"$3"; exit 0;;
+@@ -155,10 +184,17 @@
        INFO/REQUIRENAME)       $RPM -qp --qf "[%{REQUIRENAME} %{REQUIREFLAGS:depflags} %{REQUIREVERSION}\n]" "$f" >"$3"; exit 0;;
-+      INFO/OBSOLETES)         $RPM -qp --qf "[%{OBSOLETES}\n]" "$1" >"$3"; exit 0;;
-+      INFO/CONFLICTS)         $RPM -qp --qf "[%{CONFLICTS}\n]" "$1" >"$3"; exit 0;;
        INFO/PROVIDES)          $RPM -qp --qf "[%{PROVIDES}\n]" "$f" >"$3"; exit 0;;
        INFO/SCRIPTS/PREIN)     $RPM -qp --qf "%{RPMTAG_PREIN}\n" "$f" >"$3"; exit 0;;
 +      INFO/SCRIPTS/PREINPROG) $RPM -qp --qf "%{RPMTAG_PREINPROG}\n" "$1" >"$3"; exit 0;;

diff --git a/mc-utf8.patch b/mc-utf8.patch
index e27429d592cfef9f8b08e269947cf810f524677f..d1e64c8f402ee5dfc8a1d99746a1627b50635f9c 100644 (file)
--- a/mc-utf8.patch
+++ b/mc-utf8.patch
@@ -4475,7 +4475,7 @@
      int color;
      int i, book_mark = -1;
  
-@@ -287,66 +300,96 @@
+@@ -287,62 +300,92 @@
  
        if (row <= edit->total_lines - edit->start_line) {
            while (col <= end_col - edit->start_col) {
@@ -4505,14 +4505,9 @@
 +                  p->style |= MOD_BOLD;
                c = edit_get_byte (edit, q);
  /* we don't use bg for mc - fg contains both */
-               if (book_mark == -1) {
-                   edit_get_syntax_color (edit, q, &color);
--                  *p |= color << 16;
-+                  p->style |= color << 16;
-               } else {
--                  *p |= book_mark << 16;
-+                  p->style |= book_mark << 16;
-               }
+               edit_get_syntax_color (edit, q, &color);
+-              *p |= color << 16;
++              p->style |= color << 16;
                q++;
                switch (c) {
                case '\n':
@@ -4797,12 +4792,12 @@
      if (edit_load_file (edit)) {
        /* edit_load_file already gives an error message */
        if (to_free)
-@@ -689,13 +790,23 @@
+@@ -689,14 +790,23 @@
  {
      unsigned long sp = edit->stack_pointer;
      unsigned long spm1;
 -    long *t;
-+  
+ 
 +    struct action *t; 
 +    mc_wchar_t ch = 0; 
 +