[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/05: gnu: libgweather: Adjust to new timezone name.
From: |
Ludovic Courtès |
Subject: |
01/05: gnu: libgweather: Adjust to new timezone name. |
Date: |
Thu, 20 Oct 2016 20:26:22 +0000 (UTC) |
civodul pushed a commit to branch core-updates
in repository guix.
commit 8b8dfa7f56b5e85b5f73b7d183c149ea9523d3d8
Author: Ludovic Courtès <address@hidden>
Date: Thu Oct 20 21:21:28 2016 +0200
gnu: libgweather: Adjust to new timezone name.
* gnu/packages/gnome.scm (libgweather)[arguments]: In 'pre-check' phase,
update "Asia/Rangoon" timezone name.
---
gnu/packages/gnome.scm | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a45f658..f00eeda 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2598,13 +2598,18 @@ service via the system message bus.")
"/share/zoneinfo"))
#:phases
(modify-phases %standard-phases
- (add-before
- 'check 'pre-check
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "data/check-timezones.sh"
- (("/usr/share/zoneinfo/zone.tab")
- (string-append (assoc-ref inputs "tzdata")
- "/share/zoneinfo/zone.tab")))
+ (add-before 'check 'pre-check
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "data/check-timezones.sh"
+ (("/usr/share/zoneinfo/zone.tab")
+ (string-append (assoc-ref inputs "tzdata")
+ "/share/zoneinfo/zone.tab")))
+
+ ;; 'Asia/Rangoon' was renamed in tzdata-2016:
+ ;;
<https://github.com/eggert/tz/commit/4368251ebf11310a4aadccd1910daeac9080c501>.
+ (substitute* "data/Locations.xml"
+ (("Asia/Rangoon")
+ "Asia/Yangon"))
#t)))))
(native-inputs
`(("glib:bin" ,glib "bin") ; for glib-mkenums