From 2c6cfe6853a30deb4af842aacc924fa298d0521a Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 19 Dec 2005 12:11:38 +0000
Subject: Updated to fedora-glibc-20051219T1003

---
 fedora/branch.mk     |  4 ++--
 fedora/glibc.spec.in | 40 +++++++++++++---------------------------
 2 files changed, 15 insertions(+), 29 deletions(-)

(limited to 'fedora')

diff --git a/fedora/branch.mk b/fedora/branch.mk
index c65d6d075e..991d75fc73 100644
--- a/fedora/branch.mk
+++ b/fedora/branch.mk
@@ -3,5 +3,5 @@ glibc-branch := fedora
 glibc-base := HEAD
 DIST_BRANCH := devel
 COLLECTION := dist-fc4
-fedora-sync-date := 2005-11-19 19:59 UTC
-fedora-sync-tag := fedora-glibc-20051119T1959
+fedora-sync-date := 2005-12-19 10:03 UTC
+fedora-sync-tag := fedora-glibc-20051219T1003
diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index 29ecf0e1fe..6ea4c95d97 100644
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 18
+%define glibcrelease 19
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define xenarches i686 athlon
@@ -30,7 +30,7 @@ Patch1: %{name}-ppc-assume.patch
 Patch2: %{name}-ia64-lib64.patch
 Buildroot: %{_tmppath}/glibc-%{PACKAGE_VERSION}-root
 Obsoletes: zoneinfo, libc-static, libc-devel, libc-profile, libc-headers,
-Obsoletes: gencat, locale, ldconfig, locale-ja
+Obsoletes: gencat, locale, ldconfig, locale-ja, glibc-profile
 Provides: ldconfig
 Autoreq: false
 Requires: glibc-common = %{version}-%{release}
@@ -150,24 +150,6 @@ executables.
 Install glibc-headers if you are going to develop programs which will
 use the standard C libraries.
 
-%package profile
-Summary: The GNU libc libraries, including support for gprof profiling.
-Group: Development/Libraries
-Obsoletes: libc-profile
-Autoreq: true
-
-%description profile
-The glibc-profile package includes the GNU libc libraries and support
-for profiling using the gprof program.  Profiling is analyzing a
-program's functions to see how much CPU time they use and determining
-which functions are calling other functions during execution.  To use
-gprof to profile a program, your program needs to use the GNU libc
-libraries included in glibc-profile (instead of the standard GNU libc
-libraries included in the glibc package).
-
-If you are going to use the gprof program to profile a program, you'll
-need to install the glibc-profile package.
-
 %package common
 Summary: Common binaries and locale data for glibc
 Conflicts: %{name} < %{version}
@@ -503,7 +485,8 @@ CC="$GCC" CFLAGS="$build_CFLAGS" ../configure --prefix=%{_prefix} \
 	--enable-add-ons=nptl$AddOns --without-cvs $EnableKernel \
 	--with-headers=%{_prefix}/include --enable-bind-now \
 	--with-tls --with-__thread --build %{nptl_target_cpu}-redhat-linux \
-	--host %{nptl_target_cpu}-redhat-linux
+	--host %{nptl_target_cpu}-redhat-linux \
+	--disable-profile
 make %{?_smp_mflags} -r CFLAGS="$build_CFLAGS" PARALLELMFLAGS=-s
 
 cd ..
@@ -512,7 +495,6 @@ cd ..
 build_nptl linuxnptl
 
 %if %{buildxen}
-EnableKernel="$EnableKernel --disable-profile"
 build_nptl linuxnptl-nosegneg -mno-tls-direct-seg-refs
 %endif
 
@@ -691,7 +673,6 @@ for i in $RPM_BUILD_ROOT%{_prefix}/bin/{xtrace,memusage}; do
   chmod 755 $i; rm -f $i.tmp
 done
 
-grep '%{_prefix}/%{_lib}/lib.*_p\.a' < rpm.filelist > profile.filelist || :
 grep '%{_infodir}' < rpm.filelist | grep -v '%{_infodir}/dir' > devel.filelist
 grep '%{_prefix}/include/gnu/stubs-[32164]\+\.h' < rpm.filelist >> devel.filelist || :
 
@@ -934,7 +915,7 @@ case "$-" in *x*) save_trace=yes;; esac
 set +x
 echo Cutting down the list of unpackaged files
 for i in `sed '/%%dir/d;/%%config/d;/%%verify/d;s/%%lang([^)]*) //' \
-	  common.filelist devel.filelist headers.filelist profile.filelist \
+	  common.filelist devel.filelist headers.filelist \
 	  utils.filelist nscd.filelist`; do
   [ -f "$RPM_BUILD_ROOT$i" ] && rm -f "$RPM_BUILD_ROOT$i" || :
 done
@@ -1051,9 +1032,6 @@ rm -f *.filelist*
 %files -f headers.filelist headers
 %defattr(-,root,root)
 
-%files -f profile.filelist profile
-%defattr(-,root,root)
-
 %files -f utils.filelist utils
 %defattr(-,root,root)
 
@@ -1095,6 +1073,14 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Dec 19 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-19
+- update from CVS
+  - sysdeps/generic reorg
+  - setjmp/longjmp jump pointer mangling
+- rebuilt with GCC 4.1-RH prerelease, worked around broken _Pragma ()
+  handling in it
+- remove glibc-profile subpackage
+
 * Sat Nov 19 2005 Jakub Jelinek <jakub@redhat.com> 2.3.90-18
 - update from CVS
   - change <sys/stat.h> for broken apps that #define const /**/,
-- 
cgit v1.2.3