Author: glen Date: Tue Nov 20 19:44:35 2007 GMT
Module: SPECS Tag: HEAD
---- Log message:
- separate pkg for ldconfig. this should help poldek with multilib
installations (merged from AC-branch)
---- Files affected:
SPECS:
glibc.spec (1.741 -> 1.742)
---- Diffs:
================================================================
Index: SPECS/glibc.spec
diff -u SPECS/glibc.spec:1.741 SPECS/glibc.spec:1.742
--- SPECS/glibc.spec:1.741 Mon Nov 19 14:38:35 2007
+++ SPECS/glibc.spec Tue Nov 20 20:44:30 2007
@@ -37,7 +37,7 @@
Summary(uk.UTF-8): GNU libc версії
Name: glibc
Version: 2.7
-Release: 8
+Release: 8.1
Epoch: 6
License: LGPL v2.1+
Group: Libraries
@@ -91,6 +91,7 @@
%else
BuildRequires: binutils >= 2:2.15.90.0.3
%endif
+AutoReq: false
%{!?with_cross:BuildRequires: dietlibc-static}
BuildRequires: gawk
BuildRequires: gcc >= 5:3.4
@@ -104,18 +105,15 @@
BuildRequires: rpmbuild(macros) >= 1.396
BuildRequires: sed >= 4.0.5
BuildRequires: texinfo
-AutoReq: false
+Requires(post): ldconfig = %{epoch}:%{version}-%{release}
Requires: %{name}-misc = %{epoch}:%{version}-%{release}
Requires: basesystem
Requires: uname(release) >= %{min_kernel}
-Provides: /sbin/ldconfig
Provides: glibc(nptl)
Provides: glibc(tls)
-Provides: ldconfig
Provides: rtld(GNU_HASH)
Obsoletes: glibc-common
Obsoletes: glibc-debug
-Obsoletes: ldconfig
%ifarch %{x8664} sparc64 ppc64
Provides: glibc64
Obsoletes: glibc64
@@ -269,7 +267,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
@@ -278,6 +275,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
@@ -924,8 +962,9 @@
done
%endif
-%if !%{with cross}
-diet %{__cc} %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
+%if %{without cross}
+CC="%{__cc}"
+diet ${CC#*ccache } %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
%endif
%install
@@ -954,7 +993,7 @@
install elf/sofini.os
$RPM_BUILD_ROOT%{_libdir}/sofini.o
cd ..
-%if !%{with cross}
+%if %{without cross}
install glibc-postinst $RPM_BUILD_ROOT/sbin
%endif
@@ -1088,7 +1127,7 @@
# don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
# when %%postun is run
-%if !%{with cross}
+%if %{without cross}
%post -p /sbin/postshell
/sbin/glibc-postinst /%{_lib}/%{_host_cpu} /%{_lib}/tls
/sbin/ldconfig
@@ -1142,7 +1181,6 @@
%if !%{with cross}
%attr(755,root,root) /sbin/glibc-postinst
%endif
-%attr(755,root,root) /sbin/ldconfig
# ld-*.so SONAME is:
# ld.so.1 on ppc
# ld64.so.1 on ppc64,s390x
@@ -1156,9 +1194,6 @@
%attr(755,root,root) /%{_lib}/libnsl*
%attr(755,root,root) /%{_lib}/lib[BScmprtu]*
%{?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)
@@ -1168,6 +1203,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)
@@ -1484,6 +1526,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.742 2007-11-20 19:44:30 glen
+- separate pkg for ldconfig. this should help poldek with multilib
+ installations (merged from AC-branch)
+
Revision 1.741 2007-11-19 13:38:35 glen
- adapter
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/glibc.spec?r1=1.741&r2=1.742&f=u
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
