Author: glen Date: Tue Aug 30 12:05:54 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- up to 2011i
---- Files affected:
packages/tzdata:
tzdata.spec (1.106 -> 1.107) , install.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/tzdata/tzdata.spec
diff -u packages/tzdata/tzdata.spec:1.106 packages/tzdata/tzdata.spec:1.107
--- packages/tzdata/tzdata.spec:1.106 Sat Jul 30 15:46:36 2011
+++ packages/tzdata/tzdata.spec Tue Aug 30 14:05:49 2011
@@ -10,13 +10,13 @@
%endif
%endif
-%define tzcode_ver 2011g
-%define tzdata_ver 2011h
+%define tzcode_ver 2011i
+%define tzdata_ver 2011i
Summary: Timezone data
Summary(pl.UTF-8): Dane o strefach czasowych
Name: tzdata
Version: %{tzdata_ver}
-Release: 2
+Release: 1
License: Public Domain (database), BSD/LGPL v2.1+ (code/test suite)
Group: Base
# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
@@ -26,15 +26,16 @@
Source0: %{name}-base-0.tar.bz2
# Source0-md5: e36d2f742c22f8c8dbf0686ac9769b55
Source1: ftp://elsie.nci.nih.gov/pub/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5: 546d27b6c1e5e1097bd512651815017f
+# Source1-md5: c7a86ec34f30f8d6aa77ef94902a3047
Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5: ecb564279b28c5b184421c525d997d6c
+# Source2-md5: cf7f4335b7c8682899fa2814e711c1b2
Source3: timezone.init
Source4: timezone.sysconfig
Source5: javazic.tar.gz
# Source5-md5: 6a3392cd5f1594d13c12c1a836ac8d91
Source6: timezone.upstart
Patch1: javazic-fixup.patch
+Patch2: install.patch
URL: http://www.twinsun.com/tz/tz-link.htm
BuildRequires: rpm >= 4.4.9-56
BuildRequires: rpmbuild(macros) >= 1.300
@@ -103,10 +104,11 @@
%setup -qc
mv tzdata/* .
%{__tar} xzf %{SOURCE1} -C tzdata
-mkdir tzcode
+install -d tzcode
%{__tar} xzf %{SOURCE2} -C tzcode
+%patch2 -p1
-sed -e "
+%{__sed} -e "
s|@objpfx@|`pwd`/obj/|
s|@datadir@|%{_datadir}|
s|@install_root@|$RPM_BUILD_ROOT|
@@ -173,11 +175,11 @@
> $RPM_BUILD_ROOT/etc/localtime
# header file
-cp -a tzcode/tzfile.h $RPM_BUILD_ROOT%{_includedir}/tzfile.h
-cp -a tzcode/tzfile.5 $RPM_BUILD_ROOT%{_mandir}/man5
+cp -p tzcode/tzfile.h $RPM_BUILD_ROOT%{_includedir}/tzfile.h
+cp -p tzcode/tzfile.5 $RPM_BUILD_ROOT%{_mandir}/man5
install -p %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/timezone
-cp -a %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone
+cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/sysconfig/timezone
install -d $RPM_BUILD_ROOT/etc/init
cp -p %{SOURCE6} $RPM_BUILD_ROOT/etc/init/timezone.conf
@@ -259,6 +261,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.107 2011/08/30 12:05:49 glen
+- up to 2011i
+
Revision 1.106 2011/07/30 13:46:36 glen
- upstart: add upstart_controlled
================================================================
Index: packages/tzdata/install.patch
diff -u /dev/null packages/tzdata/install.patch:1.1
--- /dev/null Tue Aug 30 14:05:54 2011
+++ packages/tzdata/install.patch Tue Aug 30 14:05:49 2011
@@ -0,0 +1,11 @@
+--- tzdata-2011i/Rules~ 2003-07-24 19:52:34.000000000 +0300
++++ tzdata-2011i/Rules 2011-08-30 15:02:18.371907715 +0300
+@@ -10,7 +10,7 @@
+ endef
+ define do-install
+ $(make-target-directory)
+-/usr/bin/install -m 644 $< $@
++/usr/bin/install -p -m 644 $< $@
+ endef
+ install: $(inst_zonedir)/
+ $(MAKE) install-data
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tzdata/tzdata.spec?r1=1.106&r2=1.107&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
