SPECS (AC-branch): glibc.spec - merged from HEAD: man-pages update...
qboosh
qboosh at pld-linux.org
Mon Dec 26 18:34:41 CET 2005
Author: qboosh Date: Mon Dec 26 17:34:41 2005 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- merged from HEAD: man-pages update, ctype-compat,sparc-mman.h patches
- it builds using gcc 4.1, removed BR gcc <= 5:4.1
---- Files affected:
SPECS:
glibc.spec (1.583.2.63 -> 1.583.2.64)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.63 SPECS/glibc.spec:1.583.2.64
--- SPECS/glibc.spec:1.583.2.63 Tue Dec 6 22:05:22 2005
+++ SPECS/glibc.spec Mon Dec 26 18:34:36 2005
@@ -79,7 +79,7 @@
Summary(uk): GNU libc ×ĹŇÓŚ§ 2.3
Name: glibc
Version: 2.3.6
-Release: 2
+Release: 3
Epoch: 6
License: LGPL
Group: Libraries
@@ -91,14 +91,11 @@
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
-Source8: %{name}-LD-path.c
-Source9: postshell.c
+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
Patch0: %{name}-info.patch
Patch1: %{name}-pl.po-update.patch
Patch2: %{name}-pld.patch
@@ -130,6 +127,8 @@
Patch28: %{name}-cross-gcc_eh.patch
Patch29: %{name}-pax_dl-execstack.patch
Patch30: %{name}-large_collate_tables.patch
+Patch31: %{name}-ctype-compat.patch
+Patch32: %{name}-sparc-mman.h.patch
URL: http://www.gnu.org/software/libc/
%{?with_selinux:BuildRequires: audit-libs-devel}
BuildRequires: autoconf
@@ -137,7 +136,6 @@
BuildRequires: binutils >= 2:2.15.90.0.3
%{!?with_cross:BuildRequires: dietlibc-static}
BuildRequires: gcc >= 5:3.2
-BuildRequires: gcc < 5:4.1
%ifarch ppc ppc64 sparc sparcv9 sparc64
%if %{with nptl} || %{with __thread}
BuildRequires: gcc >= 5:3.4
@@ -156,8 +154,8 @@
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
AutoReq: false
+Requires: %{name}-misc = %{epoch}:%{version}-%{release}
Requires: basesystem
-Requires: glibc-misc = %{epoch}:%{version}-%{release}
%{?with_tls:Provides: glibc(tls)}
Provides: ldconfig
Provides: /sbin/ldconfig
@@ -307,6 +305,7 @@
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}
%description misc
@@ -528,7 +527,6 @@
Summary(ru): ëÜŰÉŇŐŔÝÉĘ ÄĹÍĎÎ ÓĹŇ×ÉÓĎ× ÉÍĹÎ
Summary(uk): ëĹŰŐŔŢÉĘ ÄĹÍĎÎ ÓĹ×ŚÓŚ× ŚÍĹÎ
Group: Networking/Daemons
-Requires: rc-scripts >= 0.2.0
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/groupadd
@@ -539,6 +537,7 @@
Requires(postun): /usr/sbin/userdel
Requires: %{name} = %{epoch}:%{version}-%{release}
%{?with_selinux:Requires: libselinux >= 1.18}
+Requires: rc-scripts >= 0.2.0
Provides: group(nscd)
Provides: user(nscd)
@@ -889,8 +888,8 @@
Summary(es): GNU libc - bibliotecas de 64 bits
Summary(pl): GNU libc - biblioteki 64-bitowe
Group: Libraries
-Requires: basesystem
Requires: %{name}-misc = %{epoch}:%{version}-%{release}
+Requires: basesystem
Provides: glibc = %{epoch}:%{version}-%{release}
%{?with_tls:Provides: glibc(tls)}
Provides: ldconfig
@@ -922,8 +921,7 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
-# FIXME
-#%patch7 -p1
+#%patch7 -p1 UPDATE/DROP (which kernels cause problems?)
%patch8 -p1
%patch9 -p1
%patch10 -p1
@@ -948,6 +946,8 @@
%{?with_cross:%patch28 -p1}
%{?with_pax:%patch29 -p1}
%patch30 -p1
+%patch31 -p1
+%patch32 -p1
chmod +x scripts/cpp
@@ -1024,8 +1024,8 @@
%if %{without cross}
# compiling static using diet vs glibc saves 400k
-diet -Os %{__cc} %{SOURCE9} %{rpmcflags} -static -o postshell
-diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o glibc-postinst
+diet -Os %{__cc} %{SOURCE8} %{rpmcflags} -static -o postshell
+diet -Os %{__cc} %{SOURCE7} %{rpmcflags} -static -o glibc-postinst
%endif
%install
@@ -1153,7 +1153,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
@@ -1244,7 +1243,7 @@
cd -
# 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
@@ -1430,6 +1429,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*
@@ -1468,6 +1468,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/*
@@ -1485,12 +1486,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*
@@ -1615,7 +1626,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/*
@@ -1635,12 +1648,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)
@@ -1648,6 +1666,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
@@ -1699,6 +1718,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.583.2.64 2005/12/26 17:34:36 qboosh
+- merged from HEAD: man-pages update, ctype-compat,sparc-mman.h patches
+- it builds using gcc 4.1, removed BR gcc <= 5:4.1
+
Revision 1.583.2.63 2005/12/06 21:05:22 glen
- adapterized (kill prereq)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/glibc.spec?r1=1.583.2.63&r2=1.583.2.64&f=u
More information about the pld-cvs-commit
mailing list