From 88b2af4f5e5f1e2a45edcac28d45a27bd3deaa462b3ae8ad0d0330120f9e3b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Fri, 21 Sep 2018 09:47:50 +0000 Subject: [PATCH 1/2] Accepting request 636875 from home:bmwiedemann:branches:utilities - Update to 0.4.5: * dgrep accepts %c as qualifier in expressions (issue 81) * tests work regardless of wall clock time (issue 84) = fix build 2018-10-07 OBS-URL: https://build.opensuse.org/request/show/636875 OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=62 --- dateutils-0.4.4.tar.asc | 7 ------- dateutils-0.4.4.tar.xz | 3 --- dateutils-0.4.5.tar.asc | 7 +++++++ dateutils-0.4.5.tar.xz | 3 +++ dateutils.changes | 7 +++++++ dateutils.spec | 2 +- 6 files changed, 18 insertions(+), 11 deletions(-) delete mode 100644 dateutils-0.4.4.tar.asc delete mode 100644 dateutils-0.4.4.tar.xz create mode 100644 dateutils-0.4.5.tar.asc create mode 100644 dateutils-0.4.5.tar.xz diff --git a/dateutils-0.4.4.tar.asc b/dateutils-0.4.4.tar.asc deleted file mode 100644 index e01cfae..0000000 --- a/dateutils-0.4.4.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2 - -iEYEABECAAYFAltxYX8ACgkQlMmhrILJOQ7VngCePXVR1LcIFLO6OJiv4iGjXONr -Vz8Anj5TZk065ZpgsHLnZyk58mVKdB9O -=zIdE ------END PGP SIGNATURE----- diff --git a/dateutils-0.4.4.tar.xz b/dateutils-0.4.4.tar.xz deleted file mode 100644 index c53ea4c..0000000 --- a/dateutils-0.4.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a9cc2efbb10681130ac725946984e12330e94f43877d865d7f5c131dcf09c84f -size 635696 diff --git a/dateutils-0.4.5.tar.asc b/dateutils-0.4.5.tar.asc new file mode 100644 index 0000000..0fdf0f9 --- /dev/null +++ b/dateutils-0.4.5.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2 + +iEYEABECAAYFAlujSZUACgkQlMmhrILJOQ5n/QCgg1Rqqp3I7UzNpKYTvgo7lTfE +tXkAn1TbmJexq6NghVDusYXJVsZWmZ7I +=h03C +-----END PGP SIGNATURE----- diff --git a/dateutils-0.4.5.tar.xz b/dateutils-0.4.5.tar.xz new file mode 100644 index 0000000..e6f70fe --- /dev/null +++ b/dateutils-0.4.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16d6a0fe7b7d49ddbb303f33538dd7304a0d4af5a0369bcbf275db6a5060cbde +size 635908 diff --git a/dateutils.changes b/dateutils.changes index 1d83d2c..569d8de 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Sep 20 11:08:48 UTC 2018 - bwiedemann@suse.com + +- Update to 0.4.5: + * dgrep accepts %c as qualifier in expressions (issue 81) + * tests work regardless of wall clock time (issue 84) + ------------------------------------------------------------------- Sat Aug 25 18:31:39 UTC 2018 - jengelh@inai.de diff --git a/dateutils.spec b/dateutils.spec index 1e0480b..6acf080 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -34,7 +34,7 @@ %define have_octave 1 %endif Name: dateutils -Version: 0.4.4 +Version: 0.4.5 Release: 0 Summary: Command line date and time utilities License: BSD-3-Clause From 88ad8cbfa9c6acdbc8686bcb7659dd47ae226f963b9c628e2653c03259de63a7 Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Mon, 24 Sep 2018 10:31:05 +0000 Subject: [PATCH 2/2] Accepting request 637061 from home:pluskalm:branches:utilities - Simplify conditions - Run spec-cleaner OBS-URL: https://build.opensuse.org/request/show/637061 OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=63 --- dateutils.changes | 6 +++ dateutils.spec | 103 +++++++++++++++------------------------------- 2 files changed, 40 insertions(+), 69 deletions(-) diff --git a/dateutils.changes b/dateutils.changes index 569d8de..46d59ce 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Sep 21 14:14:26 UTC 2018 - Martin Pluskal + +- Simplify conditions +- Run spec-cleaner + ------------------------------------------------------------------- Thu Sep 20 11:08:48 UTC 2018 - bwiedemann@suse.com diff --git a/dateutils.spec b/dateutils.spec index 6acf080..01173f5 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -12,45 +12,23 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%define have_octave 0 -%if 0%{?suse_version} >= 1220 && 0%{?suse_version} != 1315 -%define have_octave 1 -%ifarch aarch64 -%if 0%{?suse_version} <= 1310 -%define have_octave 0 -%endif -%endif -%ifnarch i586 x86_64 -%if 0%{?suse_version} < 1310 -%define have_octave 0 -%endif -%endif -%endif -%if 0%{?fedora_version} >= 19 -%define have_octave 1 -%endif Name: dateutils Version: 0.4.5 Release: 0 Summary: Command line date and time utilities License: BSD-3-Clause Group: Productivity/Text/Utilities -Url: https://github.com/hroptatyr/dateutils/ -Source: https://github.com/hroptatyr/dateutils/releases/download/v%{version}/%{name}-%{version}.tar.xz +URL: https://github.com/hroptatyr/dateutils/ +Source0: 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 -%if 0%{?suse_version} -BuildRequires: timezone -%endif -%if %{have_octave} BuildRequires: octave-devel -%endif -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig +BuildRequires: timezone +Requires(post): info Requires(pre): info %description @@ -75,36 +53,26 @@ Dateutils can be used from within matlab or ocatave. %build %configure \ - --docdir=%{_docdir}/%{name} \ -%if %{have_octave} - --enable-contrib \ -%endif - ignorethisline=xxx + --enable-contrib make %{?_smp_mflags} V=1 %install -%{?make_install} %{!?make_install:make install DESTDIR=%{buildroot}} -rm -f %{buildroot}%{_infodir}/dir -rm -f %{buildroot}%{_libdir}/octave/site/oct/*/dateutils/tzconv.la +%make_install +rm -rf %{buildroot}%{_datadir}/doc/dateutils +rm -rf %{buildroot}%{_libdir}/octave/site/oct/*/dateutils/tzconv.la %check -if ! make check; then - cat test/test-suite.log - exit 1 -fi +make %{?_smp_mflags} check -# How to make that info stuff portable? -%if 0%{?install_info:1} > 0 %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info* %postun %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info* -%endif %files -%defattr(-,root,root) -%doc %{_docdir}/%{name} +%license LICENSE +%doc README.md %{_bindir}/dadd %{_bindir}/dconv %{_bindir}/ddiff @@ -127,34 +95,31 @@ fi %dir %{_datadir}/dateutils/ %{_datadir}/dateutils/locale %{_datadir}/dateutils/*.tzmcc -%{_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* +%{_infodir}/%{name}.info%{?ext_info} +%{_mandir}/man1/%{name}.1%{?ext_man} +%{_mandir}/man1/dadd.1%{?ext_man} +%{_mandir}/man1/dconv.1%{?ext_man} +%{_mandir}/man1/ddiff.1%{?ext_man} +%{_mandir}/man1/dgrep.1%{?ext_man} +%{_mandir}/man1/dround.1%{?ext_man} +%{_mandir}/man1/dseq.1%{?ext_man} +%{_mandir}/man1/dsort.1%{?ext_man} +%{_mandir}/man1/dtest.1%{?ext_man} +%{_mandir}/man1/dzone.1%{?ext_man} +%{_mandir}/man1/dateadd.1%{?ext_man} +%{_mandir}/man1/dateconv.1%{?ext_man} +%{_mandir}/man1/datediff.1%{?ext_man} +%{_mandir}/man1/dategrep.1%{?ext_man} +%{_mandir}/man1/dateround.1%{?ext_man} +%{_mandir}/man1/dateseq.1%{?ext_man} +%{_mandir}/man1/datesort.1%{?ext_man} +%{_mandir}/man1/datetest.1%{?ext_man} +%{_mandir}/man1/datezone.1%{?ext_man} +%{_mandir}/man1/strptime.1%{?ext_man} -%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 -%endif %changelog