setup: Drop /etc/environment

[ipfire-3.x.git] / tzdata / tzdata.nm

diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 434fb68cf6fa1445da5c4a02474100a29bdd755b..b05a04a6dfebb1cded0d65163d239d1a324de21e 100644 (file)
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-tzdata_version = 2014j
-tzcode_version = 2014j
+tzdata_version = 2019a
+tzcode_version = 2019a
 
 name       = tzdata
 version    = %{tzdata_version}
@@ -12,7 +12,7 @@ release    = 1
 arch       = noarch
 
 groups     = System/Base
-url        = http://www.iana.org/time-zones
+url        = https://www.iana.org/time-zones
 license    = Public Domain
 summary    = Timezone data.
 
@@ -21,7 +21,7 @@ description
        the world.
 end
 
-source_dl += http://www.iana.org/time-zones/repository/releases/
+source_dl += https://www.iana.org/time-zones/repository/releases/
 sources    = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
 
 build
@@ -63,7 +63,7 @@ build
 
        install
                mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
-               cp -prd zoneinfo %{BUILDROOT}%{datadir}/zoneinfo
+               cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
 
                install -p -m 644 zone.tab iso3166.tab \
                        %{BUILDROOT}%{datadir}/zoneinfo