From 6c6db6c41c520b2a848fc9e38ae596c47a0c682a01a1a3c1dfa9c7c4f35639fe Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Fri, 13 Apr 2012 14:37:51 +0000 Subject: [PATCH] Accepting request 113085 from home:rudi_m - bump version 0.2.0, this is a feature release. * The distinction between binaries for date, time and date-time processing is cleared up by a unified set of tools, prefixed with `d'. Thus: dadd + tadd -> dadd dconv + tconv + dtconv -> dconv ddiff + tdiff -> ddiff dgrep + tgrep -> dgrep dseq + tseq -> dseq dtest + ttest -> dtest * Furthermore, all tools now fully cope with dates, times and date-times. Virtual timezones have been added (use `GPS' or `TAI'). * See info page examples and/or README. OBS-URL: https://build.opensuse.org/request/show/113085 OBS-URL: https://build.opensuse.org/package/show/utilities/dateutils?expand=0&rev=15 --- dateutils-0.1.10-byteswap.patch | 200 -------------------------------- dateutils-0.1.10.tar.xz | 3 - dateutils-0.2.0.tar.xz | 3 + dateutils.changes | 17 +++ dateutils.spec | 44 +++---- 5 files changed, 43 insertions(+), 224 deletions(-) delete mode 100644 dateutils-0.1.10-byteswap.patch delete mode 100644 dateutils-0.1.10.tar.xz create mode 100644 dateutils-0.2.0.tar.xz diff --git a/dateutils-0.1.10-byteswap.patch b/dateutils-0.1.10-byteswap.patch deleted file mode 100644 index bb3ef04..0000000 --- a/dateutils-0.1.10-byteswap.patch +++ /dev/null @@ -1,200 +0,0 @@ -From 6b518194c2508e3118c2bb9866c8fed946da7968 Mon Sep 17 00:00:00 2001 -From: Ruediger Meier -Date: Fri, 23 Mar 2012 19:32:32 +0100 -Subject: [PATCH] minor, if byteswap.h is there, swap the bytes ourselves - -Squashed commit of the following: - -commit 2b9cee2e2b972a74c44e223d292ca9204a94160a -Author: Ruediger Meier -Date: Fri Mar 23 19:21:19 2012 +0100 - - fix, unterminated #if (followup e9b87b14) - -commit e2ffa392167b4be744e64bd49f382507ef0dde42 -Merge: 03ee571 6c912e8 -Author: Sebastian Freundt -Date: Fri Mar 23 17:30:45 2012 +0000 - - Merge branch 'next' - - * next: - cosmetics, change guard of boobs.h - minor, if byteswap.h is there, swap the bytes ourselves - -commit 6c912e8309347334bbd9b0e29b8e165bb8481ce1 -Merge: 03ee571 4a3c9eb -Author: Sebastian Freundt -Date: Fri Mar 23 17:27:31 2012 +0000 - - Merge branch 'fix/big-endian' into next - - * fix/big-endian: - cosmetics, change guard of boobs.h - minor, if byteswap.h is there, swap the bytes ourselves - -commit 4a3c9eb8deb113eb920777a8351e2cc22c15b622 -Author: Sebastian Freundt -Date: Fri Mar 23 17:18:57 2012 +0000 - - cosmetics, change guard of boobs.h - - Signed-off-by: Sebastian Freundt - -commit e9b87b142625340405fbbbcb4219adfba0e89678 -Author: Sebastian Freundt -Date: Fri Mar 23 17:18:27 2012 +0000 - - minor, if byteswap.h is there, swap the bytes ourselves - - Signed-off-by: Sebastian Freundt -Signed-off-by: Ruediger Meier ---- - configure.ac | 2 +- - lib/boobs.h | 41 ++++++++++++++++++++++------------------- - 2 files changed, 23 insertions(+), 20 deletions(-) - -diff --git a/configure.ac b/configure.ac -index f57fb53..952bb6c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -39,7 +39,7 @@ AC_C_BIGENDIAN - SXE_CHECK_CFLAGS - - ## check for byteorder utils --AC_CHECK_HEADERS([endian.h sys/endian.h byteorder.h arpa/inet.h netinet/in.h]) -+AC_CHECK_HEADERS([endian.h sys/endian.h byteorder.h byteswap.h]) - - ## check for strptime - AC_CHECK_FUNCS([strptime]) -diff --git a/lib/boobs.h b/lib/boobs.h -index 8276503..a1f7349 100644 ---- a/lib/boobs.h -+++ b/lib/boobs.h -@@ -35,8 +35,8 @@ - * - ***/ - --#if !defined INCLUDED_byteorder_h_ --#define INCLUDED_byteorder_h_ -+#if !defined INCLUDED_boobs_h_ -+#define INCLUDED_boobs_h_ - - #if defined HAVE_CONFIG_H - # include "config.h" -@@ -46,51 +46,54 @@ - # include - #elif defined HAVE_SYS_ENDIAN_H - # include --#elif defined HAVE_BYTEORDER_H -+#elif defined HAVE_BOOBS_H - # include --#elif defined HAVE_ARPA_INET_H --# include --#elif defined NETINET_IN_H --# include --#else --/* FUCK!!! */ --#endif /* HAVE_ENDIAN_H */ -+#endif /* ENDIAN_H || SYS/ENDIAN_H || BOOBS_H */ -+ -+/* check for byteswap to do the swapping ourselves if need be */ -+#if defined HAVE_BYTESWAP_H -+# include -+#endif /* BYTESWAP_H */ - - /* and even now we may be out of luck */ - #if !defined be32toh - # if defined betoh32 - # define be32toh betoh32 --# elif defined ntohl --# define be32toh ntohl - # elif defined WORDS_BIGENDIAN || __BYTE_ORDER == __BIG_ENDIAN - # define be32toh(x) (x) -+# elif __BYTE_ORDER == __LITTLE_ENDIAN -+# define be32toh(x) __bswap_32(x) - # endif - #endif /* !be32toh */ - - #if !defined le32toh - # if defined letoh32 - # define le32toh letoh32 --# elif !defined WORDS_BIGENDIAN || __BYTE_ORDER == __LITTLE_ENDIAN -+# elif defined WORDS_BIGENDIAN || __BYTE_ORDER == __BIG_ENDIAN -+# define le32toh(x) __bswap_32(x) -+# elif __BYTE_ORDER == __LITTLE_ENDIAN - # define le32toh(x) (x) - # endif /* letoh32 */ - #endif /* !le32toh */ - - #if !defined htobe32 --# if defined htonl --# define htobe32 htonl --# elif defined WORDS_BIGENDIAN || __BYTE_ORDER == __BIG_ENDIAN -+# if defined WORDS_BIGENDIAN || __BYTE_ORDER == __BIG_ENDIAN - # define htobe32(x) (x) -+# elif __BYTE_ORDER == __LITTLE_ENDIAN -+# define htobe32(x) __bswap_32(x) - # endif - #endif /* !be32toh */ - - #if !defined htole32 --# if !defined WORDS_BIGENDIAN || __BYTE_ORDER == __LITTLE_ENDIAN -+# if defined WORDS_BIGENDIAN || __BYTE_ORDER == __BIG_ENDIAN -+# define htole32(x) __bswap_32(x) -+# elif __BYTE_ORDER == __LITTLE_ENDIAN - # define htole32(x) (x) - # endif --#endif /* !le32toh */ -+#endif /* !htole32 */ - - /* we could technically include byteswap.h and to the swap ourselves - * in the missing cases. Instead we'll just leave it as is and wait - * for bug reports. */ - --#endif /* INCLUDED_byteorder_h_ */ -+#endif /* INCLUDED_boobs_h_ */ --- -1.7.6.1 - -diff -rupN -x boobs.h -x configure.ac dateutils-0.1.10/configure release_obs_openSUSE_12.1/dateutils-0.1.10/configure ---- dateutils-0.1.10/configure 2012-03-23 14:58:06.000000000 +0100 -+++ release_obs_openSUSE_12.1/dateutils-0.1.10/configure 2012-03-23 19:32:57.000000000 +0100 -@@ -9074,7 +9074,7 @@ $as_echo "${LDFLAGS}" >&6; } - - - ## check for byteorder utils --for ac_header in endian.h sys/endian.h byteorder.h arpa/inet.h netinet/in.h -+for ac_header in endian.h sys/endian.h byteorder.h byteswap.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" -diff -rupN -x boobs.h -x configure.ac dateutils-0.1.10/src/config.h.in release_obs_openSUSE_12.1/dateutils-0.1.10/src/config.h.in ---- dateutils-0.1.10/src/config.h.in 2012-03-23 14:58:07.000000000 +0100 -+++ release_obs_openSUSE_12.1/dateutils-0.1.10/src/config.h.in 2012-03-23 19:32:59.000000000 +0100 -@@ -6,12 +6,12 @@ - /* Whether c1x anon structs work */ - #undef HAVE_ANON_STRUCTS - --/* Define to 1 if you have the header file. */ --#undef HAVE_ARPA_INET_H -- - /* Define to 1 if you have the header file. */ - #undef HAVE_BYTEORDER_H - -+/* Define to 1 if you have the header file. */ -+#undef HAVE_BYTESWAP_H -+ - /* Define to 1 if you have the header file. */ - #undef HAVE_ENDIAN_H - -@@ -21,9 +21,6 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_MEMORY_H - --/* Define to 1 if you have the header file. */ --#undef HAVE_NETINET_IN_H -- - /* Define to 1 if you have the header file. */ - #undef HAVE_STDINT_H - diff --git a/dateutils-0.1.10.tar.xz b/dateutils-0.1.10.tar.xz deleted file mode 100644 index d7622a0..0000000 --- a/dateutils-0.1.10.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ae847549f36e74fa46f44de8f4a41685c5ac93738d5f14ee86052b81f00b42d4 -size 263292 diff --git a/dateutils-0.2.0.tar.xz b/dateutils-0.2.0.tar.xz new file mode 100644 index 0000000..6e468fa --- /dev/null +++ b/dateutils-0.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8b6bf89360a78c178c15fc585cf7d0601b6a5c278dea2c34ce58214dbaf516be +size 268464 diff --git a/dateutils.changes b/dateutils.changes index 16133d5..83e042c 100644 --- a/dateutils.changes +++ b/dateutils.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Apr 10 11:32:52 UTC 2012 - sweet_f_a@gmx.de + +- bump version 0.2.0, this is a feature release. + * The distinction between binaries for date, time and date-time processing + is cleared up by a unified set of tools, prefixed with `d'. + Thus: + dadd + tadd -> dadd + dconv + tconv + dtconv -> dconv + ddiff + tdiff -> ddiff + dgrep + tgrep -> dgrep + dseq + tseq -> dseq + dtest + ttest -> dtest + * Furthermore, all tools now fully cope with dates, times and date-times. + Virtual timezones have been added (use `GPS' or `TAI'). + * See info page examples and/or README. + ------------------------------------------------------------------- Fri Mar 23 16:04:17 UTC 2012 - sweet_f_a@gmx.de diff --git a/dateutils.spec b/dateutils.spec index daa7a7c..8c2e51e 100644 --- a/dateutils.spec +++ b/dateutils.spec @@ -16,16 +16,16 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%define xversion 0.2.0 + Name: dateutils -Version: 0.1.10 +Version: 0.2.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: %{name}-%{version}.tar.xz -# is upstream merged -Patch1: dateutils-0.1.10-byteswap.patch BuildRequires: pkgconfig BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,18 +39,17 @@ 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 -n %{name}-devel +%package devel Summary: Development files for %{name} Group: Development/Libraries/Other Requires: %{name} = %{version} -%description -n %{name}-devel +%description devel This package contains the header and source files needed for compiling programs using the %{name} libraries. %prep -%setup -q -%patch1 -p1 +%setup -q -n %{name}-%{xversion} %build %configure --docdir=%{_docdir}/%{name} @@ -61,7 +60,10 @@ make V=1 rm -f %{buildroot}%{_infodir}/dir %check -make check +if ! make check; then + cat test/test-suite.log + exit 1 +fi %clean rm -rf %{buildroot} @@ -79,23 +81,23 @@ rm -rf %{buildroot} %files %defattr(-,root,root,-) %doc README -%{_bindir}/[dt]*add -%{_bindir}/[dt]*conv -%{_bindir}/[dt]*diff -%{_bindir}/[dt]*grep -%{_bindir}/[dt]*seq -%{_bindir}/[dt]*test +%{_bindir}/dadd +%{_bindir}/dconv +%{_bindir}/ddiff +%{_bindir}/dgrep +%{_bindir}/dseq +%{_bindir}/dtest %{_bindir}/strptime %doc %{_infodir}/%{name}.info* -%doc %{_mandir}/man1/[dt]*add.1* -%doc %{_mandir}/man1/[dt]*conv.1* -%doc %{_mandir}/man1/[dt]*diff.1* -%doc %{_mandir}/man1/[dt]*grep.1* -%doc %{_mandir}/man1/[dt]*seq.1* -%doc %{_mandir}/man1/[dt]*test.1* +%doc %{_mandir}/man1/dadd.1* +%doc %{_mandir}/man1/dconv.1* +%doc %{_mandir}/man1/ddiff.1* +%doc %{_mandir}/man1/dgrep.1* +%doc %{_mandir}/man1/dseq.1* +%doc %{_mandir}/man1/dtest.1* %doc %{_mandir}/man1/strptime.1* -%files -n %{name}-devel +%files devel %defattr(-,root,root,-) %{_includedir}/dateutils/ %{_libdir}/pkgconfig/libdu[dt]*core.pc