Merge remote-tracking branch 'origin/master'
Conflicts: tzdata.spec
This commit is contained in:
commit
5ed8fc0ee8
@ -3,7 +3,7 @@ Name: tzdata
|
|||||||
Version: 2011b
|
Version: 2011b
|
||||||
%define tzdata_version 2011b
|
%define tzdata_version 2011b
|
||||||
%define tzcode_version 2011b
|
%define tzcode_version 2011b
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
License: Public Domain
|
License: Public Domain
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
URL: ftp://elsie.nci.nih.gov/pub/
|
URL: ftp://elsie.nci.nih.gov/pub/
|
||||||
@ -113,11 +113,14 @@ rm -rf %{buildroot}
|
|||||||
%{_datadir}/javazi
|
%{_datadir}/javazi
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Thu Mar 03 2011 Petr Machata <pmachata@redhat.com> - 2011b-2
|
* Thu Mar 03 2011 Petr Machata <pmachata@redhat.com> - 2011b-3
|
||||||
- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
|
- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
|
||||||
for Metlakatla. Sitka and Metlakatla are new zones.
|
for Metlakatla. Sitka and Metlakatla are new zones.
|
||||||
- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
|
- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
|
||||||
|
|
||||||
|
* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2011b-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Feb 09 2011 Petr Machata <pmachata@redhat.com> - 2011b-1
|
* Wed Feb 09 2011 Petr Machata <pmachata@redhat.com> - 2011b-1
|
||||||
- Upstream 2011b:
|
- Upstream 2011b:
|
||||||
- America/North_Dakota/Beulah: Mercer County, North Dakota, changed
|
- America/North_Dakota/Beulah: Mercer County, North Dakota, changed
|
||||||
|
Loading…
Reference in New Issue
Block a user