ooo-build r13054 - in trunk: . doc patches

[michael svn gnome org]

Author: michael
Date: Thu Jul  3 16:47:48 2008
New Revision: 13054
URL: http://svn.gnome.org/viewvc/ooo-build?rev=13054&view=rev

Log:
2008-07-03  Michael Meeks  <michael meeks novell com>

        * patches/apply.pl.in (rules_pass): don't match
        rules later in the rule string so a < later,
        doesn't trump an earlier >=.



Modified:
   trunk/ChangeLog
   trunk/doc/split.txt
   trunk/patches/apply.pl.in

Modified: trunk/doc/split.txt
==============================================================================
--- trunk/doc/split.txt	(original)
+++ trunk/doc/split.txt	Thu Jul  3 16:47:48 2008
@@ -243,3 +243,9 @@
 	+ rename each piece into it's own directory:
 		+ dev300-m22-ure [etc.]
 		+ so RPMs can build happily together in parallel on the same host.
+
++ bootstrap
++ ure
++ libs-extern
++ libs-core
+

Modified: trunk/patches/apply.pl.in
==============================================================================
--- trunk/patches/apply.pl.in	(original)
+++ trunk/patches/apply.pl.in	Thu Jul  3 16:47:48 2008
@@ -162,27 +162,27 @@
 	    $rule =~ s/[\!\<\=\>]+\s*(\S+)//;
 	} else {
 	    # equal to (==)
-	    if ($rule =~ s/\=\=\s*(\S+)// ) {
+	    if ($rule =~ s/^\=\=\s*(\S+)// ) {
 		   if ( milestone_cmp ($tag, $1) != 0 ) { return 0; } 
 	    }
 	    # non-equal to (!=)
-	    elsif ($rule =~ s/\!\=\s*(\S+)// ) {
+	    elsif ($rule =~ s/^\!\=\s*(\S+)// ) {
 	           if ( milestone_cmp ($tag, $1) == 0 ) { return 0; }
 	    }
 	    # less than or equal (<=)
-	    elsif ($rule =~ s/\<=\s*(\S+)// ) {
+	    elsif ($rule =~ s/^\<=\s*(\S+)// ) {
 	           if ( milestone_cmp ($tag, $1) > 0 ) { return 0; }
 	    }
 	    # less than (<)
-	    elsif ($rule =~ s/\<\s*(\S+)// ) {
+	    elsif ($rule =~ s/^\<\s*(\S+)// ) {
 	    	   if ( milestone_cmp ($tag, $1) >= 0 ) { return 0; }
 	    }
 	    # greater than or equal (>=)
-	    elsif ($rule =~ s/\>=\s*(\S+)// ) {
+	    elsif ($rule =~ s/^\>=\s*(\S+)// ) {
 	           if ( milestone_cmp ($tag, $1) < 0 ) { return 0; }
 	    }
 	    # greater than (>)
-	    elsif ($rule =~ s/\>\s*(\S+)// ) {
+	    elsif ($rule =~ s/^\>\s*(\S+)// ) {
 	    	   if ( milestone_cmp ($tag, $1) <= 0 ) { return 0; }
 	    }
 	}