[Lsb-messages] /var/www/bzr/lsb/4.0/perl-test r77: Backport fix for bug 3424 from devel

[Stew Benedict]

------------------------------------------------------------
revno: 77
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: perl-test
timestamp: Fri 2012-03-02 10:53:20 -0500
message:
  Backport fix for bug 3424 from devel
added:
  scripts/package/perl-test-bug-3424.patch
modified:
  scripts/package/lsb-test-perl.spec
-------------- next part --------------
=== modified file 'scripts/package/lsb-test-perl.spec'
--- a/scripts/package/lsb-test-perl.spec	2011-06-28 17:04:21 +0000
+++ b/scripts/package/lsb-test-perl.spec	2012-03-02 15:53:20 +0000
@@ -44,6 +44,7 @@
 Patch28: perl-test-bug-3113.patch
 Patch29: perl-test-bug-3249.patch
 Patch30: perl-test-bug-3266.patch
+Patch31: perl-test-bug-3424.patch
 
 URL: http://bzr.linuxfoundation.org/loggerhead/lsb/devel/perl-test/files
 BuildRoot: %{_tmppath}/%{name}-root
@@ -77,6 +78,7 @@
 %patch23 -p1 -b .3148
 %patch27 -p0 -b .3161
 %patch30 -p0 -b .3266
+%patch31 -p0 -b .3424
 cd ..
 %patch17 -p1 -b .2845
 %patch18 -p1 -b .2848
@@ -86,6 +88,7 @@
 %patch22 -p2 -b .3128
 %patch23 -p1 -b .3148
 %patch27 -p0 -b .3161
+%patch31 -p0 -b .3424
 
 %patch24 -p1 -b .3152
 %patch25 -p0 -b .5.8.9
@@ -712,7 +715,7 @@
 done
 
 # clean up the patch backup files
-for extension in system-perl tet-output tet-output10 set-euid 1888 2114 2147 2507 2605 2613 1889 2644 2705 2820 2840 2845 2848 2953 3043 3066 3128 3148 3152 5.8.9 3154 3161 3113 3249 3266;do
+for extension in system-perl tet-output tet-output10 set-euid 1888 2114 2147 2507 2605 2613 1889 2644 2705 2820 2840 2845 2848 2953 3043 3066 3128 3148 3152 5.8.9 3154 3161 3113 3249 3266 3424;do
   find . -name "*.$extension" | xargs rm -f
 done
 popd
@@ -790,6 +793,9 @@
 
 #==================================================
 %changelog
+* Fri Mar 02 2012 Stew Benedict <stewb at linux-foundation.org>
+- patch for MM_Unix fail on some systems (bug 3424, P31)
+
 * Tue Jun 21 2011 Stew Benedict <stewb at linux-foundation.org>
 - fix or disable/drop subtests that fail against 5.14.X (bug 3266, P30)
 - fix clean_symlinks function in run_tests (wasn't cleaning up Pod symlinks)

=== added file 'scripts/package/perl-test-bug-3424.patch'
--- a/scripts/package/perl-test-bug-3424.patch	1970-01-01 00:00:00 +0000
+++ b/scripts/package/perl-test-bug-3424.patch	2012-03-02 15:53:20 +0000
@@ -0,0 +1,10 @@
+--- ./lib/ExtUtils/t/MM_Unix.t.3424	2012-03-02 10:38:43.054737725 -0500
++++ ./lib/ExtUtils/t/MM_Unix.t	2012-03-02 10:39:39.126737750 -0500
+@@ -216,6 +216,6 @@ foreach (qw/ EXPORT_LIST PERL_ARCHIVE PE
+     $t->cflags();
+ 
+     # Brief bug where CCFLAGS was being blown away
+-    is( $t->{CCFLAGS}, '-DMY_THING',    'cflags retains CCFLAGS' );
++    like( $t->{CCFLAGS}, "/-DMY_THING/",    'cflags retains CCFLAGS' );
+ }
+