SPECS (DEVEL): glibc.spec - merged some changes from HEAD (man upd...
qboosh
qboosh at pld-linux.org
Wed Jun 7 10:04:53 CEST 2006
Author: qboosh Date: Wed Jun 7 08:04:53 2006 GMT
Module: SPECS Tag: DEVEL
---- Log message:
- merged some changes from HEAD (man update, tzdata separation)
- restored min_kernel macro
---- Files affected:
SPECS:
glibc.spec (1.590.2.43 -> 1.590.2.44)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.590.2.43 SPECS/glibc.spec:1.590.2.44
--- SPECS/glibc.spec:1.590.2.43 Wed Jun 7 09:18:41 2006
+++ SPECS/glibc.spec Wed Jun 7 10:04:47 2006
@@ -1,11 +1,12 @@
# $Revision$, $Date$
#
# Conditional build:
+# min_kernel (default is 2.6.0)
+%bcond_without memusage # don't build memusage utility
%bcond_without selinux # without SELinux support (in nscd)
%bcond_with tests # perform "make test"
%bcond_without localedb # don't build localedb-all (is time consuming)
%bcond_with cross # build using crossgcc (without libgcc_eh)
-%bcond_without memusage # don't build memusage utility
#
# TODO:
# - look at locale fixes/updates in bugzilla
@@ -13,6 +14,7 @@
# - localedb-gen man pages(?)
# - math/{test-fenv,test-tgmath,test-float,test-ifloat},
# debug/backtrace-tst(SEGV) fail on alpha
+%{!?min_kernel:%global min_kernel 2.6.0}
%ifarch sparc64
%undefine with_memusage
@@ -42,15 +44,12 @@
Source2: nscd.init
Source3: nscd.sysconfig
Source4: nscd.logrotate
-# Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
-Source5: %{name}-man-pages.tar.bz2
-# Source5-md5: 03bee93e9786b3e7dad2570ccb0cbc5c
-# Source6: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
-Source6: %{name}-non-english-man-pages.tar.bz2
-# Source6-md5: 6159f0a9b6426b5f6fc1b0d8d21b9b76
-Source7: %{name}-localedb-gen
+#Source5: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-man-pages.tar.bz2
+Source5: http://qboosh.cs.net.pl/man/%{name}-man-pages.tar.bz2
+# Source5-md5: f464eadf3cf06761f65639e44a179e6b
+Source6: %{name}-localedb-gen
+Source7: %{name}-LD-path.c
Source8: postshell.c
-Source9: %{name}-LD-path.c
Patch0: %{name}-info.patch
Patch1: %{name}-pl.po-update.patch
Patch2: %{name}-pld.patch
@@ -79,6 +78,7 @@
# PaX hack (dropped)
#Patch30: %{name}-pax_dl-execstack.patch
URL: http://www.gnu.org/software/libc/
+%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: binutils >= 2:2.15.90.0.3
@@ -96,8 +96,9 @@
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
AutoReq: false
+Requires: %{name}-misc = %{epoch}:%{version}-%{release}
Requires: basesystem
-Requires: glibc-misc = %{epoch}:%{version}-%{release}
+Requires: uname(release) >= %{min_kernel}
Provides: /sbin/ldconfig
Provides: glibc(nptl)
Provides: glibc(tls)
@@ -107,9 +108,12 @@
Obsoletes: glibc-debug
Obsoletes: glibc64
Obsoletes: ldconfig
-Conflicts: kernel < 2.6.0
+Conflicts: kernel < %{min_kernel}
+Conflicts: kernel24
+Conflicts: kernel24-smp
Conflicts: ld.so < 1.9.9-10
Conflicts: man-pages < 1.43
+Conflicts: poldek < 0.18.8-5
Conflicts: rc-scripts < 0.3.1-13
Conflicts: rpm < 4.1
ExclusiveArch: i486 i586 i686 pentium3 pentium4 athlon %{x8664} ia64 alpha s390 s390x sparc sparc64 sparcv9 ppc ppc64
@@ -117,7 +121,7 @@
# avoid -s here (ld.so must not be stripped to allow any program debugging)
%define rpmldflags %{nil}
-%define specflags_sparc64 -m64 -mcpu=ultrasparc -mvis -fcall-used-g6
+%define specflags_sparc64 -mcpu=ultrasparc -mvis -fcall-used-g6
# Xen-friendly glibc
%define specflags_ia32 -mno-tls-direct-seg-refs
@@ -140,7 +144,9 @@
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}.
%description -l es
Contiene las bibliotecas estándared que son usadas por varios
@@ -150,8 +156,9 @@
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}.
%description -l de
Enthält die Standard-Libraries, die von verschiedenen Programmen im
@@ -162,7 +169,9 @@
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}.
%description -l fr
Contient les bibliothčques standards utilisées par de nombreux
@@ -172,8 +181,9 @@
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}.
%description -l ja
glibc
@@ -186,6 +196,8 @@
ĽŃĽĂĽąĄźĽ¸¤Ď¤Ţ¤żĂĎ°č¸Ŕ¸ě (locale) ĽľĽÝĄźĽČ¤ČĽżĽ¤ĽŕĽžĄźĽóĽÇĄźĽżĽŮĄźĽš
ĽľĽÝĄźĽČ¤ň¤Ő¤Ż¤ß¤Ţ¤šĄŁ
+Can be used on: Linux kernel >= %{min_kernel}.
+
%description -l pl
W pakiecie znajdują się podstawowe biblioteki, używane przez różne
programy w Twoim systemie. Używanie przez programy bibliotek z tego
@@ -195,7 +207,9 @@
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).
+
+Pakiet jest przeznaczony dla jądra Linuksa >= %{min_kernel}.
%description -l ru
óĎÄĹŇÖÉÔ ÓÔÁÎÄÁŇÔÎŮĹ ÂÉÂĚÉĎÔĹËÉ, ÉÓĐĎĚŘÚŐĹÍŮĹ ÍÎĎÇĎŢÉÓĚĹÎÎŮÍÉ
@@ -205,8 +219,9 @@
ĐŇĎÇŇÁÍÍÁÍÉ. üÔĎÔ ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ÎÁÉÂĎĚĹĹ ×ÁÖÎŮĹ ÉÚ ŇÁÚÄĹĚŃĹÍŮČ
ÂÉÂĚÉĎÔĹË - ÓÔÁÎÄÁŇÔÎŐŔ ÂÉÂĚÉĎÔĹËŐ C É ÓÔÁÎÄÁŇÔÎŐŔ ÂÉÂĚÉĎÔĹËŐ
ÍÁÔĹÍÁÔÉËÉ. âĹÚ ÜÔÉČ ÂÉÂĚÉĎÔĹË Linux ĆŐÎËĂÉĎÎÉŇĎ×ÁÔŘ ÎĹ ÂŐÄĹÔ. ôÁËÖĹ
-ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ĐĎÄÄĹŇÖËŐ ÎÁĂÉĎÎÁĚŘÎŮČ ŃÚŮËĎ× (locale) É ÂÁÚŮ ÄÁÎÎŮČ
-×ŇĹÍĹÎÎŮČ ÚĎÎ (timezone databases).
+ĐÁËĹÔ ÓĎÄĹŇÖÉÔ ĐĎÄÄĹŇÖËŐ ÎÁĂÉĎÎÁĚŘÎŮČ ŃÚŮËĎ× (locale).
+
+Can be used on: Linux kernel >= %{min_kernel}.
%description -l tr
Bu paket, birçok programýn kullandýđý standart kitaplýklarý içerir.
@@ -217,6 +232,8 @@
içerir. Bu kitaplýklar olmadan Linux sistemi çalýţmayacaktýr. Yerel
dil desteđi ve zaman dilimi veri tabaný da bu pakette yer alýr.
+Can be used on: Linux kernel >= %{min_kernel}.
+
%description -l uk
íŚÓÔÉÔŘ ÓÔÁÎÄÁŇÔÎŚ ÂŚÂĚŚĎÔĹËÉ, ËĎÔŇŚ ×ÉËĎŇÉÓÔĎ×ŐŔÔŘÓŃ ŢÉÓĚĹÎÎÉÍÉ
ĐŇĎÇŇÁÍÁÍÉ × ÓÉÓÔĹÍŚ. äĚŃ ÔĎÇĎ, ÝĎ ÚÂĹŇĹÇÔÉ ÄÉÓËĎ×ÉĘ ĐŇĎÓÔŚŇ ÔÁ
@@ -225,15 +242,18 @@
×ÉËĎŇÉÓÔĎ×Ő¤ÔŘÓŃ ×ÓŚÍÁ ĐŇĎÇŇÁÍÁÍÉ. ăĹĘ ĐÁËĹÔ ÍŚÓÔÉÔŘ ÎÁĘÂŚĚŘŰ ×ÁÖĚÉ׌
Ú ÄÉÎÁÍŚŢÎÉČ ÂŚÂĚŚĎÔĹË - ÓÔÁÎÄÁŇÔÎŐ ÂŚÂĚŚĎÔĹËŐ ó ÔÁ ÓÔÁÎÄÁŇÔÎŐ
ÂŚÂĚŚĎÔĹËŐ ÍÁÔĹÍÁÔÉËÉ. âĹÚ ĂÉČ ÂŚÂĚŚĎÔĹË Linux ĆŐÎËĂŚĎÎŐ×ÁÔÉ ÎĹ ÂŐÄĹ.
-ôÁËĎÖ ĐÁËĹÔ ÍŚÓÔÉÔŘ ĐŚÄÔŇÉÍËŐ ÎÁĂŚĎÎÁĚŘÎÉČ ÍĎ× (locale) ÔÁ ÂÁÚÉ ÄÁÎÎÉČ
-ŢÁÓĎ×ÉČ ÚĎÎ (timezone databases).
+ôÁËĎÖ ĐÁËĹÔ ÍŚÓÔÉÔŘ ĐŚÄÔŇÉÍËŐ ÎÁĂŚĎÎÁĚŘÎÉČ ÍĎ× (locale).
+
+Can be used on: Linux kernel >= %{min_kernel}.
%package misc
Summary: Utilities and data used by glibc
Summary(pl): Narzędzia i dane używane przez glibc
Group: Applications/System
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.
@@ -316,7 +336,7 @@
Group: Development/Building
Provides: %{name}-headers(%{_target_cpu}) = %{epoch}:%{version}-%{release}
%ifarch %{x8664}
-# If both -m32 and -m64 is to be supported on x86_64 package
+# If both -m32 and -m64 is to be supported on x86_64, x86_64 package
# have to be installed, not ix86 one.
Obsoletes: %{name}-headers(i386)
Obsoletes: %{name}-headers(i486)
@@ -410,7 +430,7 @@
Group: Documentation
Provides: %{name}-devel-doc(%{_target_cpu}) = %{epoch}:%{version}-%{release}
%ifarch %{x8664}
-# If both -m32 and -m64 is to be supported on x86_64 package
+# If both -m32 and -m64 is to be supported on x86_64, x86_64 package
# have to be installed, not ix86 one.
Obsoletes: %{name}-devel-doc(i386)
Obsoletes: %{name}-devel-doc(i486)
@@ -791,25 +811,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
-
%prep
%setup -q -a1
ln -s glibc-libidn-%{version} libidn
@@ -849,10 +850,15 @@
%{__aclocal}
%{__autoconf}
-rm -rf builddir && install -d builddir && cd builddir
+rm -rf builddir
+install -d builddir
+cd builddir
+%ifarch sparc64
+CC="%{__cc} -m64 -mcpu=ultrasparc -mvis -fcall-used-g6"
+%endif
AWK="gawk" \
../%configure \
- --enable-kernel="2.6.0" \
+ --enable-kernel="%{min_kernel}" \
--enable-omitfp \
--with-headers=%{_includedir} \
--with%{!?with_selinux:out}-selinux \
@@ -887,7 +893,7 @@
%if %{without cross}
# compiling static using klibc vs glibc saves 490k
klcc %{SOURCE8} %{rpmcflags} -static -o postshell
-klcc %{SOURCE9} %{rpmcflags} -static -o glibc-postinst
+klcc %{SOURCE7} %{rpmcflags} -static -o glibc-postinst
%endif
%install
@@ -924,15 +930,12 @@
%{?with_memusage:mv -f $RPM_BUILD_ROOT/%{_lib}/libmemusage.so $RPM_BUILD_ROOT%{_libdir}}
mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so $RPM_BUILD_ROOT%{_libdir}
-rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo/{localtime,posixtime,posixrules,posix/*}
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
+# moved to tzdata package
+rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
-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
@@ -946,7 +949,6 @@
install nss/nsswitch.conf $RPM_BUILD_ROOT%{_sysconfdir}
bzip2 -dc %{SOURCE5} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-bzip2 -dc %{SOURCE6} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
> $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.cache
install -d $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf.d
echo 'include ld.so.conf.d/*.conf' > $RPM_BUILD_ROOT%{_sysconfdir}/ld.so.conf
@@ -957,7 +959,8 @@
:> $RPM_BUILD_ROOT/var/lib/nscd/group
:> $RPM_BUILD_ROOT/var/lib/nscd/hosts
-rm -rf documentation && install -d documentation
+rm -rf documentation
+install -d documentation
for f in ANNOUNCE ChangeLog DESIGN-{barrier,condvar,rwlock,sem}.txt TODO{,-kernel,-testing}; do
cp -f nptl/$f documentation/$f.nptl
@@ -1023,7 +1026,7 @@
done
# localedb-gen infrastructure
-install %{SOURCE7} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
+install %{SOURCE6} $RPM_BUILD_ROOT%{_bindir}/localedb-gen
install localedata/SUPPORTED $RPM_BUILD_ROOT%{_datadir}/i18n
# shutup check-files
@@ -1103,7 +1106,7 @@
# ld.so.1 on ppc
# ld64.so.1 on ppc64,s390x
# ld-linux-ia64.so.2 on ia64
-# ld-linux-x86-64.so.2 on x86-64
+# ld-linux-x86-64.so.2 on x86_64
# ld-linux.so.2 on other archs
%attr(755,root,root) /%{_lib}/ld*
%attr(755,root,root) /%{_lib}/libanl*
@@ -1151,8 +1154,6 @@
%dir %{_datadir}/locale
%{_datadir}/locale/locale.alias
-%{_datadir}/zoneinfo
-%exclude %{_datadir}/zoneinfo/right
%{_mandir}/man1/catchsegv.1*
%{_mandir}/man1/getconf.1*
@@ -1174,6 +1175,7 @@
%lang(cs) %{_mandir}/cs/man7/*
%lang(de) %{_mandir}/de/man5/tzfile.5*
%lang(de) %{_mandir}/de/man7/*
+%lang(es) %{_mandir}/es/man1/ldd.1*
%lang(es) %{_mandir}/es/man5/locale.5*
%lang(es) %{_mandir}/es/man5/nsswitch.conf.5*
%lang(es) %{_mandir}/es/man5/tzfile.5*
@@ -1212,6 +1214,7 @@
%lang(ja) %{_mandir}/ja/man8/tzselect.8*
%lang(ja) %{_mandir}/ja/man8/zdump.8*
%lang(ja) %{_mandir}/ja/man8/zic.8*
+%lang(ko) %{_mandir}/ko/man1/ldd.1*
%lang(ko) %{_mandir}/ko/man5/nsswitch.conf.5*
%lang(ko) %{_mandir}/ko/man5/tzfile.5*
%lang(ko) %{_mandir}/ko/man7/*
@@ -1229,12 +1232,22 @@
%lang(pt) %{_mandir}/pt/man8/tzselect.8*
%lang(pt) %{_mandir}/pt/man8/zdump.8*
%lang(pt) %{_mandir}/pt/man8/zic.8*
+%lang(ru) %{_mandir}/ru/man1/getent.1*
+%lang(ru) %{_mandir}/ru/man1/iconv.1*
+%lang(ru) %{_mandir}/ru/man1/ldd.1*
+%lang(ru) %{_mandir}/ru/man1/locale.1*
+%lang(ru) %{_mandir}/ru/man1/rpcgen.1*
+%lang(ru) %{_mandir}/ru/man5/locale.5*
%lang(ru) %{_mandir}/ru/man5/nsswitch.conf.5*
%lang(ru) %{_mandir}/ru/man5/tzfile.5*
%lang(ru) %{_mandir}/ru/man7/*
+%lang(ru) %{_mandir}/ru/man8/ld*.8*
+%lang(ru) %{_mandir}/ru/man8/rpcinfo.8*
%lang(ru) %{_mandir}/ru/man8/tzselect.8*
%lang(ru) %{_mandir}/ru/man8/zdump.8*
%lang(ru) %{_mandir}/ru/man8/zic.8*
+%lang(tr) %{_mandir}/tr/man1/iconv.1*
+%lang(tr) %{_mandir}/tr/man1/ldd.1*
%lang(zh_CN) %{_mandir}/zh_CN/man1/iconv.1*
%lang(zh_CN) %{_mandir}/zh_CN/man1/ldd.1*
%lang(zh_CN) %{_mandir}/zh_CN/man5/locale.5*
@@ -1244,10 +1257,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*
@@ -1348,7 +1357,9 @@
%lang(nl) %{_mandir}/nl/man3/*
%lang(pl) %{_mandir}/pl/man3/*
%lang(pt) %{_mandir}/pt/man3/*
+%lang(ru) %{_mandir}/ru/man1/sprof.1*
%lang(ru) %{_mandir}/ru/man3/*
+%lang(tr) %{_mandir}/tr/man3/*
%lang(uk) %{_mandir}/uk/man3/*
%lang(zh_CN) %{_mandir}/zh_CN/man3/*
@@ -1368,12 +1379,17 @@
%{_mandir}/man5/nscd.conf.5*
%{_mandir}/man8/nscd.8*
%{_mandir}/man8/nscd_nischeck.8*
+%lang(es) %{_mandir}/es/man5/nscd.conf.5*
+%lang(es) %{_mandir}/es/man8/nscd.8*
%lang(fr) %{_mandir}/fr/man5/nscd.conf.5*
%lang(fr) %{_mandir}/fr/man8/nscd.8*
%lang(ja) %{_mandir}/ja/man5/nscd.conf.5*
%lang(ja) %{_mandir}/ja/man8/nscd.8*
%lang(pt) %{_mandir}/pt/man5/nscd.conf.5*
%lang(pt) %{_mandir}/pt/man8/nscd.8*
+%lang(ru) %{_mandir}/ru/man5/nscd.conf.5*
+%lang(ru) %{_mandir}/ru/man8/nscd.8*
+%lang(zh_CN) %{_mandir}/zh_CN/man5/nscd.conf.5*
%files -n localedb-src
%defattr(644,root,root,755)
@@ -1381,6 +1397,7 @@
%attr(755,root,root) %{_bindir}/localedb-gen
%{_datadir}/i18n
%{_mandir}/man1/localedef.1*
+%lang(ru) %{_mandir}/ru/man1/localedef.1*
%if %{with localedb}
%files localedb-all
@@ -1427,6 +1444,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.590.2.44 2006/06/07 08:04:47 qboosh
+- merged some changes from HEAD (man update, tzdata separation)
+- restored min_kernel macro
+
Revision 1.590.2.43 2006/06/07 07:18:41 freetz
- rel.3
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.590.2.43&r2=1.590.2.44&f=u
More information about the pld-cvs-commit
mailing list