- completed locale_fixes patch update

[packages/glibc.git] / glibc.spec

diff --git a/glibc.spec b/glibc.spec
index 9d6f72a48c4fb3e8216eba9ee6c2c39224f95998..11b871e04100d6588d083df8c62d968c82e4000f 100644 (file)
--- a/glibc.spec
+++ b/glibc.spec
@@ -21,7 +21,7 @@
 %undefine      with_memusage
 %endif
 
-%define                core_version    2.18
+%define                core_version    2.19
 %define                llh_version     7:2.6.20.4-1
 
 Summary:       GNU libc
@@ -35,12 +35,12 @@ Summary(tr.UTF-8):  GNU libc
 Summary(uk.UTF-8):     GNU libc версії
 Name:          glibc
 Version:       %{core_version}
-Release:       7
+Release:       0.1
 Epoch:         6
 License:       LGPL v2.1+
 Group:         Libraries
 Source0:       http://ftp.gnu.org/gnu/glibc/%{name}-%{version}.tar.xz
-# Source0-md5: 88fbbceafee809e82efd52efa1e3c58f
+# Source0-md5: e26b8cc666b162f999404b03970f14e4
 Source2:       nscd.init
 Source3:       nscd.sysconfig
 Source4:       nscd.logrotate
@@ -68,7 +68,9 @@ Patch12:      %{name}-format.patch
 Patch14:       %{name}-sparc-errno_fix.patch
 Patch15:       %{name}-new-charsets.patch
 Patch16:       %{name}-tzfile-noassert.patch
+# additions pending for upstream merge or taken from other distros
 Patch17:       %{name}-morelocales.patch
+# fixes mostly pending for upstream merge
 Patch18:       %{name}-locale_fixes.patch
 Patch19:       %{name}-ZA_collate.patch
 Patch20:       %{name}-thread_start.patch
@@ -84,8 +86,6 @@ Patch29:      %{name}-arm-alignment-fix.patch
 
 Patch31:       %{name}-origin.patch
 Patch32:       %{name}-Os-fail-workaround.patch
-Patch33:       %{name}-hack-strstr.patch
-Patch34:       %{name}-make-ver.patch
 
 Patch38:       1055_all_glibc-resolv-dynamic.patch
 URL:           http://www.gnu.org/software/libc/
@@ -971,8 +971,6 @@ exit 1
 
 %patch31 -p1
 %patch32 -p1
-%patch33 -p1
-%patch34 -p1
 
 %patch38 -p1
 
@@ -1100,8 +1098,6 @@ mv -f $RPM_BUILD_ROOT/%{_lib}/libpcprofile.so     $RPM_BUILD_ROOT%{_libdir}
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/localtime
 rm -rf $RPM_BUILD_ROOT%{_datadir}/zoneinfo
 
-ln -sf libbsd-compat.a         $RPM_BUILD_ROOT%{_libdir}/libbsd.a
-
 # make symlinks across top-level directories absolute
 for l in BrokenLocale anl cidn crypt dl m nsl resolv rt thread_db util; do
        test -L $RPM_BUILD_ROOT%{_libdir}/lib${l}.so || exit 1
@@ -1679,8 +1675,6 @@ fi
 %{_libdir}/libc.so
 %{_libdir}/libpthread.so
 # static-only libs
-%{_libdir}/libbsd-compat.a
-%{_libdir}/libbsd.a
 %{_libdir}/libc_nonshared.a
 %{_libdir}/libg.a
 %{_libdir}/libieee.a