2.3.4-2

diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in
index b0afaa3e04df7b959dc7692f5a26a7b6433acf62..1a9a960012bb8c42d426af7651ac4fdc1da0348f 100644 (file)
--- a/fedora/glibc.spec.in
+++ b/fedora/glibc.spec.in
@@ -1,4 +1,4 @@
-%define glibcrelease 1
+%define glibcrelease 2
 %define auxarches i586 i686 athlon sparcv9 alphaev6
 %define prelinkarches noarch
 %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64
@@ -525,7 +525,8 @@ $GCC -static -L. -Os ../fedora/glibc_post_upgrade.c -o glibc_post_upgrade.%{_tar
     '-DLIBTLS="/%{_lib}/tls/"' \
 %endif
     '-DGCONV_MODULES_DIR="%{_prefix}/%{_lib}/gconv"' \
-    '-DLD_SO_CONF="/etc/ld.so.conf"'
+    '-DLD_SO_CONF="/etc/ld.so.conf"' \
+    '-DICONVCONFIG="%{_sbindir}/iconvconfig.%{_target_cpu}"'
 cd ..
 
 # hack
@@ -800,6 +801,9 @@ rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss1-*
 rm -f ${RPM_BUILD_ROOT}/%{_lib}/libnss-*.so.1
 %endif
 
+# Ugly hack for buggy rpm
+ln -f ${RPM_BUILD_ROOT}%{_sbindir}/iconvconfig{,.%{_target_cpu}}
+
 # BUILD THE FILE LIST
 find $RPM_BUILD_ROOT -type f -or -type l |
        sed -e 's|.*/etc|%config &|' \
@@ -1266,6 +1270,10 @@ rm -f *.filelist*
 %endif
 
 %changelog
+* Mon Dec 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.4-2
+- work around rpm bug some more, this time by copying
+  iconvconfig to iconvconfig.%%{_target_cpu}.
+
 * Mon Dec 19 2004 Jakub Jelinek <jakub@redhat.com> 2.3.4-1
 - update from CVS
   - glibc 2.3.4 release

diff --git a/fedora/glibc_post_upgrade.c b/fedora/glibc_post_upgrade.c
index 4b7b806ee7b95d14979d517156032cffcbc82735..9111184605f2741cc212a1d6267e8abd16314b87 100644 (file)
--- a/fedora/glibc_post_upgrade.c
+++ b/fedora/glibc_post_upgrade.c
@@ -159,7 +159,10 @@ main (void)
 
   if (! utimes (GCONV_MODULES_DIR "/gconv-modules.cache", NULL))
     {
-      verbose_exec (113, "/usr/sbin/iconvconfig", "/usr/sbin/iconvconfig",
+#ifndef ICONVCONFIG
+#define ICONVCONFIG "/usr/sbin/iconvconfig"
+#endif
+      verbose_exec (113, ICONVCONFIG, "/usr/sbin/iconvconfig",
                    "-o", GCONV_MODULES_DIR"/gconv-modules.cache",
                    "--nostdlib", GCONV_MODULES_DIR);
     }