[glibc: 5/5] Merge branch 'f16'

Dennis Gilmore ausil at fedoraproject.org
Mon Dec 12 17:49:13 UTC 2011


commit f0d2fdc7e830605c31bb76cf9408b9d9b8a66e1b
Merge: 608edcf 7b81576
Author: Dennis Gilmore <dennis at ausil.us>
Date:   Mon Dec 12 11:48:56 2011 -0600

    Merge branch 'f16'
    
    Conflicts:
    	glibc.spec

 glibc-fdelt.patch    |   33 +++++++++++++++++++++++++++++++++
 glibc-rh708455.patch |   13 +++++++++++++
 glibc-rh750811.patch |   29 +++++++++++++++++++++++++++++
 glibc.spec           |   20 +++++++++++++++++++-
 4 files changed, 94 insertions(+), 1 deletions(-)
---
diff --cc glibc.spec
index 735e3c6,f6b0f8b..a10b124
--- a/glibc.spec
+++ b/glibc.spec
@@@ -28,7 -28,7 +28,7 @@@
  Summary: The GNU libc libraries
  Name: glibc
  Version: %{glibcversion}
- Release: 21%{?dist}
 -Release: 23
++Release: 23%{?dist}
  # GPLv2+ is used in a bunch of programs, LGPLv2+ is used for libraries.
  # Things that are linked directly into dynamically linked programs
  # and shared libraries (e.g. crt files, lib*_nonshared.a) have an additional


More information about the scm-commits mailing list