X-Git-Url: http://git.pld-linux.org/?p=packages%2Fglibc.git;a=blobdiff_plain;f=glibc.spec;h=ef1a3883bbf286d1cb485f0bbaa04bf965ecf7bb;hp=942d8e0fb7ab1d0714eeab3cc5f69f6ba3bb425d;hb=cc47d1e5cf8eef9ee8fb7568022b14d9519a1ad7;hpb=87d5a0d2f06dd3fd2ce85cc890c342015f73d08a

diff --git a/glibc.spec b/glibc.spec
index 942d8e0..ef1a388 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -1,5 +1,4 @@
 # TODO:
-# - update locale patches
 # - files?
 #   /usr/lib64/libBrokenLocale_g.a
 #   /usr/lib64/libanl_g.a
@@ -48,7 +47,7 @@ Summary(tr):	GNU libc
 Summary(uk):	GNU libc ×ÅÒÓ¦§ 2.3
 Name:		glibc
 Version:	2.5
-Release:	0.1
+Release:	0.2
 Epoch:		6
 License:	LGPL
 Group:		Libraries
@@ -69,18 +68,18 @@ Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-pld.patch
 Patch3:		%{name}-crypt-blowfish.patch
 Patch4:		%{name}-alpha-ev6-opcodes.patch
-
+Patch5:		%{name}-sparc-softfp-gcc.patch
 Patch6:		%{name}-paths.patch
-
+Patch7:		%{name}-sparc64-fixes.patch
 Patch8:		%{name}-missing-nls.patch
 Patch9:		%{name}-java-libc-wait.patch
 
 Patch11:	%{name}-no_opt_override.patch
 Patch12:	%{name}-includes.patch
+Patch13:	%{name}-ppc-inline-fsqrt.patch
 Patch14:	%{name}-sparc-errno_fix.patch
 
 Patch17:	%{name}-new-charsets.patch
-Patch18:	%{name}-sr_CS.patch
 
 Patch20:	%{name}-tzfile-noassert.patch
 Patch21:	%{name}-morelocales.patch
@@ -136,6 +135,11 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		filterout_ld		(-Wl,)?-[sS] (-Wl,)?--strip.*
 %define 	specflags_sparc64	-mcpu=ultrasparc -mvis -fcall-used-g6
 
+# -m from CFLAGS or even LDFLAGS is not propagated to some *.o linking
+%ifarch sparc sparcv9
+%{expand:%%define	__cc	%{__cc} -m32}
+%endif
+
 # Xen-friendly glibc
 %define		specflags_ia32		-mno-tls-direct-seg-refs
 %define		specflags_x86_64	-mno-tls-direct-seg-refs
@@ -828,30 +832,33 @@ Zabawka.
 %setup -q -a1
 ln -s glibc-libidn-%{version} libidn
 %patch0 -p1
-#%patch1 -p1
+%patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
+%patch5 -p1
 %patch6 -p1
-
-#%patch8 -p1
+%patch7 -p1
+%patch8 -p1
 %patch9 -p1
 
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 %patch14 -p0
 
 %patch17 -p1
-%patch18 -p1
 
 %patch20 -p1
-#%patch21 -p1
-#%patch22 -p1
+%patch21 -p1
+%patch22 -p1
 %patch23 -p1
 %patch24 -p1
 %{?with_cross:%patch25 -p1}
 
+# these would be copied to localedb-src
+rm -f localedata/locales/*{.orig,~}
+
 chmod +x scripts/cpp
 
 # i786 (aka pentium4) hack
@@ -903,7 +910,7 @@ cd ..
 done
 %endif
 
-%if %{without cross}
+%if !%{with cross}
 diet %{__cc} %{SOURCE7} %{rpmcflags} -Os -static -o glibc-postinst
 %endif
 
@@ -933,7 +940,7 @@ install elf/soinit.os				$RPM_BUILD_ROOT%{_libdir}/soinit.o
 install elf/sofini.os				$RPM_BUILD_ROOT%{_libdir}/sofini.o
 cd ..
 
-%if %{without cross}
+%if !%{with cross}
 install glibc-postinst				$RPM_BUILD_ROOT/sbin
 %endif
 
@@ -1009,13 +1016,15 @@ for i in $RPM_BUILD_ROOT%{_datadir}/locale/* $RPM_BUILD_ROOT%{_libdir}/locale/*
 	fi
 done
 # XXX: to be added when become supported by glibc
-# as (atk, gail)
 # az_IR (gtk+)
+# gn (gn_BR in gnome, maybe gn_PY)
 # dv, haw, kok, ps (iso-codes)
 # my (gaim)
-# tk, ug, yo (used by GNOME)
 #
 # NOTES:
+# what about sr@ije? it used to be sr_CS@ije (should be @[i]jekavian?), but
+# now this dialect uses sr_ME locale - rename dir to sr_ME?
+#
 # bn is used for bn_BD or bn_IN? Assume bn_IN as nothing for bn_BD appeared
 #   till now
 #
@@ -1023,12 +1032,12 @@ done
 #   be,ca,cs,da,de,el,en_GB,es,fi,fr,gl,hr,hu,it,ja,ko,nb,nl,pl,pt_BR,sk,sv,
 #   tr,zh_CN,zh_TW
 #
-for i in aa af am ang ar az bg bn bn_IN br bs byn cy de_AT dz en en@boldquot \
+for i in aa af am ang ar as az bg bn bn_IN br bs byn cy de_AT dz en en@boldquot \
     en@quot en_AU en_CA en_US eo es_AR es_MX es_NI et eu fa fo fr_BE fy ga \
     gez gu gv he hi hsb hy ia id is it_CH iu ka kk kl km kn ku kw ky leet lg li \
     lo lt lv mg mi mk ml mn mr ms mt nds ne nl_BE nn nso oc om or pa pt rm ro \
-    ru rw sa se sid sl so sq sr sr@Latn sr@ije ss syr sw ta te tg th ti tig \
-    tl tlh tt uk ur uz ve vi wa wal xh yi zh_HK zu ; do
+    ru rw sa se si sid sl so sq sr sr@Latn sr@ije ss syr sw ta te tg th ti tig \
+    tk tl tlh tt ug uk ur uz ve vi wa wal xh yi yo zh_HK zu ; do
 	if [ ! -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES ]; then
 		install -d $RPM_BUILD_ROOT%{_datadir}/locale/$i/LC_MESSAGES
 		lang=`echo $i | sed -e 's/_.*//'`
@@ -1053,7 +1062,7 @@ rm -rf $RPM_BUILD_ROOT
 # don't run iconvconfig in %%postun -n iconv because iconvconfig doesn't exist
 # when %%postun is run
 
-%if %{without cross}
+%if !%{with cross}
 %post	-p /sbin/postshell
 /sbin/glibc-postinst /%{_lib}/%{_host_cpu}
 /sbin/ldconfig
@@ -1106,7 +1115,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README NEWS FAQ BUGS
-%if %{without cross}
+%if !%{with cross}
 %attr(755,root,root) /sbin/glibc-postinst
 %endif
 %attr(755,root,root) /sbin/ldconfig