commit c38e7c795cce77a99c2a32130bcfef96a9983d58
Author: Paul Howarth <paul@xxxxxxxxxxxx>
Date: Thu Oct 3 14:27:32 2013 +0100
Update to 0.32
- New upstream release 0.32
- New method is_empty_set (CPAN RT#50750)
- New test t/21from_recurrence.t
- Ignore duration signal in DateTime::Span->from_datetime_and_duration() and
use the 'end'/'start' parameters as a cue for the time direction
- More tests of intersections with open/closed ended spans
- Tweak the Set::Infinite version requirement to avoid the need for rpm
dependency filters
- Specify all dependencies
- BR: perl(DateTime::Event::Recurrence) for the test suite except when
bootstrapping
- Drop %defattr, redundant since rpm 4.4
- Make %files list more explicit
- Don't need to remove empty directories from the buildroot
- Don't use macros for commands
.gitignore | 2 +-
DateTime-Set-0.32-version.patch | 18 ++++++++++
perl-DateTime-Set.spec | 71 +++++++++++++++++++++++++++-----------
sources | 2 +-
4 files changed, 70 insertions(+), 23 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4c98d39..27df0b8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-DateTime-Set-0.28.tar.gz
+/DateTime-Set-[0-9.]*.tar.gz
diff --git a/DateTime-Set-0.32-version.patch b/DateTime-Set-0.32-version.patch
new file mode 100644
index 0000000..f69613f
--- /dev/null
+++ b/DateTime-Set-0.32-version.patch
@@ -0,0 +1,18 @@
+rpm version comparisons don't work the same way as perl versions,
+so make the version requirement more strict so as to work OK for both
+
+Upstream's META.yml says it wants 0.59 anyway
+
+--- lib/Set/Infinite/_recurrence.pm
++++ lib/Set/Infinite/_recurrence.pm
+@@ -12,7 +12,9 @@
+ use vars qw( @ISA $PRETTY_PRINT $max_iterate );
+
+ @ISA = qw( Set::Infinite );
+-use Set::Infinite 0.5502;
++# Actually need Set::Infinite 0.5502 but use 0.59 for the benefit of rpm version comparisons
++# We have Set::Infinite 0.63 or later in all supported Fedora/EPEL releases anyway
++use Set::Infinite 0.59;
+
+ BEGIN {
+ $PRETTY_PRINT = 1; # enable Set::Infinite debug
diff --git a/perl-DateTime-Set.spec b/perl-DateTime-Set.spec
index 7127dca..48556e4 100644
--- a/perl-DateTime-Set.spec
+++ b/perl-DateTime-Set.spec
@@ -1,26 +1,35 @@
Name: perl-DateTime-Set
-Version: 0.28
-Release: 14%{?dist}
+Version: 0.32
+Release: 1%{?dist}
Summary: Datetime sets and set math
License: GPL+ or Artistic
Group: Development/Libraries
URL: http://search.cpan.org/dist/DateTime-Set/
Source0: http://www.cpan.org/authors/id/F/FG/FGLOCK/DateTime-Set-%{version}.tar.gz
+Patch0: DateTime-Set-0.32-version.patch
BuildArch: noarch
-BuildRequires: perl(DateTime) >= 0.12
-# introduces circular dependency
-#BuildRequires: perl(DateTime::Event::Recurrence)
+# Build
BuildRequires: perl(Module::Build)
+# Runtime
+BuildRequires: perl(Carp)
+BuildRequires: perl(constant)
+BuildRequires: perl(DateTime::Duration)
+BuildRequires: perl(DateTime::Infinite)
+BuildRequires: perl(Params::Validate)
BuildRequires: perl(Set::Infinite) >= 0.59
+BuildRequires: perl(strict)
+BuildRequires: perl(vars)
+# Test Suite
+BuildRequires: perl(DateTime) >= 0.12
BuildRequires: perl(Test::More)
-Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-
-%{?filter_setup:
-%filter_from_requires /perl(Set::Infinite) >= 0.5502/d
-%perl_default_filter
-}
-%global __requires_exclude %{?__requires_exclude:%__requires_exclude|}perl\\(Set::Infinite\\) >= 0\\.5502
-
+BuildRequires: perl(warnings)
+# Optional Tests
+# DateTime::Event::Recurrence requires DateTime::Set itself
+%if 0%{!?perl_bootstrap:1}
+BuildRequires: perl(DateTime::Event::Recurrence)
+%endif
+# Runtime
+Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
%description
DateTime::Set is a module for datetime sets. It can be used to handle two
@@ -37,28 +46,48 @@ time", or "every Wednesday between 2003-03-05 and 2004-01-07".
%prep
%setup -q -n DateTime-Set-%{version}
+# Make perl/rpm version comparisons work the same way
+%patch0
+
%build
-%{__perl} Build.PL installdirs=vendor
+perl Build.PL installdirs=vendor
./Build
%install
rm -rf $RPM_BUILD_ROOT
-
./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
-find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
-
-%{_fixperms} $RPM_BUILD_ROOT/*
+%{_fixperms} $RPM_BUILD_ROOT
%check
./Build test
%files
-%defattr(-,root,root,-)
%doc Changes LICENSE README TODO
-%{perl_vendorlib}/*
-%{_mandir}/man3/*
+%{perl_vendorlib}/DateTime/
+%{perl_vendorlib}/Set/
+%{_mandir}/man3/DateTime::Set.3pm*
+%{_mandir}/man3/DateTime::Span.3pm*
+%{_mandir}/man3/DateTime::SpanSet.3pm*
+%{_mandir}/man3/Set::Infinite::_recurrence.3pm*
%changelog
+* Thu Oct 3 2013 Paul Howarth <paul@xxxxxxxxxxxx> - 0.32-1
+- Update to 0.32
+ - New method is_empty_set (CPAN RT#50750)
+ - New test t/21from_recurrence.t
+ - Ignore duration signal in DateTime::Span->from_datetime_and_duration() and
+ use the 'end'/'start' parameters as a cue for the time direction
+ - More tests of intersections with open/closed ended spans
+- Tweak the Set::Infinite version requirement to avoid the need for rpm
+ dependency filters
+- Specify all dependencies
+- BR: perl(DateTime::Event::Recurrence) for the test suite except when
+ bootstrapping
+- Drop %%defattr, redundant since rpm 4.4
+- Make %%files list more explicit
+- Don't need to remove empty directories from the buildroot
+- Don't use macros for commands
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@xxxxxxxxxxxxxxxxxxxxxxx> - 0.28-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index ebdbe0f..5c7aeff 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0f4ccdf212fcfa2fb0d8be855904b65 DateTime-Set-0.28.tar.gz
+8f111f63b2540963294e63cc4cabf6bf DateTime-Set-0.32.tar.gz
--
Fedora Extras Perl SIG
http://www.fedoraproject.org/wiki/Extras/SIGs/Perl
perl-devel mailing list
perl-devel@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/perl-devel
