[tzdata/f17: 5/5] Merge branch 'f16' into f17

[Petr Machata]

commit 7f92ed62a2b8a68efc53528c2daa32c11713bcc9
Merge: b7923f9 114eb58
Author: Petr Machata <pmachata at redhat.com>
Date:   Fri Feb 24 13:46:53 2012 +0100

    Merge branch 'f16' into f17
    
    Conflicts:
    	tzdata.spec

 tzdata-2011n-chile.patch |   43 +++++++++++++++++++++++++++++++++++++++++++
 tzdata.spec              |   17 +++++++++++++----
 2 files changed, 56 insertions(+), 4 deletions(-)
---
diff --cc tzdata.spec
index 4ca7d2f,9677d08..2113b4a
--- a/tzdata.spec
+++ b/tzdata.spec
@@@ -3,7 -3,7 +3,7 @@@ Name: tzdat
  Version: 2011n
  %define tzdata_version 2011n
  %define tzcode_version 2011i
--Release: 4%{?dist}
++Release: 5%{?dist}
  License: Public Domain
  Group: System Environment/Base
  URL: ftp://munnari.oz.au/pub/
@@@ -115,12 -120,13 +120,16 @@@ rm -rf %{buildroot
  %{_datadir}/javazi
  
  %changelog
 -* Fri Feb 24 2012 Petr Machata <pmachata at redhat.com> - 2011n-4
++* Fri Feb 24 2012 Petr Machata <pmachata at redhat.com> - 2011n-5
+ - Add a patch for change in Chilean DST
+ - Update URLs
+ 
 -* Tue Feb 21 2012 Petr Machata <pmachata at redhat.com> - 2011n-3
 +* Tue Feb 21 2012 Petr Machata <pmachata at redhat.com> - 2011n-4
  - Add a patch for the leap second that will occur this summer
  
 +* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2011n-3
 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 +
  * Thu Nov  3 2011 Petr Machata <pmachata at redhat.com> - 2011n-2
  - Fix building of Java zones.  Patch by Deepak Bhole