Author: glen Date: Wed Feb 28 22:00:20 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- HEAD merge
---- Files affected:
SPECS:
tzdata.spec (1.14.2.1 -> 1.14.2.2)
---- Diffs:
================================================================
Index: SPECS/tzdata.spec
diff -u SPECS/tzdata.spec:1.14.2.1 SPECS/tzdata.spec:1.14.2.2
--- SPECS/tzdata.spec:1.14.2.1 Sun Feb 25 01:21:47 2007
+++ SPECS/tzdata.spec Wed Feb 28 23:00:13 2007
@@ -2,18 +2,23 @@
Summary: Timezone data
Summary(pl): Dane o strefach czasowych
Name: tzdata
-Version: 2007b
+Version: 2007c
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: 730d744ac691e950066f8b6bd17b02d0
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{version}.tar.gz
-# Source2-md5: cdcf902ff81f5a4d787ef73390d1d7ca
+# Source2-md5: e4913aa2edaf097b0627ead6b45fbedc
+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)
@@ -64,13 +69,16 @@
%install
rm -rf $RPM_BUILD_ROOT
+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
@@ -79,12 +87,30 @@
ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
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
+
%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
@@ -98,8 +124,26 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
-Revision 1.14.2.1 2007/02/25 00:21:47 glen
+Revision 1.14.2.2 2007/02/28 22:00:13 glen
+- HEAD merge
+
+Revision 1.20 2007/02/28 16:13:41 glen
+- 2007c
+
+Revision 1.19 2007/02/25 01:07:24 glen
+- timezone initscript moved here; rel 2
+
+Revision 1.18 2007/02/13 22:58:53 glen
- 2007b
+
+Revision 1.17 2007/02/12 22:09:18 glen
+- tabs in preamble
+
+Revision 1.16 2007/02/12 01:06:35 baggins
+- converted to UTF-8
+
+Revision 1.15 2007/02/06 19:54:42 arekm
+- rel 2; package /etc/localtime
Revision 1.14 2007/01/29 00:25:26 glen
- 2007a
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/tzdata.spec?r1=1.14.2.1&r2=1.14.2.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
