diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2007-05-24 10:33:02 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2007-05-24 10:33:02 +0000 |
| commit | 619b79105b34179aab8ade7f232e2cfc505a22ed (patch) | |
| tree | 265582300d98ffe130b2e76ff46f50834e6cdaa1 /fedora | |
| parent | 75831cc48d3fef9b0bb247aabbcdaceef85efa23 (diff) | |
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/build-locale-archive.c | 2 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 10 |
2 files changed, 9 insertions, 3 deletions
diff --git a/fedora/build-locale-archive.c b/fedora/build-locale-archive.c index ef0ac91ba7..afe0cbdaae 100644 --- a/fedora/build-locale-archive.c +++ b/fedora/build-locale-archive.c @@ -618,7 +618,7 @@ int main () closedir (dirp); fill_archive (&tmpl_ah, cnt, list, primary); close_archive (&tmpl_ah); - unlink (tmpl_file); + truncate (tmpl_file, 0); char *argv[] = { "/usr/sbin/tzdata-update", NULL }; execve (argv[0], (char *const *)argv, (char *const *)&argv[1]); exit (0); diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index 201d0753ac..18d04c8868 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 2 +%define glibcrelease 3 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define xenarches i686 athlon %ifarch %{xenarches} @@ -1506,7 +1506,7 @@ rm -f *.filelist* %files -f common.filelist common %defattr(-,root,root) %dir %{_prefix}/lib/locale -%attr(0644,root,root) %config(missingok) %{_prefix}/lib/locale/locale-archive.tmpl +%attr(0644,root,root) %verify(not md5 size mtime) %{_prefix}/lib/locale/locale-archive.tmpl %attr(0644,root,root) %verify(not md5 size mtime mode) %ghost %config(missingok,noreplace) %{_prefix}/lib/locale/locale-archive %dir %attr(755,root,root) /etc/default %verify(not md5 size mtime) %config(noreplace) /etc/default/nss @@ -1561,6 +1561,12 @@ rm -f *.filelist* %endif %changelog +* Thu May 24 2007 Jakub Jelinek <jakub@redhat.com> 2.6-3 +- don't use %%config(missingok) for locale-archive.tmpl, + instead of removing it altogether truncate it to zero + size (#240697) +- add a workaround for #210748 + * Mon May 21 2007 Jakub Jelinek <jakub@redhat.com> 2.6-2 - restore malloc_set_state backwards compatibility (#239344) - fix epoll_pwait (BZ#4525) |