X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=tzdata.spec;h=754afb8556eddbadbb49f3af7726977b092b9318;hb=1f4e4169474301c16d66dfd34d0f07265c463964;hp=fe7e05b6b7551a593a0ef0762ca6542dbd409d07;hpb=4918762000f536dac6651692e96d326665df5533;p=packages%2Ftzdata.git

diff --git a/tzdata.spec b/tzdata.spec
index fe7e05b..754afb8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,10 +1,16 @@
 #
 # Conditional build
 %bcond_without	tests		# make check
-%bcond_with	java		# build java subpackage
+%bcond_without	java		# build java subpackage
 
-%define		tzcode_ver	2010n
-%define		tzdata_ver	2010o
+%if "%{pld_release}" == "ac"
+%ifnarch i586 i686 pentium3 pentium4 athlon %{x8664}
+%undefine	with_java
+%endif
+%endif
+
+%define		tzcode_ver	2011i
+%define		tzdata_ver	2011i
 Summary:	Timezone data
 Summary(pl.UTF-8):	Dane o strefach czasowych
 Name:		tzdata
@@ -19,17 +25,21 @@ Group:		Base
 Source0:	%{name}-base-0.tar.bz2
 # Source0-md5:	e36d2f742c22f8c8dbf0686ac9769b55
 Source1:	ftp://elsie.nci.nih.gov/pub/%{name}%{tzdata_ver}.tar.gz
-# Source1-md5:	5cae5c56fad81dc29f8fcd933a05768e
+# Source1-md5:	c7a86ec34f30f8d6aa77ef94902a3047
 Source2:	ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_ver}.tar.gz
-# Source2-md5:	a7a776a5713831993e814fe0c05f9fd5
+# 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
 %if %{with java}
+BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
 %endif
@@ -47,15 +57,15 @@ around the world.
 Ten pakiet zawiera pliki z danymi na temat reguł stref czasowych na
 całym świecie.
 
-%package java
+%package -n java-tzdata
 Summary:	Timezone data for Java
 Summary(pl.UTF-8):	Dane stref czasowych dla Javy
 Group:		Base
 
-%description java
+%description -n java-tzdata
 This package contains timezone information for use by Java runtimes.
 
-%description java -l pl.UTF-8
+%description -n java-tzdata -l pl.UTF-8
 Ten pakiet zawiera informacje o strefach czasowych przeznaczone dla
 programów w Javie.
 
@@ -93,10 +103,11 @@ Plik nagłówkowy bazy danych stref czasowych.
 %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|
@@ -163,11 +174,14 @@ ln -sf localtime $RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
 > $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
 
 %if %{with java}
 cp -a zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
@@ -219,12 +233,13 @@ fi
 %ghost /etc/localtime
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/timezone
 %attr(754,root,root) /etc/rc.d/init.d/timezone
+%config(noreplace) %verify(not md5 mtime size) /etc/init/timezone.conf
 
 %{_datadir}/zoneinfo
 %exclude %{_datadir}/zoneinfo/right
 
 %if %{with java}
-%files java
+%files -n java-tzdata
 %defattr(644,root,root,755)
 %{_datadir}/javazi
 %endif