From 063e15d176741d61d4fd4f73b908870841e398ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> Date: Mon, 21 Sep 2015 15:09:14 +0200 Subject: 1.04 bump
diff --git a/.gitignore b/.gitignore index faa77b1..dcb148e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /DateTime-Format-Duration-1.03a.tgz +/DateTime-Format-Duration-1.04.tar.gz diff --git a/DateTime-Format-Duration-1.04-Link-images-to-local-documentation.patch b/DateTime-Format-Duration-1.04-Link-images-to-local-documentation.patch new file mode 100644 index 0000000..a787dd3 --- /dev/null +++ b/DateTime-Format-Duration-1.04-Link-images-to-local-documentation.patch @@ -0,0 +1,56 @@ +From b36f07bfdca75b6f221c56379545ccd0dd0ee0f9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppi...@redhat.com> +Date: Mon, 21 Sep 2015 15:01:50 +0200 +Subject: [PATCH] Link images to local documentation +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Petr Písař <ppi...@redhat.com> +--- + lib/DateTime/Format/Duration.pm | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/DateTime/Format/Duration.pm b/lib/DateTime/Format/Duration.pm +index 430f709..1faf08c 100755 +--- a/lib/DateTime/Format/Duration.pm ++++ b/lib/DateTime/Format/Duration.pm +@@ -1016,9 +1016,9 @@ place: + + =for comment TODO: replace via Pod::Weaver with the base64'd inline image; see Pod::Weaver::Section::Ditaa + +-=for html <img src="https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure1.gif"> ++=for html <img src="file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure1.gif"> + +-=for man See: https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure1.gif ++=for man See: file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure1.gif + + Figure 1 illustrates that, with the given base, -2 years, +1 month, + +22 days, +11 hours, -9 minutes is normalised to -1 year, 10 months, 6 days, +@@ -1050,9 +1050,9 @@ However, if we add 24 hours, 1 day we end up at 11pm on the next day! Why is thi + Because midnight + 24 hours = 11pm (there's 25 hours on this day!), then we add 1 + day and end up at 11pm on the following day. + +-=for html <img src="https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure2.gif"> ++=for html <img src="file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure2.gif"> + +-=for man See: https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure2.gif ++=for man See: file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure2.gif + + Figure 2 illustrates the above problem on timelines. + +@@ -1063,9 +1063,9 @@ seconds mean there are minutes that are 61 seconds long, thus 130 seconds can + be 2 minutes, 10 seconds or 2 minutes 9 seconds, depending on the base DateTime. + Similarly leap years mean a day can have 23, 24 or 25 hours. + +-=for html <img src="https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure3.gif"> ++=for html <img src="file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure3.gif"> + +-=for man See: https://raw.githubusercontent.com/karenetheridge/DateTime-Format-Duration/master/docs/figure3.gif ++=for man See: file:///usr/share/doc/perl-DateTime-Format-Duration/docs/figure3.gif + + Figure 3 shows how leaps are calculated on timelines. + +-- +2.4.3 + diff --git a/perl-DateTime-Format-Duration.spec b/perl-DateTime-Format-Duration.spec index a4fede5..e5fb4a1 100644 --- a/perl-DateTime-Format-Duration.spec +++ b/perl-DateTime-Format-Duration.spec @@ -1,33 +1,37 @@ %global cpan_name DateTime-Format-Duration -%global postversion a Name: perl-%{cpan_name} -Version: 1.03 -Release: 7.%{postversion}%{?dist} +Version: 1.04 +Release: 1%{?dist} Summary: Format and parse DateTime::Durations # Old FSF address reported to upstream as CPAN RT #82055 License: GPL+ or Artistic Group: Development/Libraries URL: http://search.cpan.org/dist/%{cpan_name}/ -Source0: http://www.cpan.org/modules/by-module/DateTime/%{cpan_name}-%{version}%{postversion}.tgz +Source0: http://search.cpan.org/CPAN/authors/id/E/ET/ETHER/%{cpan_name}-%{version}.tar.gz +# Upstream links images to the Internet, we package them into %%{_docdir} +Patch0: DateTime-Format-Duration-1.04-Link-images-to-local-documentation.patch BuildArch: noarch +BuildRequires: coreutils +BuildRequires: findutils +BuildRequires: make BuildRequires: perl BuildRequires: perl(ExtUtils::MakeMaker) +BuildRequires: perl(strict) +BuildRequires: perl(warnings) # Run-time: BuildRequires: perl(Carp) BuildRequires: perl(constant) BuildRequires: perl(Data::Dumper) -BuildRequires: perl(DateTime) >= 0.30 BuildRequires: perl(DateTime::Duration) BuildRequires: perl(Exporter) BuildRequires: perl(Params::Validate) # Tests: +BuildRequires: perl(DateTime) +BuildRequires: perl(File::Spec) BuildRequires: perl(Test::More) -# Optional tests: -BuildRequires: perl(Test::Pod) Requires: perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version)) Requires: perl(Data::Dumper) -Requires: perl(DateTime) >= 0.30 %description This module formats and parses DateTime::Duration objects as well as other @@ -36,12 +40,8 @@ durations representations. %prep %setup -q -n %{cpan_name}-%{version} +%patch0 -p1 find -type f -exec chmod -x {} + -for F in Changes; do - iconv -f iso8859-1 -t utf-8 < "$F" > "${F}.utf" - touch -r "$F" "${F}.utf" - mv "${F}.utf" "$F" -done %build perl Makefile.PL INSTALLDIRS=vendor @@ -56,11 +56,15 @@ find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} \; make test %files -%doc Changes LICENSE README +%license LICENCE +%doc Changes CONTRIBUTING docs README %{perl_vendorlib}/* %{_mandir}/man3/* %changelog +* Mon Sep 21 2015 Petr Pisar <ppi...@redhat.com> - 1.04-1 +- 1.04 bump + * Thu Jun 18 2015 Fedora Release Engineering <rel-...@lists.fedoraproject.org> - 1.03-7.a - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 5e70972..231abfe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f395c9f17d8fe65aa3b3cca6c8fecf17 DateTime-Format-Duration-1.03a.tgz +34298bc24aee006aaae862809e0e8224 DateTime-Format-Duration-1.04.tar.gz -- cgit v0.10.2 http://pkgs.fedoraproject.org/cgit/perl-DateTime-Format-Duration.git/commit/?h=master&id=063e15d176741d61d4fd4f73b908870841e398ae -- Fedora Extras Perl SIG http://www.fedoraproject.org/wiki/Extras/SIGs/Perl perl-devel mailing list perl-devel@lists.fedoraproject.org https://admin.fedoraproject.org/mailman/listinfo/perl-devel