Upstream 2012c

This commit is contained in:
Petr Machata 2012-04-02 19:21:11 +02:00
parent 14b4c0ccba
commit 727c767513
3 changed files with 11 additions and 6 deletions

1
.gitignore vendored
View File

@ -71,3 +71,4 @@ noarch/
/tzdata2011n.tar.gz /tzdata2011n.tar.gz
/tzdata2012b.tar.gz /tzdata2012b.tar.gz
/tzcode2012b.tar.gz /tzcode2012b.tar.gz
/tzdata2012c.tar.gz

View File

@ -1,4 +1,4 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
0615fd29def380a917e528433c820368 tzdata2012b.tar.gz
6137322ffd36e1fd5128885be1c57008 tzcode2012b.tar.gz 6137322ffd36e1fd5128885be1c57008 tzcode2012b.tar.gz
cfdc2710bd05c26dbd624441d57028f6 tzdata2012c.tar.gz

View File

@ -1,9 +1,9 @@
Summary: Timezone data Summary: Timezone data
Name: tzdata Name: tzdata
Version: 2012b Version: 2012c
%define tzdata_version 2012b %define tzdata_version 2012c
%define tzcode_version 2012b %define tzcode_version 2012b
Release: 3%{?dist} Release: 1%{?dist}
License: Public Domain License: Public Domain
Group: System Environment/Base Group: System Environment/Base
URL: ftp://munnari.oz.au/pub/ URL: ftp://munnari.oz.au/pub/
@ -17,7 +17,6 @@ Source0: tzdata-base-0.tar.bz2
Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
# __decl_patches # __decl_patches
Patch1: tzdata-2012b-morocco.patch
# __end # __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -54,7 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
pushd tzdata%{tzdata_version} pushd tzdata%{tzdata_version}
# __apply_patches # __apply_patches
%patch1 -p1
# __end # __end
popd popd
@ -118,6 +116,12 @@ rm -rf %{buildroot}
%{_datadir}/javazi %{_datadir}/javazi
%changelog %changelog
* Mon Apr 2 2012 Petr Machata <pmachata@redhat.com> - 2012c-1
- Upstream 2012c
- Haiti observes DST from 2012 on
- Gaza Strip and Hebron observe DST in 2012
- Change start of DST in Syria to last Friday in March
* Fri Mar 16 2012 Petr Machata <pmachata@redhat.com> - 2012b-3 * Fri Mar 16 2012 Petr Machata <pmachata@redhat.com> - 2012b-3
- Morocco moved DST entry to last Sunday of April - Morocco moved DST entry to last Sunday of April