- updated to 2015b

[packages/tzdata.git] / tzdata.spec

diff --git a/tzdata.spec b/tzdata.spec
index 2f071296245ab4928f5f6498ec184b2036ecb054..b2b1bc0192a1268359cabd06970bb6e8795bd89d 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -9,8 +9,8 @@
 %endif
 %endif
 
-%define                tzcode_ver      2013d
-%define                tzdata_ver      2013d
+%define                tzcode_ver      2015b
+%define                tzdata_ver      2015b
 Summary:       Timezone data
 Summary(pl.UTF-8):     Dane o strefach czasowych
 Name:          tzdata
@@ -27,10 +27,10 @@ Source0:    %{name}-base-0.tar.bz2
 # ftp://elsie.nci.nih.gov/pub/ has been shut down because of lawsuit
 #Source1Download: http://www.iana.org/time-zones/
 Source1:       ftp://ftp.iana.org/tz/releases/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5: 65b6818162230fc02f86f293376c73df
+# Source1-md5: 75571bb17c7b6be88a9f8872e45bc726
 #Source2Download: http://www.iana.org/time-zones/
 Source2:       ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5: 4616a9560270f180eeb9a08540636890
+# Source2-md5: f073a7c9bca7f9fe408491f826e92968
 Source3:       timezone.init
 Source4:       timezone.sysconfig
 Source5:       javazic.tar.gz
@@ -38,6 +38,7 @@ Source5:      javazic.tar.gz
 Source6:       timezone.upstart
 Source7:       timezone.service
 Source8:       timezone.sh
+Patch0:                %{name}-test-update.patch
 Patch1:                javazic-fixup.patch
 Patch2:                install.patch
 URL:           http://www.twinsun.com/tz/tz-link.htm
@@ -108,9 +109,12 @@ Plik nagłówkowy bazy danych stref czasowych.
 %prep
 %setup -qc
 mv tzdata/* .
+%patch0 -p1
+
 %{__tar} xzf %{SOURCE1} -C tzdata
 # don't override Makefile from base tar
-mv tzdata/Makefile{,.tzdata}
+%{__mv} tzdata/Makefile{,.tzdata}
+
 install -d tzcode
 %{__tar} xzf %{SOURCE2} -C tzcode
 %patch2 -p1
@@ -153,7 +157,7 @@ cd ../tzdata
 %java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
        -d ../zoneinfo/java \
        africa antarctica asia australasia europe northamerica pacificnew \
-       southamerica backward etcetera solar87 solar88 solar89 systemv \
+       southamerica backward etcetera factory systemv \
        ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
 cd ..
 %endif