Hello community,
here is the log from the commit of package perl-Dist-CheckConflicts for
openSUSE:Factory
checked in at Mon Jun 20 12:52:21 CEST 2011.
--------
--- perl-Dist-CheckConflicts/perl-Dist-CheckConflicts.changes 2011-04-22
17:19:42.000000000 +0200
+++
/mounts/work_src_done/STABLE/perl-Dist-CheckConflicts/perl-Dist-CheckConflicts.changes
2011-06-04 20:32:05.000000000 +0200
@@ -1,0 +2,6 @@
+Sat Jun 4 18:31:39 UTC 2011 - [email protected]
+
+- fix build on distributions with old Test::More module
+ ( perl-Dist-CheckConflicts-old_Test-More.patch )
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
perl-Dist-CheckConflicts-old_Test-More.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Dist-CheckConflicts.spec ++++++
--- /var/tmp/diff_new_pack.C5TgN8/_old 2011-06-20 12:51:52.000000000 +0200
+++ /var/tmp/diff_new_pack.C5TgN8/_new 2011-06-20 12:51:52.000000000 +0200
@@ -19,13 +19,14 @@
Name: perl-Dist-CheckConflicts
Version: 0.02
-Release: 1
+Release: 3
License: GPL+ or Artistic
%define cpan_name Dist-CheckConflicts
-Summary: declare version conflicts for your dist
+Summary: Declare version conflicts for your dist
Url: http://search.cpan.org/dist/Dist-CheckConflicts/
Group: Development/Libraries/Perl
Source:
http://www.cpan.org/authors/id/D/DO/DOY/%{cpan_name}-%{version}.tar.gz
+Patch1: perl-Dist-CheckConflicts-old_Test-More.patch
BuildArch: noarch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: perl
@@ -92,13 +93,19 @@
%prep
%setup -q -n %{cpan_name}-%{version}
+%if 0%{?suse_version} >= 1010
+%patch1 -p0
+%endif
%build
%{__perl} Makefile.PL INSTALLDIRS=vendor
%{__make} %{?_smp_mflags}
+%if 0%{?suse_version} > 01010
+
%check
%{__make} test
+%endif
%install
%perl_make_install
++++++ perl-Dist-CheckConflicts-old_Test-More.patch ++++++
Index: t/01-basic.t
===================================================================
--- t.orig/01-basic.t
+++ t/01-basic.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More qw(no_plan);
use lib 't/lib/01';
{
@@ -44,4 +44,4 @@ use lib 't/lib/01';
);
}
-done_testing;
+#done_testing;
Index: t/02-conflicts.t
===================================================================
--- t.orig/02-conflicts.t
+++ t/02-conflicts.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More qw(no_plan);
use Test::Fatal;
use lib 't/lib/02';
@@ -67,4 +67,4 @@ use lib 't/lib/02';
);
}
-done_testing;
+#done_testing;
Index: t/03-dist.t
===================================================================
--- t.orig/03-dist.t
+++ t/03-dist.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More qw(no_plan);
use Test::Fatal;
use lib 't/lib/03';
@@ -71,4 +71,4 @@ use lib 't/lib/03';
is(Bar::Conflicts::Bad->dist, 'Bar', "correct dist");
}
-done_testing;
+#done_testing;
Index: t/04-merge.t
===================================================================
--- t.orig/04-merge.t
+++ t/04-merge.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More qw(no_plan);
use lib 't/lib/04';
{
@@ -18,4 +18,4 @@ use lib 't/lib/04';
);
}
-done_testing;
+#done_testing;
Index: t/05-also.t
===================================================================
--- t.orig/05-also.t
+++ t/05-also.t
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
use strict;
use warnings;
-use Test::More;
+use Test::More qw(no_plan);
use Test::Fatal;
use lib 't/lib/05';
@@ -29,4 +29,4 @@ use lib 't/lib/05';
);
}
-done_testing;
+#done_testing;
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
