[meego-commits] 24081: Changes to Trunk:Testing/tzdata
Markus Lehtonen
no_reply at build.meego.com
Thu Sep 22 08:32:42 UTC 2011
Hi,
I have made the following changes to tzdata in project Trunk:Testing. Please review and accept ASAP.
Thank You,
Markus Lehtonen
[This message was auto-generated]
---
Request #24081:
submit: devel:systemsw/tzdata -> Trunk:Testing/tzdata
Message:
Version bump. Needed to fix compile of timed. Will submit from here as devel:base seems inactive.
State: new 2011-09-22T01:21:38 mlehtonen
Comment: None
changes files:
--------------
--- tzdata.changes
+++ tzdata.changes
@@ -0,0 +1,6 @@
+* Sat May 28 2011 Tapio Rantala <ext-tapio.rantala at nokia.com> - 2011e
+- New upstream version
+- Add calendar and timed subpackages for generated files (BMC#12919)
+ + Add extras from maemo tzdata version 2011e-1
+ + Add extras-build patch to build extras correctly
+
@@ -12 +17,0 @@
-
new:
----
tzcode2011e.tar.gz
tzdata-2011e-extras-build.patch
tzdata-extras-2011e-1.tar.bz2
tzdata2011e.tar.gz
spec files:
-----------
--- tzdata.spec
+++ tzdata.spec
@@ -1,13 +1,14 @@
#specfile originally created for Fedora, modified for Moblin Linux
Summary: Timezone data
Name: tzdata
-Version: 2010b
+Version: 2011e
%define tzdata_version %{version}
-%define tzcode_version 2009t
+%define tzcode_version 2011e
Release: 1
License: Public Domain
Group: System/Base
URL: ftp://elsie.nci.nih.gov/pub/
+# Extras URL: http://meego.gitorious.com/meego-middleware/tzdata
# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
# test suite. It is occasionally updated from glibc sources, and as
@@ -17,6 +18,8 @@
# These are official upstream.
Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Source3: tzdata-extras-2011e-1.tar.bz2
+Patch0: %{name}-2011e-extras-build.patch
Conflicts: glibc-common <= 2.3.2-63
BuildArch: noarch
@@ -24,6 +27,23 @@
This package contains data files with rules for various timezones around
the world.
+%package calendar
+Summary: Time zone data needed for calendar application
+Group: System/Base
+Requires: tzdata = %{version}-%{release}
+
+%description calendar
+The full list of all supported time zones and aliases.
+
+%package timed
+Summary: Time zone data needed for time daemon
+Group: System/Base
+Requires: tzdata = %{version}-%{release}
+
+%description timed
+Time zone related data pre-formatted to be used by time daemon and other
+applications.
+
%prep
%setup -q -n tzdata
mkdir tzdata%{tzdata_version}
@@ -34,11 +54,18 @@
-e 's|@datadir@|%{_datadir}|' \
Makeconfig.in > Makeconfig
+tar xjf %{SOURCE3}
+mkdir timed
+%patch0 -p1
%build
make
grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
+cp tzdata%{tzdata_version}/yearistype.sh tzcode%{tzcode_version}/
+make -C tzcode%{tzcode_version} zic
+cp tzcode%{tzcode_version}/zic src/
+make extras
%install
rm -fr $RPM_BUILD_ROOT
@@ -47,6 +74,11 @@
#cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
+install -d %{buildroot}/%{_datadir}/tzdata-calendar
+install -m 644 zone-and-aliases.tab %{buildroot}/%{_datadir}/tzdata-calendar
+install -d %{buildroot}/%{_datadir}/tzdata-timed
+install -m 644 zone.alias timed/* %{buildroot}/%{_datadir}/tzdata-timed
+
%check
echo ====================TESTING=========================
make check
@@ -62,3 +94,10 @@
%doc tzcode%{tzcode_version}/Theory
%doc tzcode%{tzcode_version}/tz-link.html
+%files calendar
+%defattr(-,root,root,-)
+%{_datadir}/tzdata-calendar/zone-and-aliases.tab
+
+%files timed
+%defattr(-,root,root,-)
+%{_datadir}/tzdata-timed/*
other changes:
--------------
++++++ tzcode2011e.tar.gz (new)
++++++ tzdata-2011e-extras-build.patch (new)
--- tzdata-2011e-extras-build.patch
+++ tzdata-2011e-extras-build.patch
+diff --git a/Makefile b/Makefile
+index cd08b35..adbd98f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -19,3 +19,26 @@ $(objpfx)tst-timezone: src/tst-timezone.c
+ clean:
+ rm -rf obj src/yearistype
+ for i in tzdata*/*; do rm -f src/`basename $$i`; done
++
++extras:
++ g++ scripts/signature.c++ -Wall -Werror -xc++ -o src/signature
++ scripts/iso8601.perl > src/iso8601
++ scripts/zone-list.sh > zone.list
++ scripts/zone-generate.sh
++ perl -w -s scripts/find-aliases.perl \
++ -zones=zone.list -signatures=signatures -md5sum=md5sum \
++ -links=zone.link -zonetab=src/zone.tab > zone.alias
++ cat zone.alias | scripts/create-test-case.perl > timezones.c++
++ for name in `cat zone.alias` ; do echo ?? +0+0 $name ; done > zone-and-aliases.tab
++ scripts/prepare-timed-data.perl \
++ --zonetab=src/zone.tab \
++ --signatures=signatures \
++ --mcc-main=data/MCC \
++ --distinct=data/distinct.tab \
++ --single=data/single.tab \
++ data/mcc-wikipedia-*.html \
++ --single-output=timed/single.data \
++ --distinct-output=timed/distinct.data \
++ --full-output=timed/olson.data \
++ --country-by-mcc-output=timed/country-by-mcc.data \
++ --zones-by-country-output=timed/zones-by-country.data
+diff --git a/scripts/prepare-timed-data.perl b/scripts/prepare-timed-data.perl
+index 6362fc8..f615db9 100755
+--- a/scripts/prepare-timed-data.perl
++++ b/scripts/prepare-timed-data.perl
+@@ -80,7 +80,7 @@ sub read_mcc_list_by_parameter
+ # 1
+ sub read_wiki
+ {
+- my $re = qr/^mcc-wikipedia-\d{4}-\d{2}-\d{2}(-*)?\.html$/ ;
++ my $re = qr/^[\w\-\/]*mcc-wikipedia-\d{4}-\d{2}-\d{2}(-*)?\.html$/ ;
+ my @wiki_list = sort grep { /$re/ } @ARGV ;
+ die "not a single wikipage given on command line" unless @wiki_list ;
+ my $wiki_file = $wiki_list[-1] ;
+diff --git a/scripts/zone-generate.sh b/scripts/zone-generate.sh
+index a3fe426..6ad76e3 100755
+--- a/scripts/zone-generate.sh
++++ b/scripts/zone-generate.sh
+@@ -4,10 +4,10 @@
+
+ # This script has to be executed in the build directory
+
+-zic=bin/zic
+-yearistype=bin/yearistype
+-signature=bin/signature
+-leapseconds=leapseconds
++zic=src/zic
++yearistype=src/yearistype
++signature=src/signature
++leapseconds=src/leapseconds
+
+ output=zones
+ signatures=signatures
+@@ -20,10 +20,10 @@ test -x $signature
+ test -r $leapseconds
+ rm -rf $output $signatures $md5sum && mkdir -p $output
+
+-input="africa antarctica asia australasia europe northamerica southamerica"
+-input="$input iso8601"
+-input="$input etcetera factory systemv backward"
+-input="$input solar87 solar88 solar89"
++input="src/africa src/antarctica src/asia src/australasia src/europe src/northamerica src/southamerica"
++input="$input src/iso8601"
++input="$input src/etcetera src/factory src/systemv src/backward"
++input="$input src/solar87 src/solar88 src/solar89"
+
+ for i in $input ; do
+ echo "Processing '$i'"
+diff --git a/scripts/zone-list.sh b/scripts/zone-list.sh
+index 5295af9..fc71c20 100755
+--- a/scripts/zone-list.sh
++++ b/scripts/zone-list.sh
+@@ -4,8 +4,8 @@
+
+ # This script has to be executed in the build directory
+
+-zic=bin/zic
+-yearistype=bin/yearistype
++zic=src/zic
++yearistype=src/yearistype
+ output=zones-listing
+
+ test -x $zic
+@@ -14,7 +14,7 @@ rm -rf $output && mkdir -p $output
+
+ zic_cmd="$zic -L /dev/null -y $yearistype "
+
+-input="africa antarctica asia australasia europe northamerica southamerica iso8601"
++input="src/africa src/antarctica src/asia src/australasia src/europe src/northamerica src/southamerica src/iso8601"
+
+ for continent in $input ; do
+ test -f $continent
++++++ tzdata-extras-2011e-1.tar.bz2 (new)
++++++ tzdata2011e.tar.gz (new)
More information about the MeeGo-commits
mailing list