rpms/tzdata/FC-5 sources,1.28,1.29 tzdata.spec,1.32,1.33

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Sep 21 14:07:57 UTC 2006


Author: pmachata

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

Modified Files:
	sources tzdata.spec 
Log Message:
- Upstream 2006k, 2006l:
  - Adjustments for Egypt, Palestine, Cuba, Honduras
  - Documentation changes



Index: sources
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	22 Aug 2006 15:03:10 -0000	1.28
+++ sources	21 Sep 2006 14:07:55 -0000	1.29
@@ -1,3 +1,3 @@
-0920ba0a68ab02681fe390dbc2a9c33d  tzcode2006j.tar.gz
-fef20ce476ec31b6c5a760eed3b358c0  tzdata2006j.tar.gz
+ada0f094380030b9b4479def5f58231d  tzcode2006k.tar.gz
+8f1c7aeeb9674feb25e0a9764517f980  tzdata2006l.tar.gz
 906a4c98cc5240f416524a256b039c42  tzdata-base-0.tar.bz2


Index: tzdata.spec
===================================================================
RCS file: /cvs/dist/rpms/tzdata/FC-5/tzdata.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- tzdata.spec	22 Aug 2006 15:03:10 -0000	1.32
+++ tzdata.spec	21 Sep 2006 14:07:55 -0000	1.33
@@ -1,12 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2006j
+Version: 2006l
+%define tzdata_version %{version}
+%define tzcode_version 2006k
 Release: 1%{?dist}
 License: GPL
 Group: System Environment/Base
 Source0: tzdata-base-0.tar.bz2
-Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{version}.tar.gz
-Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
+Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
+Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 BuildRequires: gawk, glibc, glibc-common, perl
 Conflicts: glibc-common <= 2.3.2-63
 BuildArchitectures: noarch
@@ -18,10 +20,10 @@
 
 %prep
 %setup -n tzdata
-mkdir %{name}%{version}
-tar xzf %{SOURCE1} -C %{name}%{version}
-mkdir tzcode%{version}
-tar xzf %{SOURCE2} -C tzcode%{version}
+mkdir tzdata%{tzdata_version}
+tar xzf %{SOURCE1} -C tzdata%{tzdata_version}
+mkdir tzcode%{tzcode_version}
+tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
     -e 's|@install_root@|%{buildroot}|' \
@@ -29,7 +31,7 @@
 
 %build
 make
-grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
+grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
 
 %install
 make install
@@ -45,9 +47,16 @@
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
-%doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
+%doc tzcode%{tzcode_version}/README
+%doc tzcode%{tzcode_version}/Theory
+%doc tzcode%{tzcode_version}/tz-link.html
 
 %changelog
+* Thu Sep 21 2006 Petr Machata <pmachata at redhat.com> - 2006l-1
+- Upstream 2006k, 2006l:
+  - Adjustments for Egypt, Palestine, Cuba, Honduras
+  - Documentation changes
+
 * Tue Aug 22 2006 Petr Machata <pmachata at redhat.com> - 2006j-1
 - Upstream 2006j
   - Honduras stopped observing DST on Monday at 00:00




More information about the fedora-cvs-commits mailing list