diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-09-25 07:55:46 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-09-25 07:55:46 +0000 |
| commit | bd7c3bed543d02fb01f69b29ea1a736e7a0f618d (patch) | |
| tree | 7e9bf02d1315ce177dd95075686ba769057d04b2 /fedora | |
| parent | 338cc5101b59b64358bab982e1311604fdb64651 (diff) | |
Updated to fedora-glibc-20040925T0738
Diffstat (limited to 'fedora')
| -rw-r--r-- | fedora/branch.mk | 4 | ||||
| -rw-r--r-- | fedora/glibc.spec.in | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/fedora/branch.mk b/fedora/branch.mk index 95e9a8c0c6..e7c3bf9511 100644 --- a/fedora/branch.mk +++ b/fedora/branch.mk @@ -1,5 +1,5 @@ # This file is updated automatically by Makefile. glibc-branch := fedora glibc-base := HEAD -fedora-sync-date := 2004-09-23 01:48 UTC -fedora-sync-tag := fedora-glibc-20040923T0148 +fedora-sync-date := 2004-09-25 07:38 UTC +fedora-sync-tag := fedora-glibc-20040925T0738 diff --git a/fedora/glibc.spec.in b/fedora/glibc.spec.in index cb92c4ba71..416ad0dfe5 100644 --- a/fedora/glibc.spec.in +++ b/fedora/glibc.spec.in @@ -1,4 +1,4 @@ -%define glibcrelease 56 +%define glibcrelease 57 %define auxarches i586 i686 athlon sparcv9 alphaev6 %define prelinkarches noarch %define nptlarches i386 i686 athlon x86_64 ia64 s390 s390x sparcv9 ppc ppc64 @@ -186,6 +186,7 @@ Summary: A Name Service Caching Daemon (nscd). Group: System Environment/Daemons Conflicts: kernel < 2.2.0 Requires: libselinux >= 1.17.10-1 +Conflicts: selinux-policy-targeted < 1.17.20 Prereq: /sbin/chkconfig, /usr/sbin/useradd, /usr/sbin/userdel, sh-utils Autoreq: true @@ -1238,6 +1239,9 @@ rm -f *.filelist* %endif %changelog +* Sat Sep 25 2004 Jakub Jelinek <jakub@redhat.com> 2.3.3-57 +- update from CVS + * Wed Sep 22 2004 Roland McGrath <roland@redhat.com> 2.3.3-56 - migrated CVS to fedora-branch in sources.redhat.com glibc repository - source tarballs renamed |