From 4295afedcc1629fe838651be5a45ee8f88573d5c38cd1cd9aa095af8900963ca Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Mon, 6 Oct 2014 13:18:48 +0000 Subject: [PATCH] Accepting request 254205 from home:rudi_m - bump version 0.3.0, this is a feature release. * Features: - dgrep supports time zones both for the expression and the input - timezones can be specified by alternative codes and [tzmap files][1] - new tool dzone to inspect date/times in multiple timezones in bulk - new tool dsort to sort input chronologically - gengetopt and help2man maintainer dependencies removed - lilian/julian inputs via `-i ldn` and `-i jdn` - ymcw dates now follow ISO 8601 in using 07 to denote Sunday * Bugfixes: - ddiff takes differences between a unix epoch stamp and a date/time - zone converter assigns correct sign to zone difference when using %Z - weekdays are properly calculated from epoch stamps (issue 24) * See info page examples and/or README. [1]: http://www.fresse.org/dateutils/tzmaps.html - enable Octave/Matlab plugin - remove useless devel package OBS-URL: https://build.opensuse.org/request/show/254205 OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=28 --- dateutils-0.2.7.tar.xz | 3 --- dateutils-0.3.0.tar.xz | 3 +++ dateutils.changes | 26 ++++++++++++++++++++ dateutils.spec | 55 ++++++++++++++++++++++++++++++++---------- tzconv.m | 16 ++++++++++++ 5 files changed, 87 insertions(+), 16 deletions(-) delete mode 100644 dateutils-0.2.7.tar.xz create mode 100644 dateutils-0.3.0.tar.xz create mode 100644 tzconv.m diff --git a/dateutils-0.2.7.tar.xz b/dateutils-0.2.7.tar.xz deleted file mode 100644 index af77e00..0000000 --- a/dateutils-0.2.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f7d0c502d79dec4a604ebc30e7c44988d7095bd303137d1fa652720350337042 -size 490456 diff --git a/dateutils-0.3.0.tar.xz b/dateutils-0.3.0.tar.xz new file mode 100644 index 0000000..0a51ab8 --- /dev/null +++ b/dateutils-0.3.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:95568b80142cd4781d78cc6420c545e50673673fd7467d18d3c264fea66b95a7 +size 580236 diff --git a/dateutils.changes b/dateutils.changes index 922e7af..042ddd8 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Aug 26 16:09:00 UTC 2014 - sweet_f_a@gmx.de + +- bump version 0.3.0, this is a feature release. + * Features: + - dgrep supports time zones both for the expression and the + input + - timezones can be specified by alternative codes and + [tzmap files][1] + - new tool dzone to inspect date/times in multiple timezones in + bulk + - new tool dsort to sort input chronologically + - gengetopt and help2man maintainer dependencies removed + - lilian/julian inputs via `-i ldn` and `-i jdn` + - ymcw dates now follow ISO 8601 in using 07 to denote Sunday + * Bugfixes: + - ddiff takes differences between a unix epoch stamp and a + date/time + - zone converter assigns correct sign to zone difference when + using %Z + - weekdays are properly calculated from epoch stamps (issue 24) + * See info page examples and/or README. + [1]: http://www.fresse.org/dateutils/tzmaps.html +- enable Octave/Matlab plugin +- remove useless devel package + ------------------------------------------------------------------- Wed Jan 29 16:43:02 UTC 2014 - sweet_f_a@gmx.de diff --git a/dateutils.spec b/dateutils.spec index a7d9d24..70bb0b9 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -16,23 +16,37 @@ # -%define xversion 0.2.7 +%define xversion 0.3.0 + +%define have_octave 0 +%ifarch i586 x86_64 +%define have_octave 1 +%endif +%if 0%{?suse_version} <= 1230 && 0%{?mandriva_version} <= 201100 +%define have_octave 0 +%endif Name: dateutils -Version: 0.2.7 +Version: 0.3.0 Release: 0 Summary: Nifty command line date and time utilities License: BSD-3-Clause Group: Productivity/Text/Utilities Url: https://github.com/hroptatyr/dateutils/ Source: https://bitbucket.org/hroptatyr/dateutils/downloads/%{name}-%{version}.tar.xz +## source file was missing in release 0.3.0 +Source1: tzconv.m BuildRequires: pkgconfig BuildRequires: xz %if 0%{?suse_version} BuildRequires: timezone %endif +%if %have_octave +BuildRequires: octave-devel +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): info +Obsoletes: %{name}-devel %description Dateutils are a bunch of tools that revolve around fiddling with dates @@ -42,20 +56,28 @@ market is shell scripts that need date calculations or calendar conversions, and as such they are highly pipe-able and modeled after their well-known cousins (e.g. dtest vs. test, or dgrep vs. grep). -%package devel -Summary: Development files for %{name} +%if %have_octave +%package octave +Summary: dateutils functions for matlab and octave Group: Development/Libraries/Other Requires: %{name} = %{version} +Requires: octave -%description devel -This package contains the header and source files needed for -compiling programs using the %{name} libraries. +%description octave +Dateutils can be used from within matlab or ocatave. +%endif %prep %setup -q -n %{name}-%{xversion} +cp -a %{SOURCE1} contrib/ %build -%configure --docdir=%{_docdir}/%{name} +%configure \ + --docdir=%{_docdir}/%{name} \ +%if %have_octave + --enable-contrib \ +%endif + ignorethisline=xxx make V=1 %install @@ -90,8 +112,12 @@ rm -rf %{buildroot} %{_bindir}/dgrep %{_bindir}/dround %{_bindir}/dseq +%{_bindir}/dsort %{_bindir}/dtest +%{_bindir}/dzone %{_bindir}/strptime +%dir %{_datadir}/dateutils/ +%{_datadir}/dateutils/*.tzmcc %doc %{_infodir}/%{name}.info* %doc %{_mandir}/man1/%{name}.1* %doc %{_mandir}/man1/dadd.1* @@ -100,13 +126,16 @@ rm -rf %{buildroot} %doc %{_mandir}/man1/dgrep.1* %doc %{_mandir}/man1/dround.1* %doc %{_mandir}/man1/dseq.1* +%doc %{_mandir}/man1/dsort.1* %doc %{_mandir}/man1/dtest.1* +%doc %{_mandir}/man1/dzone.1* %doc %{_mandir}/man1/strptime.1* -%files devel -%defattr(-,root,root,-) -%{_includedir}/dateutils/ -%{_libdir}/libdut.a -%{_libdir}/pkgconfig/libdut.pc +%if %have_octave +%files octave +%defattr(-,root,root) +%dir %{_libdir}/octave/site/oct/*/dateutils/ +%{_libdir}/octave/site/oct/*/dateutils/* +%endif %changelog diff --git a/tzconv.m b/tzconv.m new file mode 100644 index 0000000..97a81ae --- /dev/null +++ b/tzconv.m @@ -0,0 +1,16 @@ +% tzconv convert between timezones +% +% Syntax: +% d = tzconv(dates, from_zone, to_zone); +% +% Input Arguments: +% dates - a vector of matlab dates to be converted +% from_zone - interpret DATES as coming from FROM_ZONE +% to_zone - convert DATEs to TO_ZONE +% +% Output Arguments: +% d - vector of dates in the result +% +% Copyright (C) 2013 Sebastian Freundt +% +% This file is part of dateutils