rpms/tzdata/FC-1 .cvsignore, 1.4, 1.5 sources, 1.4, 1.5 tzdata.spec, 1.3, 1.4

[fedora-cvs-commits at redhat.com]

Author: pmachata

Update of /cvs/dist/rpms/tzdata/FC-1
In directory cvs.devel.redhat.com:/tmp/cvs-serv22315

Modified Files:
	.cvsignore sources tzdata.spec 
Log Message:
Pushing upstream changes. This fixes #173091.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-1/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	9 Sep 2004 13:43:00 -0000	1.4
+++ .cvsignore	6 Jan 2006 20:43:42 -0000	1.5
@@ -1,2 +1,3 @@
 tzdata.tar.bz2
-tzdata2004b.tar.gz
+tzdata2005r.tar.gz
+tzcode2005r.tar.gz


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-1/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	9 Sep 2004 13:43:00 -0000	1.4
+++ sources	6 Jan 2006 20:43:42 -0000	1.5
@@ -1,2 +1,3 @@
-d20ffc3a857fd1714daadf8edacfb37a  tzdata.tar.bz2
-8e1443ccafd17648a105d15c0d63858f  tzdata2004b.tar.gz
+325dba39b9741b63b94e4c05a3fefd5c  tzdata.tar.bz2
+b692c04a6a41080e214add0d3f58c700  tzdata2005r.tar.gz
+063ea36d9257eb6779b1df847b04d8ab  tzcode2005r.tar.gz


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-1/tzdata.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tzdata.spec	9 Sep 2004 13:43:00 -0000	1.3
+++ tzdata.spec	6 Jan 2006 20:43:42 -0000	1.4
@@ -1,11 +1,12 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2004b
+Version: 2005r
 Release: 1.fc1
-Copyright: GPL
+License: GPL
 Group: System Environment/Base
 Source0: %{name}.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
 Buildroot: /var/tmp/tzdata-root
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
@@ -19,6 +20,8 @@
 %setup -n tzdata
 mkdir %{name}%{version}
 tar xzf %{SOURCE1} -C %{name}%{version}
+mkdir tzcode%{version}
+tar xzf %{SOURCE2} -C tzcode%{version}
 
 %build
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
@@ -26,6 +29,7 @@
     -e 's|@install_root@|%{buildroot}|' \
   Makeconfig.in > Makeconfig
 make
+grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
 
 %install
 make install
@@ -39,8 +43,75 @@
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
+%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 
 %changelog
+* Thu Jan  5 2006 Petr Machata <pmachata at redhat.com> 2005r-1.fc1
+- 2005r
+  - Zones EST, MST, HST, EST5EDT, CST6CDT, MST7MDT, PST8PDT moved to
+    northamerica to guard against old files with obsolete information
+    being left in the time zone binary directory.
+  - Changes for countries that are supposed to join 2007 US DST
+    change.  This includes most of Canada, however entries already in
+    the database (Alberta, British Columbia, Newfoundland, Northwest
+    Territories, and Yukon) were left alone for the time being.
+  - Fixes in zdump.c (abbrok): conditions are chained, and the string
+    is checked for emptiness.
+
+* Sat Dec 17 2005 Jakub Jelinek <jakub at redhat.com> 2005q-2
+- 2005q
+  - changes for Georgia, Azerbaijan, Jordan, Palestine, Cuba, Nicaragua
+  - SystemV timezone changes
+
+* Wed Nov  2 2005 Jakub Jelinek <jakub at redhat.com> 2005n-2
+- 2005n
+  - changes for Kyrgyzstan and Uruguay
+- fix a typo in the Makefile (used TZDATA env var instead of TZDIR during
+  make check), update tst-timezone.c from glibc CVS (#172102)
+
+* Tue Sep  6 2005 Jakub Jelinek <jakub at redhat.com> 2005m-2
+- 2005m
+  - changes for USA (extending DST by 4 weeks since 2007), Tunisia,
+    Australia, Kazakhstan
+  - historical timezone data changes for Japan, Poland, Northern Ireland and
+    Mali
+  - timezone name change for East Timor
+
+* Fri Jul 15 2005 Jakub Jelinek <jakub at redhat.com> 2005k-2
+- 2005k
+  - leap seconds update
+
+* Sat Apr 30 2005 Jakub Jelinek <jakub at redhat.com> 2005i-2
+- 2005i
+  - updates for Iran, Haiti and Nicaragua
+
+* Mon Apr  4 2005 Jakub Jelinek <jakub at redhat.com> 2005h-2
+- 2005h
+  - fixes for Kazakhstan
+
+* Thu Mar 17 2005 Jakub Jelinek <jakub at redhat.com> 2005g-2
+- 2005g
+  - fixes for Uruguay
+- include README and Theory from tzcode tarball in %{_docdir};
+  Theory includes a good summary of how the timezone data files
+  are supposed to be named
+
+* Tue Mar  1 2005 Jakub Jelinek <jakub at redhat.com> 2005f-2
+- 2005f
+  - more updates for Israel, updates for Azerbaijan
+
+* Wed Jan 26 2005 Jakub Jelinek <jakub at redhat.com> 2005c-3
+- 2005c
+  - updates for Israel and Paraguay
+
+* Mon Nov 29 2004 Jakub Jelinek <jakub at redhat.com> 2004g-1
+- 2004g (#141107)
+  - updates for Cuba
+
+* Mon Oct 11 2004 Jakub Jelinek <jakub at redhat.com> 2004e-2
+- 2004e (#135194)
+  - updates for Brazil, Uruguay and Argentina
+
 * Wed Aug  4 2004 Jakub Jelinek <jakub at redhat.com> 2004d-1.fc1
 - 2004b