SPECS: glibc.spec - merged zoneinfo separation from AC-branch, rel...
qboosh
qboosh at pld-linux.org
Wed May 24 09:49:37 CEST 2006
Author: qboosh Date: Wed May 24 07:49:37 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- merged zoneinfo separation from AC-branch, release 6.1
---- Files affected:
SPECS:
glibc.spec (1.631 -> 1.632)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.631 SPECS/glibc.spec:1.632
--- SPECS/glibc.spec:1.631 Tue Feb 28 00:22:25 2006
+++ SPECS/glibc.spec Wed May 24 09:49:32 2006
@@ -77,7 +77,7 @@
Summary(uk): GNU libc ×ĹŇÓŚ§ 2.3
Name: glibc
Version: 2.3.6
-Release: 4.2
+Release: 6.1
Epoch: 6
License: LGPL
Group: Libraries
@@ -192,7 +192,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}.
@@ -204,8 +204,7 @@
Este paquete contiene las bibliotecas compartidas más importantes, es
decir la biblioteca C estándar y la biblioteca estándar de matemática.
Sin éstas, un sistema Linux no podrá funcionar. También está incluido
-soporte de idiomas nacionales (locale) y bases de datos de zona de
-tiempo.
+soporte de idiomas nacionales (locale).
Puede usarse con: núcleo Linux >= %{min_kernel}.
@@ -218,7 +217,7 @@
shared Libraries, die Standard-C-Library und die
Standard-Math-Library, ohne die das Linux-System nicht funktioniert.
Ferner enthält es den Support für die verschiedenen Sprachgregionen
-(locale) und die Zeitzonen-Datenbank.
+(locale).
Can be used on: Linux kernel >= %{min_kernel}.
@@ -230,8 +229,7 @@
bibliothčques partagées les plus importantes, la bibliothčque standard
du C et la bibliothčque mathématique standard. Sans celles-ci, un
systčme Linux ne peut fonctionner. Il contient aussi la gestion des
-langues nationales (locales) et les bases de données des zones
-horaires.
+langues nationales (locales).
Can be used on: Linux kernel >= %{min_kernel}.
@@ -257,7 +255,7 @@
standardowych, współdzielonych (dynamicznych) bibliotek C i
matematycznych. Bez glibc system Linux nie jest w stanie funkcjonować.
Znajdują się tutaj również definicje różnych informacji dla wielu
-języków (locale) oraz definicje stref czasowych.
+języków (locale).
Przeznaczony dla jądra Linux >= %{min_kernel}.
@@ -269,8 +267,7 @@
ĐŇĎÇŇÁÍÍÁÍÉ. üÔĎÔ ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ÎÁÉÂĎĚĹĹ ×ÁÖÎŮĹ ÉÚ ŇÁÚÄĹĚŃĹÍŮČ
ÂÉÂĚÉĎÔĹË - ÓÔÁÎÄÁŇÔÎŐŔ ÂÉÂĚÉĎÔĹËŐ C É ÓÔÁÎÄÁŇÔÎŐŔ ÂÉÂĚÉĎÔĹËŐ
ÍÁÔĹÍÁÔÉËÉ. âĹÚ ÜÔÉČ ÂÉÂĚÉĎÔĹË Linux ĆŐÎËĂÉĎÎÉŇĎ×ÁÔŘ ÎĹ ÂŐÄĹÔ. ôÁËÖĹ
-ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ĐĎÄÄĹŇÖËŐ ÎÁĂÉĎÎÁĚŘÎŮČ ŃÚŮËĎ× (locale) É ÂÁÚŮ ÄÁÎÎŮČ
-×ŇĹÍĹÎÎŮČ ÚĎÎ (timezone databases).
+ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ĐĎÄÄĹŇÖËŐ ÎÁĂÉĎÎÁĚŘÎŮČ ŃÚŮËĎ× (locale).
Can be used on: Linux kernel >= %{min_kernel}.
@@ -293,8 +290,7 @@
×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ ×ÓŚÍÁ ĐŇĎÇŇÁÍÁÍÉ. ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÎÁĘÂŚĚŘŰ ×ÁÖĚÉ׌
Ú ÄÉÎÁÍŚŢÎÉČ ÂŚÂĚŚĎÔĹË - ÓÔÁÎÄÁŇÔÎŐ ÂŚÂĚŚĎÔĹËŐ ó ÔÁ ÓÔÁÎÄÁŇÔÎŐ
ÂŚÂĚŚĎÔĹËŐ ÍÁÔĹÍÁÔÉËÉ. âĹÚ ĂÉČ ÂŚÂĚŚĎÔĹË Linux ĆŐÎËĂŚĎÎŐ×ÁÔÉ ÎĹ ÂŐÄĹ.
-ôÁËĎÖ ĐÁËĹÔ ÍŚÓÔÉÔŘ ĐŚÄÔŇÉÍËŐ ÎÁĂŚĎÎÁĚŘÎÉČ ÍĎ× (locale) ÔÁ ÂÁÚÉ ÄÁÎÎÉČ
-ŢÁÓĎ×ÉČ ÚĎÎ (timezone databases).
+ôÁËĎÖ ĐÁËĹÔ ÍŚÓÔÉÔŘ ĐŚÄÔŇÉÍËŐ ÎÁĂŚĎÎÁĚŘÎÉČ ÍĎ× (locale).
Can be used on: Linux kernel >= %{min_kernel}.
@@ -305,6 +301,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.
@@ -862,25 +859,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
@@ -1098,13 +1076,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
@@ -1131,13 +1105,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
@@ -1398,8 +1367,6 @@
%dir %{_datadir}/locale
%{_datadir}/locale/locale.alias
-%{_datadir}/zoneinfo
-%exclude %{_datadir}/zoneinfo/right
%{_mandir}/man1/catchsegv.1*
%{_mandir}/man1/getconf.1*
@@ -1503,10 +1470,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*
@@ -1710,6 +1673,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.632 2006/05/24 07:49:32 qboosh
+- merged zoneinfo separation from AC-branch, release 6.1
+
Revision 1.631 2006/02/27 23:22:25 glen
- use service, adapterized
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.631&r2=1.632&f=u
More information about the pld-cvs-commit
mailing list