From 2851e615b19495ff188244753da8a87e43a525ab Mon Sep 17 00:00:00 2001 From: Chris Weyl Date: Wed, 24 Feb 2010 18:34:07 +0000 Subject: [PATCH] - update subpackage tests macros to handle packages with an epoch properly --- macros.perl | 2 +- perl.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/macros.perl b/macros.perl index b20394a..f478e74 100644 --- a/macros.perl +++ b/macros.perl @@ -114,7 +114,7 @@ popd \ %package tests\ Summary: Test suite for package %{name}\ Group: Development/Debug\ -Requires: %{name} = %{version}-%{release}\ +Requires: %{name} = %{?epoch:%{epoch}:}%{version}-%{release}\ Requires: /usr/bin/prove \ %{?__tests_spkg_req:Requires: %__tests_spkg_req}\ %{?__tests_spkg_prov:Provides: %__tests_spkg_prov}\ diff --git a/perl.spec b/perl.spec index 411691c..2eb30aa 100644 --- a/perl.spec +++ b/perl.spec @@ -7,7 +7,7 @@ Name: perl Version: %{perl_version} -Release: 110%{?dist} +Release: 111%{?dist} Epoch: %{perl_epoch} Summary: Practical Extraction and Report Language Group: Development/Languages @@ -1870,6 +1870,9 @@ make test # Old changelog entries are preserved in CVS. %changelog +* Wed Feb 24 2010 Chris Weyl - 4:5.10.1-111 +- update subpackage tests macros to handle packages with an epoch properly + * Fri Feb 05 2010 Chris Weyl - 4:5.10.1-110 - add initial EXPERIMENTAL tests subpackage rpm macros to macros.perl