diff --git a/timezone-java.changes b/timezone-java.changes
index 0db5396..ca1b305 100644
--- a/timezone-java.changes
+++ b/timezone-java.changes
@@ -1,5 +1,15 @@
-------------------------------------------------------------------
-Sun Jun 14 15:22:29 UTC 2015 - astieger@suse.com
+Fri Aug 14 13:06:18 UTC 2015 - astieger@suse.com
+
+- timezone update 2015f [boo#941249]
+ * North Korea switches to +0830 on 2015-08-15, abbreviation
+ remains "KST".
+ * Uruguay no longer observes DST.
+ * Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
+- unfuzz tzcode-symlink.patch and tzcode-link.diff
+
+-------------------------------------------------------------------
+Sun Jun 14 15:32:39 UTC 2015 - astieger@suse.com
- timezone update 2015e [boo#934654]
* Morocco will suspend DST from 2015-06-14 03:00 through
@@ -7,6 +17,13 @@ Sun Jun 14 15:22:29 UTC 2015 - astieger@suse.com
* Assume Cayman Islands will observe DST starting next year,
using US rules.
* The file 'iso3166.tab' now uses UTF-8
+ * When displaying data, tzselect converts it to the current
+ locale's encoding if the iconv command works.
+ * tzselect no longer mishandles Dominica, fixing a bug introduced
+ in Release 2014f.
+ * zic -l no longer fails when compiled with
+ -DTZDEFAULT=\"/etc/localtime\", regression from 2014f.
+ Dropping upstreamed tzcode-zic-empty-comp.diff
-------------------------------------------------------------------
Tue May 19 11:02:27 UTC 2015 - lchiquitto@suse.com
diff --git a/timezone-java.spec b/timezone-java.spec
index 7c29906..4f9ce69 100644
--- a/timezone-java.spec
+++ b/timezone-java.spec
@@ -25,7 +25,7 @@ License: BSD-3-Clause and SUSE-Public-Domain
Group: System/Base
# COMMON-BEGIN
# COMMON-BEGIN
-Version: 2015e
+Version: 2015f
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
diff --git a/timezone.changes b/timezone.changes
index dfb6624..ca1b305 100644
--- a/timezone.changes
+++ b/timezone.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Aug 14 13:06:18 UTC 2015 - astieger@suse.com
+
+- timezone update 2015f [boo#941249]
+ * North Korea switches to +0830 on 2015-08-15, abbreviation
+ remains "KST".
+ * Uruguay no longer observes DST.
+ * Moldova starts and ends DST at 00:00 UTC, not at 01:00 UTC.
+- unfuzz tzcode-symlink.patch and tzcode-link.diff
+
-------------------------------------------------------------------
Sun Jun 14 15:32:39 UTC 2015 - astieger@suse.com
diff --git a/timezone.spec b/timezone.spec
index 1888995..fe20f05 100644
--- a/timezone.spec
+++ b/timezone.spec
@@ -23,7 +23,7 @@ Group: System/Base
Url: http://www.iana.org/time-zones
PreReq: filesystem, coreutils
# COMMON-BEGIN
-Version: 2015e
+Version: 2015f
Release: 0
Source: ftp://ftp.iana.org/tz/releases/tzdata%{version}.tar.gz
Source1: ftp://ftp.iana.org/tz/releases/tzcode%{version}.tar.gz
diff --git a/tzcode-link.diff b/tzcode-link.diff
index a19770d..e5ac3f2 100644
--- a/tzcode-link.diff
+++ b/tzcode-link.diff
@@ -15,11 +15,11 @@ This patch changes the order to:
2. File copy
3. Symbolic link
-Index: timezone-2015d/zic.c
+Index: timezone-2015f/zic.c
===================================================================
---- timezone-2015d.orig/zic.c
-+++ timezone-2015d/zic.c
-@@ -734,6 +734,23 @@ relname(char const *dir, char const *bas
+--- timezone-2015f.orig/zic.c
++++ timezone-2015f/zic.c
+@@ -738,6 +738,23 @@ relname(char const *dir, char const *bas
}
}
@@ -41,9 +41,9 @@ Index: timezone-2015d/zic.c
+}
+
static void
- dolink(const char *const fromfield, const char *const tofield)
+ dolink(char const *fromfield, char const *tofield)
{
-@@ -763,6 +780,8 @@ dolink(const char *const fromfield, cons
+@@ -767,6 +784,8 @@ dolink(char const *fromfield, char const
exit(EXIT_FAILURE);
result = link(fromname, toname);
diff --git a/tzcode-symlink.patch b/tzcode-symlink.patch
index fb6348d..d13624f 100644
--- a/tzcode-symlink.patch
+++ b/tzcode-symlink.patch
@@ -13,11 +13,11 @@ This patch changes the logic slightly: keep using symbolic
links if /etc/localtime is already one. If it isn't, use
the default order as listed above.
-Index: timezone-2015d/zic.c
+Index: timezone-2015f/zic.c
===================================================================
---- timezone-2015d.orig/zic.c
-+++ timezone-2015d/zic.c
-@@ -104,7 +104,7 @@ static int addtype(zic_t, char const *,
+--- timezone-2015f.orig/zic.c
++++ timezone-2015f/zic.c
+@@ -105,7 +105,7 @@ static int addtype(zic_t, char const *,
static void leapadd(zic_t, bool, int, int);
static void adjleap(void);
static void associate(void);
@@ -26,7 +26,7 @@ Index: timezone-2015d/zic.c
static char ** getfields(char * buf);
static zic_t gethms(const char * string, const char * errstring,
bool);
-@@ -629,7 +629,7 @@ _("%s: More than one -L option specified
+@@ -633,7 +633,7 @@ _("%s: More than one -L option specified
*/
for (i = 0; i < nlinks; ++i) {
eat(links[i].l_filename, links[i].l_linenum);
@@ -35,7 +35,7 @@ Index: timezone-2015d/zic.c
if (noise)
for (j = 0; j < nlinks; ++j)
if (strcmp(links[i].l_to,
-@@ -638,11 +638,11 @@ _("%s: More than one -L option specified
+@@ -642,11 +642,11 @@ _("%s: More than one -L option specified
}
if (lcltime != NULL) {
eat(_("command line"), 1);
@@ -49,12 +49,12 @@ Index: timezone-2015d/zic.c
}
if (warnings && (ferror(stderr) || fclose(stderr) != 0))
return EXIT_FAILURE;
-@@ -735,14 +735,17 @@ relname(char const *dir, char const *bas
+@@ -739,14 +739,17 @@ relname(char const *dir, char const *bas
}
static void
--dolink(const char *const fromfield, const char *const tofield)
-+dolink(const char *const fromfield, const char *const tofield, int defaultsymlink)
+-dolink(char const *fromfield, char const *tofield)
++dolink(char const *fromfield, char const *tofield, int defaultsymlink)
{
+ struct stat st;
register char * fromname;
@@ -68,7 +68,7 @@ Index: timezone-2015d/zic.c
/*
** We get to be careful here since
** there's a fair chance of root running us.
-@@ -756,14 +759,14 @@ dolink(const char *const fromfield, cons
+@@ -760,14 +763,14 @@ dolink(char const *fromfield, char const
}
if (itsdir(toname) <= 0)
remove(toname);
diff --git a/tzcode2015e.tar.gz b/tzcode2015e.tar.gz
deleted file mode 100644
index b86223f..0000000
--- a/tzcode2015e.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b5a217b55847fb56f470a7738939c36f3a520d6cc12342d965cfcf848e59ada0
-size 185129
diff --git a/tzcode2015e.tar.gz.asc b/tzcode2015e.tar.gz.asc
deleted file mode 100644
index a29c334..0000000
--- a/tzcode2015e.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVfG8zAAoJEO2X6Q5iqn4014YP/jGiiK7VYqstDoQNm33/pOwx
-WlwTSkzByrhx0whaaAlTQ+j61q2MdZaDlpdDd4CEGN1vWaiI26MOEbZEKVpW5ogm
-xKGL9esGltoc3jelmWJTVf0e03l+k0+zDcnBq+58Pi5rkgM/WVFyZBDyCT5HGLq+
-NPaHLHU4dlWtwpyd9Mr4eMb6DPEM4zbTK2NbHh/uf+ODG8F1VW8FP63N/hqq4Y/q
-4H+ngf9jJxw73pBri/WBmidSxLWhhc+woezhKqbCThto4Jhoehlp3txIqBmAoN3G
-AwppaGiHV6PYheLqloCDmdxABMoS95tznuk8eL2FF69IP541kaOchHvKCnbEf6gu
-Sdr388Ayli/C98ZQknwzNWVlfKKW+d+nidS5iGyEHRpI/42RPemGh5kgYmZucZpH
-DRIbujsi9usxjrazWC8oGf7WH6D6ZmsUusl7pj071YnU0gpXyVSk9GUoMWIp3Wxc
-CSHJWxF6lkxOmHDqZFHhcVyyKlPHXFpWpDUPhu/QTi7oiSQeXRoP9BQAz07oN8WS
-69JUSxCvkFANkFxnx6knsDBwduFUqiZ209WwV0R72DI/7Gi6OuubXUvgcQfJOHab
-wOyEInI32uHRKxEaQuDmu1PSzlur0iNGH3PtuQzgwLlMM0KXsRbLBhOO5zP2BgQ6
-zVgFQ9FGlnExUxsBcnTf
-=BRRd
------END PGP SIGNATURE-----
diff --git a/tzcode2015f.tar.gz b/tzcode2015f.tar.gz
new file mode 100644
index 0000000..dd135eb
--- /dev/null
+++ b/tzcode2015f.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0c95e0a42bb61141f790f4f5f204b954d7654c894aa54a594a215d6f38de84ae
+size 180742
diff --git a/tzcode2015f.tar.gz.asc b/tzcode2015f.tar.gz.asc
new file mode 100644
index 0000000..d1294b3
--- /dev/null
+++ b/tzcode2015f.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVyUtJAAoJEO2X6Q5iqn403AUP/A4bYIu7hVztxaMBlQ93XE3i
+TEopwXq7eH6YuwgIIAjQCLTrFeYj3LmWlDNaO4eGgZxr6NoN1QcrNKeHjQSDcP35
+pNJs+KonQhakxQn8TXBfhhQkhJNIoUOfGxgao5aYC2ZWZXWJ9NTKuc+JTcd1AM73
+R3SQdsONkBqtCXjINEAYqj1rYHBpYRfZ1Gx7NA8Ryg2JDi9Od3trwZofTcLMqcnt
+PoHrOq6JV1mdEN7e9GyxOEt4FxjfPBmYVoaAqyZG+sJCLYtcFVWLUvCQBKOjPLbI
+4gFw36eqylDHxbTlQkymv1Ys1wQh09/J0SZE68H/g6nUIVpdqbYsm86oj3Di2fod
+7O7CdJpgnpreoXW2/C5UoRJjpZGSuvHyHYOi5leFLvQMEqoJE6c1heXQxlFMdDqU
+sAQg+A+1LKUo9pBg7kZugerfq19iekWeXbDQwRIoOk5kxQv2p2ILprVglxfztmOp
+7qc+I+1tWDWlqu3eOglhDlO43SltYha6Mkvj0bINK4KBjsWXCXbvorsbCeGsl35W
+m1yA9Ot/wCpqGPmHUxykaoK7ncvP82iCF9QbO/0/GhgjLmbf1mbech5JTa7Cw/IX
+7z9BS7dn7ZPaRvPB0onXVM/3i6KfgF1qx4ikS05rnwKoy8EYmC5yoOoksltzi1lw
+LlupIt5hqHPqvmaW1npi
+=dUDd
+-----END PGP SIGNATURE-----
diff --git a/tzdata2015e.tar.gz b/tzdata2015e.tar.gz
deleted file mode 100644
index 0911732..0000000
--- a/tzdata2015e.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ffc9b5d38abda8277aa479e3f75aa7668819d0977cd1a0c8ef3b09128334ba6f
-size 296773
diff --git a/tzdata2015e.tar.gz.asc b/tzdata2015e.tar.gz.asc
deleted file mode 100644
index 8052fbb..0000000
--- a/tzdata2015e.tar.gz.asc
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQIcBAABAgAGBQJVfG8/AAoJEO2X6Q5iqn40ed0P/jn6lgG6tH+C2Xv2DYz5buRK
-CMDoGidznyzDuPSNgSPRaDetoKQ/6iVzEIgHYwBxBtmKmPXUgSY8rJPCabSLNKWK
-T3o7f8aREnIcfexmct/4DEeUOXePUIbSHnX6Noy3AmSvIsKT8ZahEpnELKgWFQD8
-0EEOlck1rTTpEi9G2RATUwr430ii1OguIt0sKYycTvT1VFdihKWoFhgV9ydgaMh2
-88he3Ornt4xd4/b278IJl3GI0WWVbVl2A+ziRPAkl3AH7iW7mTcv+/8i3u7txVW+
-zB47UHOfV9jpiecLUQDw42KZJTlS+AkbgCitrpL++bZz1WQHWP9JkpgvAR8bdkBf
-WPNvcPXiG0I6Vtl2ZZrc2WXi9L22m0xIJA2so4vpBwBIMkTnaFa6VthLGy9UgHpA
-wteG6OogfdNm7fv+GhuRUNuHtd5TP5HdywhWMrMtGqgOvkEm/lF6tRMd12Wm57IW
-u72Gv3RrJILBuOvBvWPZJMNsjc8Uj1U+dhKa8Z51VHA85ZyiRM3mQr8g+1WETH/E
-sjnj8NgKkh7TL/N5vWJH1M3g1XZ3uofPL1Cbyqg04BGrMytxGAjigzIDbbg5pky+
-yFUqR3qm12d9QPlm1xh35qxqYYDXcbiQkXENwGukLRzcc0jdU4BrFpDc1tVgukUg
-TmCC2ALEcxWWPEc1vtUG
-=gO91
------END PGP SIGNATURE-----
diff --git a/tzdata2015f.tar.gz b/tzdata2015f.tar.gz
new file mode 100644
index 0000000..16ba20c
--- /dev/null
+++ b/tzdata2015f.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:959f81b541e042ecb13c50097d264ae92ff03a57979c478dbcf24d5da242531d
+size 298815
diff --git a/tzdata2015f.tar.gz.asc b/tzdata2015f.tar.gz.asc
new file mode 100644
index 0000000..5adcbb7
--- /dev/null
+++ b/tzdata2015f.tar.gz.asc
@@ -0,0 +1,17 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQIcBAABAgAGBQJVyUtQAAoJEO2X6Q5iqn40is8P/006dw57YcxGLaPn767wjhf4
+6P+c4s3fAPXofc08Gd5kr97NVNPPmi2is7DKjJ7X8rie2208qf9tGiF37V0bzf6J
+TfbNRzoaja7qW+i58iHeZOEJiuapF/DO6pR/PA0y1dINemlowQfQECYq2TtIN0uK
+ZwnxL67fnGBAJyI0uhlBUP+YoV4/8Lzw3/or0qP2fudBmEuQoMgqeLKbE4KholPF
+RmdGcEgX8gFvXcmYG3nA0LQ1GeTCuCuf09HjTOddv66IUjM7nnzgaksBuDhKB5GT
+UZMhGnEQF+iSfe0Sbg28AA1F1G2Obd+vbnvPe1s0t9Q8hVvk0QHf7al9PAIEaMrf
+Dpv5hKl720aHeE5nO0AywJXtizJOWpUffghgQywYxVDAonYgir/5x54ibgTLEvzn
+qCAo3J4fwHcmWkH4LOFIRgjq2NSIZcoX/yORf/u1YOEBlx9fviEE70jOZwziXGra
+jZTyujhaIB4/JeCKKR7dfAARvuSztDKcuMSNhHJGrojR0Vb37ghOIiZlDHaMOAxk
+VaIDUQEcqHV9QCoZVkhp7lpYTRDAX6LcbBOf+pdm4yJdrmdVQ0uR4Lnvpep5Ctil
+QcoQ3NiVQkdmDQGjohe+ReQb6n9vE8VKr8sYZuU9Zvbk9tNyWSeTDFmsEJWlH0Iy
+uEa8hH03uLJpelMpkRK7
+=B5lv
+-----END PGP SIGNATURE-----