Accepting request 74024 from Base:System
forwarding to factory OBS-URL: https://build.opensuse.org/request/show/74024 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=51
This commit is contained in:
commit
7198d6e5c9
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 17 09:50:19 UTC 2011 - aj@suse.de
|
||||
|
||||
- Cleanup ld.so.conf list, move kde directories to
|
||||
kdelibs3 (bnc#671725).
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Jun 17 07:07:37 UTC 2011 - aj@suse.de
|
||||
|
||||
|
68
glibc.spec
68
glibc.spec
@ -71,7 +71,7 @@ Obsoletes: glibc-64bit
|
||||
Obsoletes: glibc-32bit
|
||||
%endif
|
||||
Version: 2.13
|
||||
Release: 7
|
||||
Release: 5
|
||||
Url: http://www.gnu.org/software/libc/libc.html
|
||||
Source: glibc-%{version}-996cf2ef0727.tar.bz2
|
||||
Source2: http://ftp.gnu.org/gnu/glibc/glibc-ports-2.13.tar.bz2
|
||||
@ -207,6 +207,7 @@ Patch502: ARM_glibc-2.10.1-local-lowlevellock.diff
|
||||
# PATCH-MISSING-TAG -- See http://en.opensuse.org/openSUSE:Packaging_Patches_guidelines
|
||||
Patch503: ARM_glibc-2.10.1-local-no-hwcap.diff
|
||||
|
||||
|
||||
%description
|
||||
The GNU C Library provides the most important standard libraries used
|
||||
by nearly all programs: the standard C library, the standard math
|
||||
@ -219,6 +220,7 @@ Summary: Info Files for the GNU C Library
|
||||
Group: Documentation/Other
|
||||
PreReq: %{install_info_prereq}
|
||||
|
||||
|
||||
%description info
|
||||
This package contains the documentation for the GNU C library stored as
|
||||
info files. Due to a lack of resources, this documentation is not
|
||||
@ -229,6 +231,7 @@ License: GPLv2+ ; LGPLv2.1+
|
||||
Summary: HTML Documentation for the GNU C Library
|
||||
Group: Documentation/HTML
|
||||
|
||||
|
||||
%description html
|
||||
This package contains the HTML documentation for the GNU C library. Due
|
||||
to a lack of resources, this documentation is not complete and is
|
||||
@ -239,6 +242,7 @@ License: LGPLv2.1+
|
||||
Summary: Database Sources for 'locale'
|
||||
Group: System/Libraries
|
||||
|
||||
|
||||
%description i18ndata
|
||||
This package contains the data needed to build the locale data files to
|
||||
use the internationalization features of the GNU libc. It is normally
|
||||
@ -259,6 +263,7 @@ Obsoletes: glibc-locale-64bit
|
||||
Obsoletes: glibc-locale-32bit
|
||||
%endif
|
||||
|
||||
|
||||
%description locale
|
||||
Locale data for the internationalisation features of the GNU C library.
|
||||
|
||||
@ -270,6 +275,7 @@ Provides: aaa_base:/etc/init.d/nscd
|
||||
Provides: glibc:/usr/sbin/nscd
|
||||
PreReq: %insserv_prereq
|
||||
|
||||
|
||||
%description -n nscd
|
||||
Nscd caches name service lookups and can dramatically improve
|
||||
performance with NIS, NIS+, and LDAP.
|
||||
@ -287,6 +293,7 @@ Obsoletes: glibc-profile-64bit
|
||||
Obsoletes: glibc-profile-32bit
|
||||
%endif
|
||||
|
||||
|
||||
%description profile
|
||||
This package contains special versions of the GNU C library which are
|
||||
necessary for profiling and debugging.
|
||||
@ -307,6 +314,7 @@ Obsoletes: glibc-devel-32bit
|
||||
PreReq: /bin/rm
|
||||
Requires: glibc = %{version}, linux-kernel-headers
|
||||
|
||||
|
||||
%description devel
|
||||
These libraries are needed to develop programs which use the standard C
|
||||
library.
|
||||
@ -318,6 +326,7 @@ Summary: C library static libraries for -static linking
|
||||
Group: Development/Libraries/C and C++
|
||||
Requires: %{name}-devel = %{version}
|
||||
|
||||
|
||||
%description devel-static
|
||||
The glibc-devel-static package contains the C library static libraries
|
||||
for -static linking. You don't need these, unless you link statically,
|
||||
@ -329,6 +338,7 @@ Summary: Development utilities from GNU C library
|
||||
Group: Development/Languages/C and C++
|
||||
Requires: glibc = %{version}
|
||||
|
||||
|
||||
%description utils
|
||||
The glibc-utils package contains memusage, a memory usage profiler,
|
||||
mtrace, a memory leak tracer and xtrace, a function call tracer
|
||||
@ -338,12 +348,14 @@ If you are unsure if you need this, don't install this package.
|
||||
|
||||
%ifarch %ix86
|
||||
|
||||
|
||||
%package obsolete
|
||||
License: BSD3c(or similar) ; GPLv2+ ; LGPLv2.1+
|
||||
Summary: Obsolete Shared Libraries from the GNU C Library
|
||||
Group: System/Libraries
|
||||
Requires: glibc = %{version}
|
||||
|
||||
|
||||
%description obsolete
|
||||
This package provides some old libraries from the GNU C Library which
|
||||
are no longer supported. Additional it provides a compatibility library
|
||||
@ -356,6 +368,7 @@ versions of your software.
|
||||
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%ifarch %arm armv5tel armv7l
|
||||
# add glibc-ports for arm
|
||||
@ -462,6 +475,7 @@ find . -name configure | xargs touch
|
||||
###
|
||||
#######################################################################
|
||||
|
||||
|
||||
%build
|
||||
if [ -x /bin/uname.bin ]; then
|
||||
/bin/uname.bin -a
|
||||
@ -637,6 +651,7 @@ $BuildCC -static $RPM_OPT_FLAGS -Os $RPM_SOURCE_DIR/glibc_post_upgrade.c -o glib
|
||||
###
|
||||
#######################################################################
|
||||
|
||||
|
||||
%check
|
||||
%if %{run_testsuite}
|
||||
# Increase timeout
|
||||
@ -659,6 +674,7 @@ make -C cc-base check-abi || echo check-abi failed
|
||||
###
|
||||
#######################################################################
|
||||
|
||||
|
||||
%install
|
||||
# We don't want to strip the .symtab from our libraries in find-debuginfo.sh,
|
||||
# certainly not from libpthread.so.* because it is used by libthread_db to find
|
||||
@ -783,30 +799,22 @@ touch $RPM_BUILD_ROOT/var/run/nscd/{socket,nscd.pid}
|
||||
# Create ld.so.conf
|
||||
#
|
||||
cat > $RPM_BUILD_ROOT/etc/ld.so.conf <<EOF
|
||||
/usr/%{_lib}/Xaw3d
|
||||
%ifarch s390x sparc64 x86_64 ppc64 ppc
|
||||
/usr/lib64/Xaw3d
|
||||
%endif
|
||||
/usr/lib/Xaw3d
|
||||
%ifarch %x86
|
||||
/usr/i586-suse-linux/lib
|
||||
%else
|
||||
%ifarch ppc ppc64
|
||||
/usr/powerpc-suse-linux/lib
|
||||
/usr/powerpc64-suse-linux/lib
|
||||
%else
|
||||
/usr/$RPM_ARCH-suse-linux/lib
|
||||
%endif
|
||||
%endif
|
||||
/usr/local/%{_lib}
|
||||
%ifarch s390x sparc64 x86_64 ppc64 ppc
|
||||
/lib64
|
||||
/lib
|
||||
/usr/lib64
|
||||
/usr/lib
|
||||
/usr/local/lib64
|
||||
/usr/local/lib
|
||||
/opt/kde3/lib64
|
||||
%endif
|
||||
/opt/kde3/lib
|
||||
/%{_lib}
|
||||
%ifarch s390x sparc64 x86_64 ppc64 ppc
|
||||
/lib
|
||||
%endif
|
||||
/usr/%{_lib}
|
||||
%ifarch s390x sparc64 x86_64 ppc64 ppc
|
||||
/usr/lib
|
||||
%endif
|
||||
include /etc/ld.so.conf.d/*.conf
|
||||
EOF
|
||||
# Add ldconfig cache directory for directory ownership
|
||||
@ -842,6 +850,7 @@ done
|
||||
###
|
||||
#######################################################################
|
||||
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
@ -849,10 +858,13 @@ rm -rf $RPM_BUILD_ROOT
|
||||
# %set_permissions %{_libdir}/pt_chown
|
||||
# since we cannot do it in our own post section
|
||||
|
||||
|
||||
%post -p %{_sbindir}/glibc_post_upgrade
|
||||
|
||||
|
||||
%postun -p /sbin/ldconfig
|
||||
|
||||
|
||||
%post locale
|
||||
for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
|
||||
[ -d "$l.d" ] || continue
|
||||
@ -861,19 +873,24 @@ for l in /usr/share/locale/locale.alias %{_libdir}/gconv/gconv-modules; do
|
||||
done
|
||||
/usr/sbin/iconvconfig
|
||||
|
||||
|
||||
%post info
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/libc.info.gz
|
||||
|
||||
|
||||
%postun info
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/libc.info.gz
|
||||
|
||||
|
||||
%preun -n nscd
|
||||
%stop_on_removal nscd
|
||||
|
||||
|
||||
%post -n nscd
|
||||
%{insserv_force_if_yast nscd}
|
||||
mkdir -p /var/run/nscd
|
||||
|
||||
|
||||
%postun -n nscd
|
||||
%restart_on_update nscd
|
||||
%insserv_cleanup
|
||||
@ -890,6 +907,7 @@ exit 0
|
||||
|
||||
# glibc
|
||||
|
||||
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc LICENSES
|
||||
@ -1017,6 +1035,7 @@ exit 0
|
||||
|
||||
%ifarch %ix86
|
||||
|
||||
|
||||
%files obsolete
|
||||
%defattr (755,root,root,755)
|
||||
%dir /%{_lib}/obsolete/
|
||||
@ -1025,6 +1044,7 @@ exit 0
|
||||
/%{_lib}/obsolete/noversion/libNoVersion.so.1
|
||||
%endif
|
||||
|
||||
|
||||
%files locale -f libc.lang
|
||||
%defattr(-,root,root)
|
||||
/usr/share/locale/locale.alias
|
||||
@ -1033,6 +1053,7 @@ exit 0
|
||||
%endif
|
||||
%{_libdir}/gconv
|
||||
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%doc COPYING COPYING.LIB FAQ INSTALL NEWS NOTES README BUGS CONFORMANCE
|
||||
@ -1059,6 +1080,7 @@ exit 0
|
||||
%{_libdir}/libpthread_nonshared.a
|
||||
%{_libdir}/librpcsvc.a
|
||||
|
||||
|
||||
%files devel-static
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libBrokenLocale.a
|
||||
@ -1073,20 +1095,24 @@ exit 0
|
||||
%{_libdir}/librt.a
|
||||
%{_libdir}/libutil.a
|
||||
|
||||
|
||||
%files info
|
||||
%defattr(-,root,root)
|
||||
%doc %{_infodir}/libc.info.gz
|
||||
%doc %{_infodir}/libc.info-?.gz
|
||||
%doc %{_infodir}/libc.info-??.gz
|
||||
|
||||
|
||||
%files html
|
||||
%defattr(-,root,root)
|
||||
%doc %{_prefix}/share/doc/glibc
|
||||
|
||||
|
||||
%files i18ndata
|
||||
%defattr(-,root,root)
|
||||
%{_prefix}/share/i18n
|
||||
|
||||
|
||||
%files -n nscd
|
||||
%defattr(-,root,root)
|
||||
%config(noreplace) /etc/nscd.conf
|
||||
@ -1102,6 +1128,7 @@ exit 0
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/group
|
||||
%attr(0600,root,root) %verify(not md5 size mtime) %ghost %config(missingok,noreplace) /var/run/nscd/hosts
|
||||
|
||||
|
||||
%files profile
|
||||
%defattr(-,root,root)
|
||||
%{_libdir}/libc_p.a
|
||||
@ -1117,6 +1144,7 @@ exit 0
|
||||
%{_libdir}/libutil_p.a
|
||||
%{_libdir}/libdl_p.a
|
||||
|
||||
|
||||
%files utils
|
||||
%defattr(-,root,root)
|
||||
/%{_lib}/libmemusage.so
|
||||
@ -1128,4 +1156,6 @@ exit 0
|
||||
%{_bindir}/pcprofiledump
|
||||
%{_bindir}/xtrace
|
||||
|
||||
|
||||
|
||||
%changelog
|
||||
|
Loading…
Reference in New Issue
Block a user