SOURCES: mc-rpmfs.patch, mc-utf8.patch - updated to 2007-03-09-18

[baggins]

Author: baggins                      Date: Wed Mar 28 16:56:34 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated to 2007-03-09-18

---- Files affected:
SOURCES:
   mc-rpmfs.patch (1.16 -> 1.17) , mc-utf8.patch (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SOURCES/mc-rpmfs.patch
diff -u SOURCES/mc-rpmfs.patch:1.16 SOURCES/mc-rpmfs.patch:1.17
--- SOURCES/mc-rpmfs.patch:1.16	Fri Jun 10 17:13:48 2005
+++ SOURCES/mc-rpmfs.patch	Wed Mar 28 18:56:28 2007
@@ -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;;

================================================================
Index: SOURCES/mc-utf8.patch
diff -u SOURCES/mc-utf8.patch:1.5 SOURCES/mc-utf8.patch:1.6
--- SOURCES/mc-utf8.patch:1.5	Wed Sep 27 22:59:12 2006
+++ SOURCES/mc-utf8.patch	Wed Mar 28 18:56:28 2007
@@ -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; 
 +
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/mc-rpmfs.patch?r1=1.16&r2=1.17&f=u
    http://cvs.pld-linux.org/SOURCES/mc-utf8.patch?r1=1.5&r2=1.6&f=u