From ff28bf39a86c8e4733128ac07e705d76dfac7362 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 14 Oct 2011 16:52:47 +0200 Subject: [PATCH] State of Bahia, Brazil, to resume Summer Time on Oct 16 --- tzdata-2011l-brazil.patch | 18 ++++++++++++++++++ tzdata.spec | 11 +++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 tzdata-2011l-brazil.patch diff --git a/tzdata-2011l-brazil.patch b/tzdata-2011l-brazil.patch new file mode 100644 index 0000000..b7a2519 --- /dev/null +++ b/tzdata-2011l-brazil.patch @@ -0,0 +1,18 @@ +diff -up tzdata2011l/southamerica\~ tzdata2011l/southamerica +--- tzdata2011l/southamerica~ 2011-10-10 06:15:43.000000000 +0200 ++++ tzdata2011l/southamerica 2011-10-14 16:40:35.679270087 +0200 +@@ -1054,10 +1054,8 @@ Zone America/Maceio -2:22:52 - LMT 1914 + # of America/Salvador. + Zone America/Bahia -2:34:04 - LMT 1914 + -3:00 Brazil BR%sT 2003 Sep 24 +- -3:00 - BRT +-# as noted above, not yet in operation. +-# -3:00 - BRT 2011 Oct 16 +-# -3:00 Brazil BR%sT ++ -3:00 - BRT 2011 Oct 16 ++ -3:00 Brazil BR%sT + # + # Goias (GO), Distrito Federal (DF), Minas Gerais (MG), + # Espirito Santo (ES), Rio de Janeiro (RJ), Sao Paulo (SP), Parana (PR), + +Diff finished. Fri Oct 14 16:40:40 2011 diff --git a/tzdata.spec b/tzdata.spec index c707f2d..805123c 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,10 +3,10 @@ Name: tzdata Version: 2011l %define tzdata_version 2011l %define tzcode_version 2011i -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain Group: System Environment/Base -URL: ftp://elsie.nci.nih.gov/pub/ +URL: ftp://munnari.oz.au/pub/ # The tzdata-base-0.tar.bz2 is a simple building infrastructure and # a test suite. It is occasionally updated from glibc sources, and as @@ -18,6 +18,7 @@ Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz # __decl_patches Patch1: tzdata-2011l-kemerovo.patch +Patch2: tzdata-2011l-brazil.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \ Makeconfig.in > Makeconfig # __apply_patches %patch1 -p0 +%patch2 -p0 # __end mkdir javazic @@ -113,6 +115,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Fri Oct 14 2011 Petr Machata - 2011l-2 +- State of Bahia, Brazil, to resume Summer Time on Oct 16 +- The project moved, reflect this in URL +- Resolves: #746183 + * Tue Oct 11 2011 Petr Machata - 2011l-1 - Upstream 2011l: - Fix ancient stamps for America/Sitka