Hello community,
here is the log from the commit of package ghc-unix-time for openSUSE:Factory
checked in at 2018-12-28 12:35:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-unix-time (Old)
and /work/SRC/openSUSE:Factory/.ghc-unix-time.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ghc-unix-time"
Fri Dec 28 12:35:23 2018 rev:10 rq:661503 version:0.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-unix-time/ghc-unix-time.changes
2018-12-21 08:21:26.721568529 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-unix-time.new.28833/ghc-unix-time.changes
2018-12-28 12:35:30.955955342 +0100
@@ -1,0 +2,12 @@
+Tue Dec 25 03:01:39 UTC 2018 - psim...@suse.com
+
+- Update unix-time to version 0.4.4.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
+Wed Dec 19 13:56:10 UTC 2018 - psim...@suse.com
+
+- Update unix-time to version 0.4.3.
+ Upstream does not provide a change log file.
+
+-------------------------------------------------------------------
Old:
----
unix-time-0.4.0.tar.gz
New:
----
unix-time-0.4.4.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ghc-unix-time.spec ++++++
--- /var/tmp/diff_new_pack.VRtRul/_old 2018-12-28 12:35:31.519954948 +0100
+++ /var/tmp/diff_new_pack.VRtRul/_new 2018-12-28 12:35:31.519954948 +0100
@@ -19,7 +19,7 @@
%global pkg_name unix-time
%bcond_with tests
Name: ghc-%{pkg_name}
-Version: 0.4.0
+Version: 0.4.4
Release: 0
Summary: Unix time parser/formatter and utilities
License: BSD-3-Clause
@@ -29,6 +29,7 @@
BuildRequires: ghc-Cabal-devel
BuildRequires: ghc-binary-devel
BuildRequires: ghc-bytestring-devel
+BuildRequires: ghc-cabal-doctest-devel
BuildRequires: ghc-old-time-devel
BuildRequires: ghc-rpm-macros
%if %{with tests}
++++++ unix-time-0.4.0.tar.gz -> unix-time-0.4.4.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/Setup.hs new/unix-time-0.4.4/Setup.hs
--- old/unix-time-0.4.0/Setup.hs 2018-12-13 02:46:40.000000000 +0100
+++ new/unix-time-0.4.4/Setup.hs 2018-12-24 06:09:10.000000000 +0100
@@ -1,3 +1,33 @@
+{-# LANGUAGE CPP #-}
+{-# OPTIONS_GHC -Wall #-}
+module Main (main) where
+
+#ifndef MIN_VERSION_cabal_doctest
+#define MIN_VERSION_cabal_doctest(x,y,z) 0
+#endif
+
+#if MIN_VERSION_cabal_doctest(1,0,0)
+
+import Distribution.Extra.Doctest ( defaultMainAutoconfWithDoctests )
+main :: IO ()
+main = defaultMainAutoconfWithDoctests "doctests"
+
+#else
+
+#ifdef MIN_VERSION_Cabal
+-- If the macro is defined, we have new cabal-install,
+-- but for some reason we don't have cabal-doctest in package-db
+--
+-- Probably we are running cabal sdist, when otherwise using new-build
+-- workflow
+#warning You are configuring this package without cabal-doctest installed. \
+ The doctests test-suite will not work as a result. \
+ To fix this, install cabal-doctest before configuring.
+#endif
+
import Distribution.Simple
-main = defaultMainWithHooks autoconfUserHooks
+main :: IO ()
+main = defaultMain
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/cbits/strftime.c
new/unix-time-0.4.4/cbits/strftime.c
--- old/unix-time-0.4.0/cbits/strftime.c 2018-12-13 02:46:40.000000000
+0100
+++ new/unix-time-0.4.4/cbits/strftime.c 2018-12-24 06:09:10.000000000
+0100
@@ -476,7 +476,7 @@
else
#endif /* defined TM_ZONE */
if (t->tm_isdst >= 0)
- pt = _add(tzname[t->tm_isdst != 0],
+ pt = _add(_tzname[t->tm_isdst != 0],
pt, ptlim);
/*
* C99 says that %Z must be replaced by the
@@ -514,7 +514,7 @@
* appropriate variables are not available.
*/
if (t->tm_isdst == 0)
- diff = -timezone;
+ diff = -_timezone;
else
#ifdef ALTZONE
diff = -altzone;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/cbits/strptime.c
new/unix-time-0.4.4/cbits/strptime.c
--- old/unix-time-0.4.0/cbits/strptime.c 2018-12-13 02:46:40.000000000
+0100
+++ new/unix-time-0.4.4/cbits/strptime.c 2018-12-24 06:09:10.000000000
+0100
@@ -548,9 +548,9 @@
if (0 == strcmp(zonestr, "GMT") ||
0 == strcmp(zonestr, "UTC")) {
*GMTp = 1;
- } else if (0 == strcmp(zonestr, tzname[0])) {
+ } else if (0 == strcmp(zonestr, _tzname[0])) {
tm->tm_isdst = 0;
- } else if (0 == strcmp(zonestr, tzname[1])) {
+ } else if (0 == strcmp(zonestr, _tzname[1])) {
tm->tm_isdst = 1;
} else {
return (NULL);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/cbits/win_patch.h
new/unix-time-0.4.4/cbits/win_patch.h
--- old/unix-time-0.4.0/cbits/win_patch.h 1970-01-01 01:00:00.000000000
+0100
+++ new/unix-time-0.4.4/cbits/win_patch.h 2018-12-24 06:09:10.000000000
+0100
@@ -0,0 +1,155 @@
+#ifndef UNIX_TIME_WIN_PATCH_H
+#define UNIX_TIME_WIN_PATCH_H
+
+#include "config.h"
+
+#include <sys/cdefs.h>
+
+#include <time.h>
+#include <ctype.h>
+#include <errno.h>
+#include <locale.h>
+#include <stdlib.h>
+#include <string.h>
+#include <pthread.h>
+
+#if defined(_WIN32)
+#include <Windows.h>
+#endif
+
+#if !defined(TM_YEAR_BASE)
+#define TM_YEAR_BASE 1900
+#endif
+
+#if !defined(TM_SUNDAY)
+#define TM_SUNDAY 0
+#endif
+
+#if !defined(TM_MONDAY)
+#define TM_MONDAY 1
+#endif
+
+#if !defined(DAYSPERLYEAR)
+#define DAYSPERLYEAR 366
+#endif
+
+#if !defined(SECSPERMIN)
+#define SECSPERMIN 60
+#endif
+
+#if !defined(MINSPERHOUR)
+#define MINSPERHOUR 60
+#endif
+
+#if !defined(HOURSPERDAY)
+#define HOURSPERDAY 24
+#endif
+
+#if !defined(TM_YEAR_BASE)
+#define TM_YEAR_BASE 1900
+#endif
+
+#if !defined(MONSPERYEAR)
+#define MONSPERYEAR 12
+#endif
+
+#if !defined(DAYSPERWEEK)
+#define DAYSPERWEEK 7
+#endif
+
+#if !defined(DAYSPERNYEAR)
+#define DAYSPERNYEAR 365
+#endif
+
+#ifndef TYPE_BIT
+#define TYPE_BIT(type) (sizeof (type) * CHAR_BIT)
+#endif /* !defined TYPE_BIT */
+
+#ifndef TYPE_SIGNED
+#define TYPE_SIGNED(type) (((type) -1) < 0)
+#endif /* !defined TYPE_SIGNED */
+
+#ifndef INT_STRLEN_MAXIMUM
+/*
+** 302 / 1000 is log10(2.0) rounded up.
+** Subtract one for the sign bit if the type is signed;
+** add one for integer division truncation;
+** add one more for a minus sign if the type is signed.
+*/
+#define INT_STRLEN_MAXIMUM(type) \
+ ((TYPE_BIT(type) - TYPE_SIGNED(type)) * 302 / 1000 + \
+ 1 + TYPE_SIGNED(type))
+#endif /* !defined INT_STRLEN_MAXIMUM */
+
+#define isspace_l _isspace_l
+#define isupper_l _isupper_l
+#define isdigit_l _isdigit_l
+
+#if !HAVE_STRTOL_L
+long strtol_l(const char *nptr, char **endptr, int base, _locale_t locale);
+#endif
+
+#if !HAVE_STRTOLL_L
+long long strtoll_l(const char *nptr, char **endptr, int base, _locale_t
locale);
+#endif
+
+#define isleap(y) (((y) % 4) == 0 && (((y) % 100) != 0 || ((y) % 400) == 0))
+
+#ifndef isleap_sum
+/*
+** See tzfile.h for details on isleap_sum.
+*/
+#define isleap_sum(a, b) isleap((a) % 400 + (b) % 400)
+#endif /* !defined isleap_sum */
+
+int isblank_l( int c, _locale_t _loc);
+
+int strncasecmp_l(const char *s1, const char *s2, int len, _locale_t _loc);
+
+struct tm *gmtime_r(const time_t *_time_t, struct tm *_tm);
+
+struct tm *localtime_r(const time_t *_time_t, struct tm *_tm);
+
+#if HAVE__MKGMTIME
+#define timegm _mkgmtime
+#define HAVE_TIMEGM 1
+#endif
+
+#define fprintf_l(fp, loc, ...) fprintf(fp, ##__VA_ARGS__)
+#define sprintf_l(buf, loc, ...) sprintf(buf, ##__VA_ARGS__)
+
+struct lc_time_T {
+ const char *mon[12];
+ const char *month[12];
+ const char *wday[7];
+ const char *weekday[7];
+ const char *X_fmt;
+ const char *x_fmt;
+ const char *c_fmt;
+ const char *am;
+ const char *pm;
+ const char *date_fmt;
+ const char *alt_month[12];
+ const char *md_order;
+ const char *ampm_fmt;
+};
+
+extern const struct lc_time_T _C_time_locale;
+
+int _patch_setenv(const char *var, const char *val, int ovr);
+
+int _patch_unsetenv(const char *name);
+
+size_t _patch_strftime(char * __restrict s, size_t maxsize, const char *
__restrict format,
+ const struct tm * __restrict t);
+
+size_t _patch_strftime_l(char * __restrict s, size_t maxsize, const char *
__restrict format,
+ const struct tm * __restrict t, _locale_t loc);
+
+char *strptime_l(const char * __restrict buf, const char * __restrict fmt,
+ struct tm * __restrict tm, _locale_t loc);
+
+char *strptime(const char * __restrict buf, const char * __restrict fmt,
+ struct tm * __restrict tm);
+
+#endif // UNIX_TIME_WIN_PATCH_H
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/test/doctests.hs
new/unix-time-0.4.4/test/doctests.hs
--- old/unix-time-0.4.0/test/doctests.hs 2018-12-13 02:46:40.000000000
+0100
+++ new/unix-time-0.4.4/test/doctests.hs 2018-12-24 06:09:10.000000000
+0100
@@ -1,11 +1,12 @@
module Main where
-import Test.DocTest
+import Build_doctests (flags, pkgs, module_sources)
+import Data.Foldable (traverse_)
+import Test.DocTest (doctest)
main :: IO ()
-main = doctest [
- "-XOverloadedStrings"
- , "-idist/build"
- , "dist/build/cbits/conv.o"
- , "Data/UnixTime.hs"
- ]
+main = do
+ traverse_ putStrLn args
+ doctest args
+ where
+ args = ["-XOverloadedStrings"] ++ flags ++ pkgs ++ module_sources
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/unix-time-0.4.0/unix-time.cabal
new/unix-time-0.4.4/unix-time.cabal
--- old/unix-time-0.4.0/unix-time.cabal 2018-12-13 02:46:40.000000000 +0100
+++ new/unix-time-0.4.4/unix-time.cabal 2018-12-24 06:09:10.000000000 +0100
@@ -1,5 +1,5 @@
Name: unix-time
-Version: 0.4.0
+Version: 0.4.4
Author: Kazu Yamamoto <k...@iij.ad.jp>
Maintainer: Kazu Yamamoto <k...@iij.ad.jp>
License: BSD3
@@ -8,10 +8,20 @@
Description: Fast parser\/formatter\/utilities for Unix time
Category: Data
Cabal-Version: >= 1.10
-Build-Type: Configure
-Extra-Source-Files: cbits/conv.c cbits/config.h.in configure configure.ac
+Build-Type: Custom
+Extra-Source-Files: cbits/config.h.in
+ cbits/conv.c
+ cbits/strftime.c
+ cbits/strptime.c
+ cbits/win_patch.c
+ cbits/win_patch.h
+ configure
+ configure.ac
Extra-Tmp-Files: config.log config.status autom4te.cache cbits/config.h
+Custom-Setup
+ Setup-Depends: base, Cabal, cabal-doctest >=1.0.6 && <1.1
+
Library
Default-Language: Haskell2010
GHC-Options: -Wall
@@ -26,6 +36,7 @@
, bytestring
, old-time
, binary
+ Build-Tools: hsc2hs
C-Sources: cbits/conv.c
if os(windows)
C-Sources: cbits/strftime.c
@@ -33,7 +44,7 @@
, cbits/win_patch.c
include-dirs: cbits
-Test-Suite doctest
+Test-Suite doctests
Type: exitcode-stdio-1.0
Default-Language: Haskell2010
HS-Source-Dirs: test
@@ -41,6 +52,7 @@
Main-Is: doctests.hs
Build-Depends: base
, doctest >= 0.9.3
+ , unix-time
Test-Suite spec
Type: exitcode-stdio-1.0
