Dominique Leuenberger 2017-10-29 19:24:51 +00:00 committed by Git OBS Bridge
commit 3c68e706fb
6 changed files with 57 additions and 80 deletions

View File

@ -1,31 +0,0 @@
From 1238f9bac1f652a0e28eab1bed66914dedbcd282 Mon Sep 17 00:00:00 2001
From: Sebastian Freundt <freundt@ga-group.nl>
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 <ruediger.meier@ga-group.nl>
---
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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6ccce48975fc4d3af2e27c7893e181c46ab5df1cb37e4a428b4b521a77d55278
size 611460

7
dateutils-0.4.2.tar.asc Normal file
View File

@ -0,0 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
iEYEABECAAYFAlmH8eYACgkQlMmhrILJOQ4uowCgig+tN2QM3UWBQGP8K5X1/7cn
mOMAn09ezqnktxFnCi9+8pyzEc5vmh8e
=j2pq
-----END PGP SIGNATURE-----

3
dateutils-0.4.2.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ecdae892584098ee9d8f5b14bd555fd63e09d1199cb75aac6b02f09c7e2eb46b
size 620196

View File

@ -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 Mon Apr 3 12:33:47 UTC 2017 - sweet_f_a@gmx.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package dateutils # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,10 +16,7 @@
# #
%define xversion 0.4.1
%define have_octave 0 %define have_octave 0
%if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315 %if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315
%define have_octave 1 %define have_octave 1
%ifarch aarch64 %ifarch aarch64
@ -33,31 +30,27 @@
%endif %endif
%endif %endif
%endif %endif
%if 0%{?fedora_version} >= 19 %if 0%{?fedora_version} >= 19
%define have_octave 1 %define have_octave 1
%endif %endif
Name: dateutils Name: dateutils
Version: 0.4.1 Version: 0.4.2
Release: 0 Release: 0
Summary: Nifty command line date and time utilities Summary: Nifty command line date and time utilities
License: BSD-3-Clause License: BSD-3-Clause
Group: Productivity/Text/Utilities Group: Productivity/Text/Utilities
Url: https://github.com/hroptatyr/dateutils/ Url: https://github.com/hroptatyr/dateutils/
Source: https://bitbucket.org/hroptatyr/dateutils/downloads/%{name}-%{version}.tar.xz Source: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz
# PATCH-FIX-UPSTREAM Source1: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.asc
Patch1: 0001-fix-when-printing-zones-transitioning-at-INT_MAX-in-.patch
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: xz BuildRequires: xz
Requires(pre): info
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: timezone BuildRequires: timezone
%endif %endif
%if %have_octave %if %{have_octave}
BuildRequires: octave-devel BuildRequires: octave-devel
%endif %endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(pre): info
%description %description
Dateutils are a bunch of tools that revolve around fiddling with dates 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 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). their well-known cousins (e.g. dtest vs. test, or dgrep vs. grep).
%if %have_octave %if %{have_octave}
%package octave %package octave
Summary: Dateutils functions for matlab and octave Summary: Dateutils functions for matlab and octave
Group: Development/Libraries/Other Group: Development/Libraries/Other
@ -79,17 +72,16 @@ Dateutils can be used from within matlab or ocatave.
%endif %endif
%prep %prep
%setup -q -n %{name}-%{xversion} %setup -q
%patch1 -p1
%build %build
%configure \ %configure \
--docdir=%{_docdir}/%{name} \ --docdir=%{_docdir}/%{name} \
%if %have_octave %if %{have_octave}
--enable-contrib \ --enable-contrib \
%endif %endif
ignorethisline=xxx ignorethisline=xxx
make V=1 make %{?_smp_mflags} V=1
%install %install
%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} %{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}}
@ -102,12 +94,8 @@ if ! make check; then
exit 1 exit 1
fi fi
%clean
rm -rf %{buildroot}
# How to make that info stuff portable? # How to make that info stuff portable?
%if 0%{?install_info:1} > 0 %if 0%{?install_info:1} > 0
%post %post
%install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info* %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info*
@ -116,7 +104,6 @@ rm -rf %{buildroot}
%endif %endif
%files %files
%defattr(-,root,root,-)
%doc %{_docdir}/%{name} %doc %{_docdir}/%{name}
%{_bindir}/dadd %{_bindir}/dadd
%{_bindir}/dconv %{_bindir}/dconv
@ -140,31 +127,30 @@ rm -rf %{buildroot}
%dir %{_datadir}/dateutils/ %dir %{_datadir}/dateutils/
%{_datadir}/dateutils/locale %{_datadir}/dateutils/locale
%{_datadir}/dateutils/*.tzmcc %{_datadir}/dateutils/*.tzmcc
%doc %{_infodir}/%{name}.info* %{_infodir}/%{name}.info*
%doc %{_mandir}/man1/%{name}.1* %{_mandir}/man1/%{name}.1*
%doc %{_mandir}/man1/dadd.1* %{_mandir}/man1/dadd.1*
%doc %{_mandir}/man1/dconv.1* %{_mandir}/man1/dconv.1*
%doc %{_mandir}/man1/ddiff.1* %{_mandir}/man1/ddiff.1*
%doc %{_mandir}/man1/dgrep.1* %{_mandir}/man1/dgrep.1*
%doc %{_mandir}/man1/dround.1* %{_mandir}/man1/dround.1*
%doc %{_mandir}/man1/dseq.1* %{_mandir}/man1/dseq.1*
%doc %{_mandir}/man1/dsort.1* %{_mandir}/man1/dsort.1*
%doc %{_mandir}/man1/dtest.1* %{_mandir}/man1/dtest.1*
%doc %{_mandir}/man1/dzone.1* %{_mandir}/man1/dzone.1*
%doc %{_mandir}/man1/dateadd.1* %{_mandir}/man1/dateadd.1*
%doc %{_mandir}/man1/dateconv.1* %{_mandir}/man1/dateconv.1*
%doc %{_mandir}/man1/datediff.1* %{_mandir}/man1/datediff.1*
%doc %{_mandir}/man1/dategrep.1* %{_mandir}/man1/dategrep.1*
%doc %{_mandir}/man1/dateround.1* %{_mandir}/man1/dateround.1*
%doc %{_mandir}/man1/dateseq.1* %{_mandir}/man1/dateseq.1*
%doc %{_mandir}/man1/datesort.1* %{_mandir}/man1/datesort.1*
%doc %{_mandir}/man1/datetest.1* %{_mandir}/man1/datetest.1*
%doc %{_mandir}/man1/datezone.1* %{_mandir}/man1/datezone.1*
%doc %{_mandir}/man1/strptime.1* %{_mandir}/man1/strptime.1*
%if %have_octave %if %{have_octave}
%files octave %files octave
%defattr(-,root,root)
%dir %{_libdir}/octave/site/oct/*/dateutils/ %dir %{_libdir}/octave/site/oct/*/dateutils/
%{_libdir}/octave/site/oct/*/dateutils/tzconv.m %{_libdir}/octave/site/oct/*/dateutils/tzconv.m
%{_libdir}/octave/site/oct/*/dateutils/tzconv.mex %{_libdir}/octave/site/oct/*/dateutils/tzconv.mex