SPECS (AC-branch): glibc.spec - separate pkg for ldconfig. this sh...
glen
glen at pld-linux.org
Tue Nov 13 17:10:23 CET 2007
Author: glen Date: Tue Nov 13 16:10:23 2007 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- separate pkg for ldconfig. this should help poldek with multilib
installations.
---- Files affected:
SPECS:
glibc.spec (1.583.2.93 -> 1.583.2.94)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.583.2.93 SPECS/glibc.spec:1.583.2.94
--- SPECS/glibc.spec:1.583.2.93 Tue Nov 13 15:52:06 2007
+++ SPECS/glibc.spec Tue Nov 13 17:10:18 2007
@@ -87,7 +87,7 @@
Summary(uk.UTF-8): GNU libc версії 2.3
Name: glibc
Version: 2.3.6
-Release: 13
+Release: 13.1
Epoch: 6
License: LGPL
Group: Libraries
@@ -132,7 +132,7 @@
Patch26: %{name}-iconvconfig-nxstack.patch
Patch27: %{name}-sys-kd.patch
Patch28: %{name}-cross-gcc_eh.patch
-# WARNING: do not comment or delete pax_dl-execstack.patch, please. If you think
+# WARNING: do not comment or delete pax_dl-execstack.patch, please. If you think
# that this is a good idea send some info to pld-devel-{pl,en}
Patch29: %{name}-pax_dl-execstack.patch
Patch30: %{name}-pax-build.patch
@@ -166,6 +166,7 @@
%if %{without kernelheaders}
BuildRequires: linux-libc-headers >= %{llh_version}
%endif
+AutoReq: false
%{?with_selinux:BuildRequires: libselinux-devel >= 1.18}
%{?with_pax:BuildRequires: paxctl}
BuildRequires: perl-base
@@ -174,15 +175,12 @@
BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
-AutoReq: false
+Requires(post): ldconfig = %{epoch}:%{version}-%{release}
Requires: %{name}-misc = %{epoch}:%{version}-%{release}
Requires: basesystem
-Provides: /sbin/ldconfig
%{?with_tls:Provides: glibc(tls)}
-Provides: ldconfig
Obsoletes: glibc-common
Obsoletes: glibc-debug
-Obsoletes: ldconfig
Conflicts: kernel < %{min_kernel}
Conflicts: ld.so < 1.9.9-10
Conflicts: man-pages < 1.43
@@ -322,7 +320,6 @@
Summary(pl.UTF-8): 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
@@ -331,6 +328,47 @@
%description misc -l pl.UTF-8
Narzędzia i dane używane przez glibc.
+%package -n ldconfig
+Summary: Creates shared library cache and maintains symlinks
+Summary(de.UTF-8): Erstellt ein shared library cache und verwaltet symlinks
+Summary(fr.UTF-8): Crée un cache de bibliothčque partagée et gčre *.so
+Summary(pl.UTF-8): Tworzy cache bibliotek dynamicznych i ich symlinki
+Summary(tr.UTF-8): Ortak kitaplýk önbelleđi yaratýr ve bađlantýlarý kurar
+Group: Applications/System
+# This is needed because previous package (glibc) had autoreq false and had
+# provided this manually. Probably poldek bug that have to have it here.
+Provides: /sbin/ldconfig
+
+%description -n ldconfig
+ldconfig scans a running system and sets up the symbolic links that
+are used to load shared libraries properly. It also creates
+/etc/ld.so.cache which speeds the loading programs which use shared
+libraries.
+
+%description -n ldconfig -l pl.UTF-8
+Ldconfig testuje uruchominy system i tworzy symboliczne linki, które
+są następnie używane do poprawnego ładowania bibliotek dynamicznych.
+Program ten tworzy plik /etc/ld.so.cache, który przyśpiesza wywołanie
+dowolnego programu korzystającego z bibliotek dynamicznych.
+
+%description -n ldconfig -l de.UTF-8
+ldconfig scannt ein laufendes System und richtet die symbolischen
+Verknüpfungen zum Laden der gemeinsam genutzten Libraries ein.
+Außerdem erstellt es /etc/ld.so.cache, was das Laden von Programmen
+mit gemeinsam genutzten Libraries beschleunigt.
+
+%description -n ldconfig -l fr.UTF-8
+ldconfig analyse un systčme et configure les liens symboliques
+utilisés pour charger correctement les bibliothčques partagées. Il
+crée aussi /etc/ld.so.cache qui accélčre le chargement des programmes
+utilisant les bibliothčques partagées.
+
+%description -n ldconfig -l tr.UTF-8
+ldconfig, çalýţmakta olan sistemi araţtýrýr ve ortak kitaplýklarýn
+düzgün bir ţekilde yüklenmesi için gereken simgesel bađlantýlarý
+kurar. Ayrýca ortak kitaplýklarý kullanan programlarýn yüklenmesini
+hýzlandýran /etc/ld.so.cache dosyasýný yaratýr.
+
%package devel
Summary: Additional libraries required to compile
Summary(de.UTF-8): Weitere Libraries zum Kompilieren
@@ -886,14 +924,13 @@
Summary(es.UTF-8): GNU libc - bibliotecas de 64 bits
Summary(pl.UTF-8): GNU libc - biblioteki 64-bitowe
Group: Libraries
+Requires(post): ldconfig = %{epoch}:%{version}-%{release}
Requires: %{name}-misc = %{epoch}:%{version}-%{release}
Requires: basesystem
Provides: glibc = %{epoch}:%{version}-%{release}
%{?with_tls:Provides: glibc(tls)}
-Provides: ldconfig
Obsoletes: glibc-common
Obsoletes: glibc-debug
-Obsoletes: ldconfig
Conflicts: kernel < %{min_kernel}
Conflicts: ld.so < 1.9.9-10
Conflicts: man-pages < 1.43
@@ -1070,7 +1107,11 @@
cd ..
%if %{without cross}
-install glibc-postinst $RPM_BUILD_ROOT/sbin
+%ifarch %{x8664} ppc64 s390x sparc64
+install glibc-postinst $RPM_BUILD_ROOT/sbin/glibc-postinst64
+%else
+install glibc-postinst $RPM_BUILD_ROOT/sbin/glibc-postinst
+%endif
%endif
%if %{with dual}
@@ -1267,7 +1308,11 @@
%else
%post -p /sbin/postshell
%endif
+%ifarch %{x8664} ppc64 s390x sparc64
+/sbin/glibc-postinst64 /%{_lib}/%{_host_cpu}
+%else
/sbin/glibc-postinst /%{_lib}/%{_host_cpu}
+%endif
/sbin/ldconfig
-/sbin/telinit u
@@ -1340,9 +1385,8 @@
%defattr(644,root,root,755)
%doc README NEWS FAQ BUGS
%if %{without cross}
-%attr(755,root,root) /sbin/glibc-postinst
+%attr(755,root,root) /sbin/glibc-postinst*
%endif
-%attr(755,root,root) /sbin/ldconfig
# ld* and libc.so.6 SONAME symlinks must be in package because of
# chicken-egg problem (postshell is dynamically linked with libc);
# ld-*.so SONAME is:
@@ -1361,9 +1405,6 @@
%attr(755,root,root) /%{_lib}/tls/lib[cmprt]*
%endif
%{?with_localedb:%dir %{_libdir}/locale}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf
-%dir %{_sysconfdir}/ld.so.conf.d
-%ghost %{_sysconfdir}/ld.so.cache
#%files -n nss_dns
%defattr(644,root,root,755)
@@ -1373,6 +1414,13 @@
%defattr(644,root,root,755)
%attr(755,root,root) /%{_lib}/libnss_files*.so*
+%files -n ldconfig
+%defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ld.so.conf
+%dir %{_sysconfdir}/ld.so.conf.d
+%ghost %{_sysconfdir}/ld.so.cache
+%attr(755,root,root) /sbin/ldconfig
+
%files misc -f %{name}.lang
%defattr(644,root,root,755)
@@ -1707,6 +1755,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.583.2.94 2007-11-13 16:10:18 glen
+- separate pkg for ldconfig. this should help poldek with multilib
+ installations.
+
Revision 1.583.2.93 2007-11-13 14:52:06 glen
- remove ccache from %{__cc} -- diet passes -n which ccache doesn't understand
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.583.2.93&r2=1.583.2.94&f=u
More information about the pld-cvs-commit
mailing list