Hello community,
here is the log from the commit of package perl-Dist-CheckConflicts for
openSUSE:Factory checked in at 2013-06-06 13:12:51
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perl-Dist-CheckConflicts (Old)
and /work/SRC/openSUSE:Factory/.perl-Dist-CheckConflicts.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "perl-Dist-CheckConflicts"
Changes:
--------
---
/work/SRC/openSUSE:Factory/perl-Dist-CheckConflicts/perl-Dist-CheckConflicts.changes
2011-09-23 12:36:55.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.perl-Dist-CheckConflicts.new/perl-Dist-CheckConflicts.changes
2013-06-06 13:12:52.000000000 +0200
@@ -1,0 +2,6 @@
+Thu Mar 21 15:10:07 UTC 2013 - [email protected]
+
+- remove perl-Dist-CheckConflicts-old_Test-More.patch - handle the
+ problem with old distributions in %%prep now
+
+-------------------------------------------------------------------
Old:
----
perl-Dist-CheckConflicts-old_Test-More.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ perl-Dist-CheckConflicts.spec ++++++
--- /var/tmp/diff_new_pack.M6mX4k/_old 2013-06-06 13:12:53.000000000 +0200
+++ /var/tmp/diff_new_pack.M6mX4k/_new 2013-06-06 13:12:53.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package perl-Dist-CheckConflicts
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,15 @@
#
-
Name: perl-Dist-CheckConflicts
Version: 0.02
-Release: 3
-License: GPL-1.0+ or Artistic-1.0
+Release: 0
%define cpan_name Dist-CheckConflicts
Summary: Declare version conflicts for your dist
-Url: http://search.cpan.org/dist/Dist-CheckConflicts/
+License: GPL-1.0+ or Artistic-1.0
Group: Development/Libraries/Perl
+Url: http://search.cpan.org/dist/Dist-CheckConflicts/
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
@@ -94,7 +92,10 @@
%prep
%setup -q -n %{cpan_name}-%{version}
%if 0%{?suse_version} >= 1010
-%patch1 -p0
+mv t/00-compile.t t/00-compile.t.disabled
+sed -i "s|^use Test::More;|use Test::More qw(no_plan);|g; \
+ s|^done_testing;|# done_testing;|g" t/*.t
+mv t/00-compile.t.disabled t/00-compile.t
%endif
%build
@@ -102,7 +103,6 @@
%{__make} %{?_smp_mflags}
%if 0%{?suse_version} > 01010
-
%check
%{__make} test
%endif
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]