- update, remove patch (tested functionality without it)

This commit is contained in:
Marcela Mašláňová 2010-02-01 09:05:31 +00:00
parent 4749e9cfc3
commit c0c98df562
4 changed files with 30 additions and 59 deletions

View File

@ -1 +1 @@
Date-Manip-5.54.tar.gz Date-Manip-6.05.tar.gz

View File

@ -1,38 +0,0 @@
diff -up Date-Manip-5.54/lib/Date/Manip.pm.orig Date-Manip-5.54/lib/Date/Manip.pm
--- Date-Manip-5.54/lib/Date/Manip.pm.orig 2008-11-26 17:48:15.000000000 +0100
+++ Date-Manip-5.54/lib/Date/Manip.pm 2008-11-26 17:50:10.000000000 +0100
@@ -3569,6 +3569,7 @@ sub Date_TimeZone {
$tz=$ENV{'SYS$TIMEZONE_DIFFERENTIAL'}/3600.; # e.g. '-4' for EDT
}
}
+ push(@tz,$tz) if (defined $tz);
} else {
$tz=`date +%Z 2> /dev/null`;
chomp($tz);
@@ -3577,8 +3578,13 @@ sub Date_TimeZone {
chomp($tz);
$tz=(split(/\s+/,$tz))[4];
}
+ push(@tz,$tz) if (defined $tz);
+
+ # for international timezones
+ $tz=`date +%z 2> /dev/null`;
+ chomp($tz);
+ push(@tz,$tz) if (defined $tz);
}
- push(@tz,$tz) if (defined $tz);
} else {
# We need to satisfy taint checking, but also look in all the
# directories in @DatePath.
@@ -3593,6 +3599,11 @@ sub Date_TimeZone {
$tz=(split(/\s+/,$tz))[4];
}
push(@tz,$tz) if (defined $tz);
+
+ # for international timezones
+ $tz=`date +%z 2> /dev/null`;
+ chomp($tz);
+ push(@tz,$tz) if (defined $tz);
}
}

View File

@ -1,22 +1,21 @@
Name: perl-Date-Manip Name: perl-Date-Manip
Version: 5.54 Version: 6.05
Release: 5%{?dist} Release: 1%{?dist}
Summary: A Perl module containing a wide variety of date manipulation routines Summary: A Perl module containing a wide variety of date manipulation routines
Group: Development/Libraries Group: Development/Libraries
License: GPL+ or Artistic License: GPL+ or Artistic
URL: http://search.cpan.org/dist/Date-Manip/ URL: http://search.cpan.org/dist/Date-Manip/
Source0: http://www.cpan.org/authors/id/S/SB/SBECK/Date-Manip-%{version}.tar.gz Source0: http://www.cpan.org/authors/id/S/SB/SBECK/Date-Manip-%{version}.tar.gz
# Mailed to sbeck@cpan.org on 2008-11-26:
Patch0: perl-Date-Manip-5.48-datez-rhbz248500.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
BuildArch: noarch BuildArch: noarch
BuildRequires: perl(ExtUtils::MakeMaker) perl(Test::More) BuildRequires: perl(Module::Build)
BuildRequires: perl(Test::Pod) >= 1.00 BuildRequires: perl(YAML::Syck)
BuildRequires: perl(Test::Pod::Coverage) >= 1.00 BuildRequires: perl(Test::More)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) Requires: perl(YAML::Syck)
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# This package was formerly known as perl-DateManip # This package was formerly known as perl-DateManip
Provides: perl-DateManip = %{version}-%{release} Provides: perl-DateManip = %{version}-%{release}
@ -24,29 +23,36 @@ Obsoletes: perl-DateManip < 5.48-1
%description %description
This is a set of routines designed to make any common date/time Date::Manip is a series of modules designed to make any common date/time
manipulation easy to do. Operations such as comparing two times, manipulation easy to do. Operations such as comparing two times,
calculating a time a given amount of time from another, or parsing calculating a time a given amount of time from another, or parsing
international times are all easily done. international times are all easily done. From the very beginning, the main
focus of Date::Manip has been to be able to do ANY desired date/time
operation easily, not necessarily quickly. Also, it is definitely oriented
towards the type of operations we (as people) tend to think of rather than
those operations used routinely by computers. There are other modules that
can do a subset of the operations available in Date::Manip much quicker
than those presented here, so be sure to read the section SHOULD I USE
DATE::MANIP in the Date::Manip::Misc document before deciding which of the
Date and Time modules from CPAN is for you.
%prep %prep
%setup -q -n Date-Manip-%{version} %setup -q -n Date-Manip-%{version}
%patch0 -p1
%build %build
%{__perl} Makefile.PL INSTALLDIRS=vendor %{__perl} Build.PL installdirs=vendor
make %{?_smp_mflags} ./Build
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
make pure_install PERL_INSTALL_ROOT=$RPM_BUILD_ROOT
find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';' ./Build install destdir=$RPM_BUILD_ROOT create_packlist=0
find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null ';' find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
%{_fixperms} $RPM_BUILD_ROOT/* %{_fixperms} $RPM_BUILD_ROOT/*
%check %check
make test ./Build test
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
@ -54,12 +60,15 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-,root,root,-) %defattr(-,root,root,-)
%doc README TODO HISTORY LICENSE %doc HISTORY LICENSE README README.first requirements
%{perl_vendorlib}/Date/ %{perl_vendorlib}/Date/
%{_mandir}/man3/*.3* %{_mandir}/man3/*.3*
%changelog %changelog
* Mon Feb 1 2010 Marcela Mašláňová <mmaslano@redhat.com> - 6.05-1
- update, remove patch (tested functionality without it)
* Wed Jan 13 2010 Marcela Mašláňová <mmaslano@redhat.com> - 5.54-5 * Wed Jan 13 2010 Marcela Mašláňová <mmaslano@redhat.com> - 5.54-5
- add license into doc and fix rpmlint warnings - add license into doc and fix rpmlint warnings

View File

@ -1 +1 @@
16c343329bad644b17f4f8ec5fb243cf Date-Manip-5.54.tar.gz d6b7cd0a4d26662c4149ecd2e9064037 Date-Manip-6.05.tar.gz