diff --git a/0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch b/0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch deleted file mode 100644 index 15430e6..0000000 --- a/0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 1238f9bac1f652a0e28eab1bed66914dedbcd282 Mon Sep 17 00:00:00 2001 -From: Sebastian Freundt -Date: Mon, 3 Apr 2017 12:13:51 +0000 -Subject: [PATCH] fix, when printing zones transitioning at INT_MAX in - datezone(1) use NEVER indicator - -Signed-off-by: Ruediger Meier ---- - src/dzone.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/dzone.c b/src/dzone.c -index 4fb7769..968fd06 100644 ---- a/src/dzone.c -+++ b/src/dzone.c -@@ -137,8 +137,12 @@ dz_write_nxtr(struct zrng_s r, zif_t z, const char *zn) - /* thank god there's another one */ - struct ztrdtl_s zd = zif_trdtl(z, r.trno + 1); - -+ if (r.next == INT_MAX) { -+ goto never; -+ } - bp += dz_strftr(bp, ep - bp, (struct ztr_s){r.next, zd.offs}); - } else { -+ never: - bp += xstrlcpy(bp, never, bp - ep); - } - --- -1.8.5.6 - diff --git a/dateutils-0.4.1.tar.xz b/dateutils-0.4.1.tar.xz deleted file mode 100644 index cf257b6..0000000 --- a/dateutils-0.4.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ccce48975fc4d3af2e27c7893e181c46ab5df1cb37e4a428b4b521a77d55278 -size 611460 diff --git a/dateutils-0.4.2.tar.asc b/dateutils-0.4.2.tar.asc new file mode 100644 index 0000000..fb30da8 --- /dev/null +++ b/dateutils-0.4.2.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.22 (GNU/Linux) + +iEYEABECAAYFAlmH8eYACgkQlMmhrILJOQ4uowCgig+tN2QM3UWBQGP8K5X1/7cn +mOMAn09ezqnktxFnCi9+8pyzEc5vmh8e +=j2pq +-----END PGP SIGNATURE----- diff --git a/dateutils-0.4.2.tar.xz b/dateutils-0.4.2.tar.xz new file mode 100644 index 0000000..912555e --- /dev/null +++ b/dateutils-0.4.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ecdae892584098ee9d8f5b14bd555fd63e09d1199cb75aac6b02f09c7e2eb46b +size 620196 diff --git a/dateutils.changes b/dateutils.changes index 7c10f8d..7d8f5f1 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Oct 18 06:37:06 UTC 2017 - aavindraa@gmail.com + +- bump version 0.4.2 + * Features: + - allow %- specifiers to turn off padding (as GNU date does) + - support matlab day numbers, as mdn or matlab + * Bugfixes: + - fix build issue on FBSD 11 + - allow zones to transition at INT_MAX (mapped to never) +- lint spec file +- move from bitbucket to github link +- remove patch which is upstream now: + 0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch + ------------------------------------------------------------------- Mon Apr 3 12:33:47 UTC 2017 - sweet_f_a@gmx.de diff --git a/dateutils.spec b/dateutils.spec index 9addfb3..ed1a4a8 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -1,7 +1,7 @@ # # spec file for package dateutils # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,10 +16,7 @@ # -%define xversion 0.4.1 - %define have_octave 0 - %if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315 %define have_octave 1 %ifarch aarch64 @@ -33,31 +30,27 @@ %endif %endif %endif - %if 0%{?fedora_version} >= 19 %define have_octave 1 %endif - Name: dateutils -Version: 0.4.1 +Version: 0.4.2 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 -# PATCH-FIX-UPSTREAM -Patch1: 0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch +Source: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz +Source1: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.asc BuildRequires: pkgconfig BuildRequires: xz +Requires(pre): info %if 0%{?suse_version} BuildRequires: timezone %endif -%if %have_octave +%if %{have_octave} BuildRequires: octave-devel %endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires(pre): info %description Dateutils are a bunch of tools that revolve around fiddling with dates @@ -67,7 +60,7 @@ 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). -%if %have_octave +%if %{have_octave} %package octave Summary: Dateutils functions for matlab and octave Group: Development/Libraries/Other @@ -79,17 +72,16 @@ Dateutils can be used from within matlab or ocatave. %endif %prep -%setup -q -n %{name}-%{xversion} -%patch1 -p1 +%setup -q %build %configure \ --docdir=%{_docdir}/%{name} \ -%if %have_octave +%if %{have_octave} --enable-contrib \ %endif ignorethisline=xxx -make V=1 +make %{?_smp_mflags} V=1 %install %{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} @@ -102,12 +94,8 @@ if ! make check; then exit 1 fi -%clean -rm -rf %{buildroot} - # How to make that info stuff portable? %if 0%{?install_info:1} > 0 - %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info* @@ -116,7 +104,6 @@ rm -rf %{buildroot} %endif %files -%defattr(-,root,root,-) %doc %{_docdir}/%{name} %{_bindir}/dadd %{_bindir}/dconv @@ -140,31 +127,30 @@ rm -rf %{buildroot} %dir %{_datadir}/dateutils/ %{_datadir}/dateutils/locale %{_datadir}/dateutils/*.tzmcc -%doc %{_infodir}/%{name}.info* -%doc %{_mandir}/man1/%{name}.1* -%doc %{_mandir}/man1/dadd.1* -%doc %{_mandir}/man1/dconv.1* -%doc %{_mandir}/man1/ddiff.1* -%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/dateadd.1* -%doc %{_mandir}/man1/dateconv.1* -%doc %{_mandir}/man1/datediff.1* -%doc %{_mandir}/man1/dategrep.1* -%doc %{_mandir}/man1/dateround.1* -%doc %{_mandir}/man1/dateseq.1* -%doc %{_mandir}/man1/datesort.1* -%doc %{_mandir}/man1/datetest.1* -%doc %{_mandir}/man1/datezone.1* -%doc %{_mandir}/man1/strptime.1* +%{_infodir}/%{name}.info* +%{_mandir}/man1/%{name}.1* +%{_mandir}/man1/dadd.1* +%{_mandir}/man1/dconv.1* +%{_mandir}/man1/ddiff.1* +%{_mandir}/man1/dgrep.1* +%{_mandir}/man1/dround.1* +%{_mandir}/man1/dseq.1* +%{_mandir}/man1/dsort.1* +%{_mandir}/man1/dtest.1* +%{_mandir}/man1/dzone.1* +%{_mandir}/man1/dateadd.1* +%{_mandir}/man1/dateconv.1* +%{_mandir}/man1/datediff.1* +%{_mandir}/man1/dategrep.1* +%{_mandir}/man1/dateround.1* +%{_mandir}/man1/dateseq.1* +%{_mandir}/man1/datesort.1* +%{_mandir}/man1/datetest.1* +%{_mandir}/man1/datezone.1* +%{_mandir}/man1/strptime.1* -%if %have_octave +%if %{have_octave} %files octave -%defattr(-,root,root) %dir %{_libdir}/octave/site/oct/*/dateutils/ %{_libdir}/octave/site/oct/*/dateutils/tzconv.m %{_libdir}/octave/site/oct/*/dateutils/tzconv.mex