SPECS (AC-branch): glibc.spec - zoneinfo databases from tzdata pac...

[glen]

Author: glen                         Date: Wed May 17 13:00:50 2006 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- zoneinfo databases from tzdata package (more actual than in here); rel 6

---- Files affected:
SPECS:
   glibc.spec (1.583.2.75 -> 1.583.2.76) 

---- Diffs:

================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.75 SPECS/glibc.spec:1.583.2.76
--- SPECS/glibc.spec:1.583.2.75	Mon May  1 14:15:30 2006
+++ SPECS/glibc.spec	Wed May 17 15:00:44 2006
@@ -87,7 +87,7 @@
 Summary(uk):	GNU libc ×ĹŇÓŚ§ 2.3
 Name:		glibc
 Version:	2.3.6
-Release:	5
+Release:	6
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -202,7 +202,7 @@
 programs. This package contains the most important sets of shared
 libraries, the standard C library and the standard math library.
 Without these, a Linux system will not function. It also contains
-national language (locale) support and timezone databases.
+national language (locale) support.
 
 Can be used on: Linux kernel >= %{min_kernel}.
 
@@ -315,6 +315,7 @@
 AutoReq:	false
 Requires(pre):	%{name} = %{epoch}:%{version}-%{release}
 Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	tzdata >= 2006g-2
 
 %description misc
 Utilities and data used by glibc.
@@ -872,25 +873,6 @@
 %description memusage -l pl
 Zabawka.
 
-%package zoneinfo_right
-Summary:	Non-POSIX (real) time zones
-Summary(es):	Zonas de tiempo reales (no de POSIX)
-Summary(pl):	Nie-POSIX-owe (prawdziwe) strefy czasowe
-Group:		Libraries
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description 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
-No lo necesita. Encontrará los detalles en:
-http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
-
-%description zoneinfo_right -l pl
-Nie potrzebujesz tego. Szczegóły pod:
-http://sources.redhat.com/ml/libc-alpha/2000-12/msg00068.html
-
 %package -n %{name}64
 Summary:	GNU libc - 64-bit libraries
 Summary(es):	GNU libc - bibliotecas de 64 bits
@@ -1108,13 +1090,9 @@
 install linuxthreads/man/*.3thr		$RPM_BUILD_ROOT%{_mandir}/man3
 %endif
 
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/{localtime,posixtime,posixrules,posix/*}
-
-#cd $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-#for i in [A-Z]*; do
-#	ln -s ../$i posix
-#done
-#cd -
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
+# moved to tzdata package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 
 %ifarch %{ix86} ppc s390 sparc sparcv9
 mv $RPM_BUILD_ROOT%{_includedir}/gnu/stubs.h $RPM_BUILD_ROOT%{_includedir}/gnu/stubs-32.h
@@ -1141,13 +1119,8 @@
 EOF
 %endif
 
-ln -sf %{_sysconfdir}/localtime	$RPM_BUILD_ROOT%{_datadir}/zoneinfo/localtime
-ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixtime
-ln -sf localtime		$RPM_BUILD_ROOT%{_datadir}/zoneinfo/posixrules
 ln -sf libbsd-compat.a		$RPM_BUILD_ROOT%{_libdir}/libbsd.a
 
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
-
 # make symlinks across top-level directories absolute
 for l in anl BrokenLocale crypt dl m nsl resolv rt thread_db util ; do
 	rm -f $RPM_BUILD_ROOT%{_libdir}/lib${l}.so
@@ -1408,8 +1381,6 @@
 
 %dir %{_datadir}/locale
 %{_datadir}/locale/locale.alias
-%{_datadir}/zoneinfo
-%exclude %{_datadir}/zoneinfo/right
 
 %{_mandir}/man1/catchsegv.1*
 %{_mandir}/man1/getconf.1*
@@ -1513,10 +1484,6 @@
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zdump.8*
 %lang(zh_CN) %{_mandir}/zh_CN/man8/zic.8*
 
-%files zoneinfo_right
-%defattr(644,root,root,755)
-%{_datadir}/zoneinfo/right
-
 %files -n nss_compat
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_compat*.so*
@@ -1720,6 +1687,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.583.2.76  2006/05/17 13:00:44  glen
+- zoneinfo databases from tzdata package (more actual than in here); rel 6
+
 Revision 1.583.2.75  2006/05/01 12:15:30  jajcus
 - reverted last change... it was only my imagination that it worked
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.75&r2=1.583.2.76&f=u