diff --git a/glibc-fedora-streams-rh436349.patch b/glibc-fedora-streams-rh436349.patch index 44b9195..5960ca2 100644 --- a/glibc-fedora-streams-rh436349.patch +++ b/glibc-fedora-streams-rh436349.patch @@ -18,8 +18,8 @@ diff -Nrup a/streams/Makefile b/streams/Makefile --- a/streams/Makefile 2012-06-05 07:42:49.000000000 -0600 +++ b/streams/Makefile 2012-06-07 12:15:21.824318649 -0600 @@ -20,7 +20,7 @@ - # - subdir := streams + + include ../Makeconfig -headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h +#headers = stropts.h sys/stropts.h bits/stropts.h bits/xtitypes.h diff --git a/glibc.spec b/glibc.spec index 7bc74eb..5478cbf 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,6 +1,6 @@ -%define glibcsrcdir glibc-2.19-76-g3ea0f74 +%define glibcsrcdir glibc-2.19-112-gd4b1725 %define glibcversion 2.19.90 -%define glibcrelease 4%{?dist} +%define glibcrelease 5%{?dist} # Pre-release tarballs are pulled in from git using a command that is # effectively: # @@ -211,9 +211,6 @@ Patch2027: %{name}-rh819430.patch # Fix nscd to use permission names not constants. Patch2028: %{name}-rh1025126.patch -# Separate ftell logic from fseek -Patch2029: %{name}-rh1069559-1.patch -Patch2030: %{name}-rh1069559-2.patch Patch2031: %{name}-rh1070416.patch ############################################################################## @@ -540,8 +537,6 @@ package or when debugging this package. %patch0044 -p1 %patch0046 -p1 %patch2028 -p1 -%patch2029 -p1 -%patch2030 -p1 %patch2031 -p1 %patch0047 -p1 @@ -1630,6 +1625,9 @@ rm -f *.filelist* %endif %changelog +* Tue Mar 04 2014 Siddhesh Poyarekar - 2.19.90-5 +- Sync with upstream master. + * Thu Feb 27 2014 Siddhesh Poyarekar - 2.19.90-4 - Use nscd service files from glibc sources. - Make nscd service forking in systemd service file. diff --git a/sources b/sources index dbacb61..5174fd8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -109ec1d0fa215e5a93e9202786166ccd glibc-2.19-76-g3ea0f74.tar.gz +3811b8039821aacd918e17560e812e6d glibc-2.19-112-gd4b1725.tar.gz