This commit was manufactured by cvs2git to create tag 'AC-STABLE'.

Sprout from master 2007-02-25 00:48:01 UTC Elan Ruusamäe <glen@pld-linux.org> '- start + stop = 100'
Cherrypick from unlabeled-1.14.2 2007-03-28 16:41:37 UTC Elan Ruusamäe <glen@pld-linux.org> '- 2007d':
    tzdata.spec -> 1.14.2.4

diff --git a/tzdata.spec b/tzdata.spec
index 18566846de88b5c88debcc574410f3b08bc8cd66..b27ef659d78c8fff253c123af814885301956ab0 100644 (file)
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,18 +1,23 @@
 Summary:       Timezone data
-Summary(pl.UTF-8):     Dane o strefach czasowych
+Summary(pl):   Dane o strefach czasowych
 Name:          tzdata
-Version:       2007b
+Version:       2007d
 Release:       1
 License:       GPL
 Group:         Base
 Source0:       %{name}-base-0.tar.bz2
 # Source0-md5: 906a4c98cc5240f416524a256b039c42
 Source1:       ftp://elsie.nci.nih.gov/pub/%{name}%{version}.tar.gz
-# Source1-md5: 2b624fbf9e819dcbd8bb0246ab05370c
+# Source1-md5: 05ba08b08c773cd26b74a94205bf397f
 Source2:       ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
-# Source2-md5: cdcf902ff81f5a4d787ef73390d1d7ca
+# Source2-md5: f63d242016ce0da0bafc0867e2824ad9
+Source3:       timezone.init
+Source4:       timezone.sysconfig
 BuildRequires: gawk
 BuildRequires: perl-base
+BuildRequires: rpmbuild(macros) >= 1.228
+Requires(post,preun):  /sbin/chkconfig
+Requires:      rc-scripts >= 0.4.1.4
 BuildArch:     noarch
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -20,14 +25,14 @@ BuildRoot:  %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 This package contains data files with rules for various timezones
 around the world.
 
-%description -l pl.UTF-8
-Ten pakiet zawiera pliki z danymi na temat reguł stref czasowych na
-całym świecie.
+%description -l pl
+Ten pakiet zawiera pliki z danymi na temat regu³ stref czasowych na
+ca³ym ¶wiecie.
 
 %package zoneinfo_right
 Summary:       Non-POSIX (real) time zones
-Summary(es.UTF-8):     Zonas de tiempo reales (no de POSIX)
-Summary(pl.UTF-8):     Nie-POSIX-owe (prawdziwe) strefy czasowe
+Summary(es):   Zonas de tiempo reales (no de POSIX)
+Summary(pl):   Nie-POSIX-owe (prawdziwe) strefy czasowe
 Group:         Libraries
 Obsoletes:     glibc-zoneinfo_right
 
@@ -35,12 +40,12 @@ Obsoletes:  glibc-zoneinfo_right
 You don't want this. Details at:
 <http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html>.
 
-%description zoneinfo_right -l es.UTF-8
-No lo necesita. Encontrará los detalles en:
+%description zoneinfo_right -l es
+No lo necesita. Encontrará los detalles en:
 <http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html>.
 
-%description zoneinfo_right -l pl.UTF-8
-Nie potrzebujesz tego. Szczegóły pod:
+%description zoneinfo_right -l pl
+Nie potrzebujesz tego. Szczegó³y pod:
 <http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html>.
 
 %prep
@@ -63,15 +68,16 @@ grep -v tz-art.htm tzcode%{version}/tz-link.htm > tzcode%{version}/tz-link.html
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/
+install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
 
 %{__make} install
 
-echo ====================TESTING=========================
+: ====================TESTING=========================
 %{__make} check \
        CC="%{__cc}" \
        CFLAGS="%{rpmcflags} %{rpmldflags}"
-echo ====================TESTING END=====================
+: ====================TESTING END=====================
+
 
 # glibc.spec didn't keep it. so won't here either.
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posix
@@ -82,13 +88,30 @@ ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
 
 > $RPM_BUILD_ROOT/etc/localtime
 
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/timezone
+cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+/sbin/chkconfig --add timezone
+%service timezone restart
+
+%preun
+if [ "$1" = "0" ]; then
+       /sbin/chkconfig --del timezone
+fi
+
+%triggerpostun -- rc-scripts < 0.4.1.4
+/sbin/chkconfig --add timezone
+
 %files
 %defattr(644,root,root,755)
 %doc tzcode%{version}/README tzcode%{version}/Theory tzcode%{version}/tz-link.html
 %ghost /etc/localtime
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone
+%attr(754,root,root) /etc/rc.d/init.d/timezone
 
 %{_datadir}/zoneinfo
 %exclude %{_datadir}/zoneinfo/right