diff --git a/.gitignore b/.gitignore index 8fb1703..74117ff 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,5 @@ glibc-2.14-394-g8f3b1ff /glibc-2.16.90-8f861542-1-fedora.tar.gz /glibc-2.16.90-01f34a3b-fedora.tar.gz /glibc-2.16.90-01f34a3b.tar.gz +/glibc-2.16.90-d14fbb17-fedora.tar.gz +/glibc-2.16.90-d14fbb17.tar.gz diff --git a/glibc-rh790292.patch b/glibc-rh790292.patch deleted file mode 100644 index 4f1351d..0000000 --- a/glibc-rh790292.patch +++ /dev/null @@ -1,188 +0,0 @@ -diff -Nrup a/localedata/locales/sat_IN b/localedata/locales/sat_IN ---- a/localedata/locales/sat_IN 1969-12-31 17:00:00.000000000 -0700 -+++ b/localedata/locales/sat_IN 2012-02-14 09:45:55.072442697 -0700 -@@ -0,0 +1,184 @@ -+comment_char % -+escape_char / -+% Santali language locale for India. -+% Contributed by Mr. Pravin Satpute and Mr. Thakur Prasad Murmu -+ -+LC_IDENTIFICATION -+title "Santali language locale for India" -+source "Red Hat Pune" -+address "Level 1, Tower X, Cybercity, Magarpatta City, Hadapsar, Pune-411013 " -+contact "" -+email "bug-glibc-locales@gnu.org" -+tel "" -+fax "" -+language "Santali" -+territory "India" -+revision "1.0" -+date "2012-01-17" -+% -+category "sat_IN:2012";LC_IDENTIFICATION -+category "sat_IN:2012";LC_CTYPE -+category "sat_IN:2012";LC_COLLATE -+category "sat_IN:2012";LC_TIME -+category "sat_IN:2012";LC_NUMERIC -+category "sat_IN:2012";LC_MONETARY -+category "sat_IN:2012";LC_MESSAGES -+category "sat_IN:2012";LC_PAPER -+category "sat_IN:2012";LC_NAME -+category "sat_IN:2012";LC_ADDRESS -+category "sat_IN:2012";LC_TELEPHONE -+ -+END LC_IDENTIFICATION -+ -+LC_CTYPE -+copy "hi_IN" -+END LC_CTYPE -+ -+LC_COLLATE -+copy "hi_IN" -+END LC_COLLATE -+ -+LC_MONETARY -+copy "hi_IN" -+END LC_MONETARY -+ -+ -+LC_NUMERIC -+copy "hi_IN" -+END LC_NUMERIC -+ -+ -+LC_TIME -+% This is the POSIX Locale definition for the LC_TIME category -+% generated by IBM Basic CountryPack Transformer. -+% These are generated based on XML base Locale definition file -+% for IBM Class for Unicode. -+% -+% Abbreviated weekday names (%a) -+abday "";"";/ -+ "";"";/ -+ "";/ -+ "";"" -+% -+ -+% Full weekday names (%A) -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Abbreviated month names (%b) -+abmon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+ -+% Full month names (%B) -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Equivalent of AM PM -+ -+am_pm "";"" -+ -+% -+% Appropriate date and time representation -+% %A %d %b %Y%I:%M:%S %Z -+d_t_fmt "/ -+/ -+" -+% -+% Appropriate date representation -+% %A %d %b %Y -+d_fmt "/ -+" -+% -+% Appropriate time representation -+% %I:%M:%S %Z -+t_fmt "/ -+" -+% -+% Appropriate 12 h time representation (%r) -+t_fmt_ampm "/ -+" -+% -+% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" -+date_fmt "/ -+/ -+" -+END LC_TIME -+ -+ -+LC_MESSAGES -+% This is the POSIX Locale definition for the LC_MESSAGES category -+% generated by IBM Basic CountryPack Transformer. -+% These are generated based on XML base Locale definition file -+% for IBM Class for Unicode. -+% -+% ^(Yes|[yY]) -+yesexpr "/ -+" -+% -+% ^(No|[nN]) -+noexpr "/ -+" -+% -+END LC_MESSAGES -+ -+ -+LC_PAPER -+copy "hi_IN" -+END LC_PAPER -+ -+ -+LC_NAME -+% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category -+% generated by IBM Basic CountryPack Transformer. -+% -+% -+name_fmt "/ -+" -+name_gen "" -+name_mr "" -+name_mrs "" -+name_miss "" -+name_ms "" -+ -+END LC_NAME -+ -+ -+LC_ADDRESS -+copy "hi_IN" -+END LC_ADDRESS -+ -+ -+LC_TELEPHONE -+copy "hi_IN" -+END LC_TELEPHONE -+ -+ -+LC_MEASUREMENT -+copy "hi_IN" -+END LC_MEASUREMENT diff --git a/glibc-rh790298.patch b/glibc-rh790298.patch deleted file mode 100644 index 92bf620..0000000 --- a/glibc-rh790298.patch +++ /dev/null @@ -1,176 +0,0 @@ -diff -Nrup a/localedata/locales/mni_IN b/localedata/locales/mni_IN ---- a/localedata/locales/mni_IN 1969-12-31 17:00:00.000000000 -0700 -+++ b/localedata/locales/mni_IN 2012-02-14 09:49:33.059129964 -0700 -@@ -0,0 +1,172 @@ -+comment_char % -+escape_char / -+% Manipuri language locale for India. -+% Contributed by Mr. Pravin Satpute and Ms. Rebika Devi < rebika_srd AT rediffmail DOT com> -+ -+LC_IDENTIFICATION -+title "Manipuri language locale for India" -+source "Red Hat Pune" -+address "Level 1, Tower X, Cybercity, Magarpatta City, Hadapsar, Pune-411013 " -+contact "" -+email "bug-glibc-locales@gnu.org" -+tel "" -+fax "" -+language "Manipuri" -+territory "India" -+revision "1.0" -+date "2012-01-17" -+% -+category "mni_IN:2012";LC_IDENTIFICATION -+category "mni_IN:2012";LC_CTYPE -+category "mni_IN:2012";LC_COLLATE -+category "mni_IN:2012";LC_TIME -+category "mni_IN:2012";LC_NUMERIC -+category "mni_IN:2012";LC_MONETARY -+category "mni_IN:2012";LC_MESSAGES -+category "mni_IN:2012";LC_PAPER -+category "mni_IN:2012";LC_NAME -+category "mni_IN:2012";LC_ADDRESS -+category "mni_IN:2012";LC_TELEPHONE -+ -+END LC_IDENTIFICATION -+ -+LC_CTYPE -+copy "bn_IN" -+END LC_CTYPE -+ -+LC_COLLATE -+copy "bn_IN" -+END LC_COLLATE -+ -+LC_MONETARY -+copy "bn_IN" -+END LC_MONETARY -+ -+ -+LC_NUMERIC -+copy "bn_IN" -+END LC_NUMERIC -+ -+ -+LC_TIME -+% This is the POSIX Locale definition for the LC_TIME category -+% generated by IBM Basic CountryPack Transformer. -+% These are generated based on XML base Locale definition file -+% for IBM Class for Unicode. -+% -+% Abbreviated weekday names (%a) -+abday "";"";/ -+ "";"";/ -+ "";/ -+ "";"" -+% -+ -+% Full weekday names (%A) -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Abbreviated month names (%b) -+abmon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+ -+% Full month names (%B) -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Equivalent of AM PM -+ -+am_pm "";/ -+ "" -+% -+% Appropriate date and time representation -+% %A %d %b %Y%I:%M:%S %Z -+d_t_fmt "/ -+/ -+" -+% -+% Appropriate date representation -+% %A %d %b %Y -+d_fmt "/ -+" -+% -+% Appropriate time representation -+% %I:%M:%S %Z -+t_fmt "/ -+" -+% -+% Appropriate 12 h time representation (%r) -+t_fmt_ampm "/ -+" -+% -+% Appropriate date representation (date(1)) "%a %b %e %H:%M:%S %Z %Y" -+date_fmt "/ -+/ -+" -+END LC_TIME -+ -+ -+LC_MESSAGES -+copy "en_IN" -+END LC_MESSAGES -+ -+ -+LC_PAPER -+copy "bn_IN" -+END LC_PAPER -+ -+ -+LC_NAME -+% This is the ISO_IEC TR14652 Locale definition for the LC_NAME category -+% generated by IBM Basic CountryPack Transformer. -+% -+% -+name_fmt "/ -+" -+name_gen "" -+name_mr "" -+name_mrs "" -+name_miss "" -+name_ms "" -+ -+END LC_NAME -+ -+ -+LC_ADDRESS -+copy "bn_IN" -+END LC_ADDRESS -+ -+ -+LC_TELEPHONE -+copy "bn_IN" -+END LC_TELEPHONE -+ -+ -+LC_MEASUREMENT -+copy "bn_IN" -+END LC_MEASUREMENT diff --git a/glibc-rh791161.patch b/glibc-rh791161.patch deleted file mode 100644 index 1c1fab0..0000000 --- a/glibc-rh791161.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff -Nrup a/localedata/locales/doi_IN b/localedata/locales/doi_IN ---- a/localedata/locales/doi_IN 1969-12-31 17:00:00.000000000 -0700 -+++ b/localedata/locales/doi_IN 2012-02-16 09:14:08.215572109 -0700 -@@ -0,0 +1,176 @@ -+comment_char % -+escape_char / -+% Dogri language locale for India. -+% Contributed by Pravin Satpute and Sushil Badyal -+ -+LC_IDENTIFICATION -+title "Dogri language locale for India" -+source "Red Hat Pune" -+address "Level 1, Tower X, Cybercity, Magarpatta City, Hadapsar, Pune-411013 " -+contact "" -+email "bug-glibc-locales@gnu.org" -+tel "" -+fax "" -+language "Dogri" -+territory "India" -+revision "1.0" -+date "2012-02-16" -+% -+category "doi_IN:2012";LC_IDENTIFICATION -+category "doi_IN:2012";LC_CTYPE -+category "doi_IN:2012";LC_COLLATE -+category "doi_IN:2012";LC_TIME -+category "doi_IN:2012";LC_NUMERIC -+category "doi_IN:2012";LC_MONETARY -+category "doi_IN:2012";LC_MESSAGES -+category "doi_IN:2012";LC_PAPER -+category "doi_IN:2012";LC_NAME -+category "doi_IN:2012";LC_ADDRESS -+category "doi_IN:2012";LC_TELEPHONE -+ -+END LC_IDENTIFICATION -+ -+LC_CTYPE -+copy "hi_IN" -+END LC_CTYPE -+ -+LC_COLLATE -+ -+% Copy the template from ISO/IEC 14651 -+copy "iso14651_t1" -+ -+END LC_COLLATE -+ -+LC_MONETARY -+copy "hi_IN" -+END LC_MONETARY -+ -+ -+LC_NUMERIC -+copy "hi_IN" -+END LC_NUMERIC -+ -+ -+LC_TIME -+% This is the POSIX Locale definition for the LC_TIME category. -+% These are generated based on XML base Locale definition file -+% for IBM Class for Unicode/Java -+% -+% Abbreviated weekday names (%a) -+abday "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Full weekday names (%A) -+day "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Abbreviated month names (%b) -+abmon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";"";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Full month names (%B) -+mon "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";"";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "";/ -+ "" -+% -+% Equivalent of AM PM -+am_pm "";/ -+ "" -+% -+% Appropriate date and time representation -+% %A %d %b %Y%I:%M:%S %Z -+d_t_fmt "/ -+/ -+" -+% -+% Appropriate date representation -+% %A %d %b %Y -+d_fmt "/ -+" -+% -+% Appropriate time representation -+% %I:%M:%S %Z -+t_fmt "/ -+" -+% -+% Appropriate 12 h time representation (%r) -+t_fmt_ampm "/ -+" -+% -+date_fmt "/ -+/ -+" -+END LC_TIME -+ -+ -+LC_MESSAGES -+% ^(Yes|[yY]) -+yesexpr "/ -+" -+% -+% ^(No|[nN]) -+noexpr "/ -+" -+% -+END LC_MESSAGES -+ -+LC_PAPER -+copy "hi_IN" -+END LC_PAPER -+ -+ -+LC_NAME -+% This is the ISO_IEC TR14652 Locale definition for the -+% LC_NAME category. -+% -+name_fmt "/ -+" -+name_gen "" -+name_mr "" -+name_mrs "" -+name_miss "" -+name_ms "" -+ -+END LC_NAME -+ -+ -+ -+LC_ADDRESS -+copy "hi_IN" -+END LC_ADDRESS -+ -+ -+LC_TELEPHONE -+copy "hi_IN" -+END LC_TELEPHONE -+ -+LC_MEASUREMENT -+copy "hi_IN" -+END LC_MEASUREMENT diff --git a/glibc-rh803286.patch b/glibc-rh803286.patch deleted file mode 100644 index d9f909c..0000000 --- a/glibc-rh803286.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -rup a/localedata/SUPPORTED b/localedata/SUPPORTED ---- a/localedata/SUPPORTED 2012-03-12 14:11:04.134056609 -0600 -+++ b/localedata/SUPPORTED 2012-03-14 20:59:39.993269235 -0600 -@@ -103,6 +103,7 @@ de_DE@euro/ISO-8859-15 \ - de_LU.UTF-8/UTF-8 \ - de_LU/ISO-8859-1 \ - de_LU@euro/ISO-8859-15 \ -+doi_IN/UTF-8 \ - dv_MV/UTF-8 \ - dz_BT/UTF-8 \ - el_GR.UTF-8/UTF-8 \ -@@ -298,6 +299,7 @@ mk_MK.UTF-8/UTF-8 \ - mk_MK/ISO-8859-5 \ - ml_IN/UTF-8 \ - mn_MN/UTF-8 \ -+mni_IN/UTF-8 \ - mr_IN/UTF-8 \ - ms_MY.UTF-8/UTF-8 \ - ms_MY/ISO-8859-1 \ -@@ -350,6 +352,7 @@ ru_UA.UTF-8/UTF-8 \ - ru_UA/KOI8-U \ - rw_RW/UTF-8 \ - sa_IN/UTF-8 \ -+sat_IN/UTF-8 \ - sc_IT/UTF-8 \ - sd_IN/UTF-8 \ - sd_IN@devanagari/UTF-8 \ diff --git a/glibc.spec b/glibc.spec index 9e8f417..d542b0a 100644 --- a/glibc.spec +++ b/glibc.spec @@ -1,4 +1,4 @@ -%define glibcsrcdir glibc-2.16.90-01f34a3b +%define glibcsrcdir glibc-2.16.90-d14fbb17 %define glibcversion 2.16.90 ### glibc.spec.in follows: %define run_glibc_tests 1 @@ -27,7 +27,7 @@ Summary: The GNU libc libraries Name: glibc Version: %{glibcversion} -Release: 28%{?dist} +Release: 29%{?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 @@ -92,6 +92,11 @@ Patch0010: %{name}-stap-libm.patch Patch0014: %{name}-fedora-nptl-linklibc.patch +Patch0018: %{name}-fedora-strict-aliasing.patch +Patch0019: %{name}-fedora-nis-rh188246.patch +Patch0020: %{name}-fedora-manual-dircategory.patch +Patch0024: %{name}-fedora-locarchive.patch + # Needs to be sent upstream Patch0029: %{name}-rh841318.patch @@ -119,10 +124,6 @@ Patch0046: %{name}-fedora-localedata-locales-fixes.patch Patch0047: %{name}-fedora-streams-rh436349.patch Patch0048: %{name}-fedora-localedata-rh61908.patch Patch0049: %{name}-fedora-localedef.patch -Patch0050: %{name}-fedora-locarchive.patch -Patch0051: %{name}-fedora-manual-dircategory.patch -Patch0052: %{name}-fedora-nis-rh188246.patch -Patch0053: %{name}-fedora-strict-aliasing.patch # # Patches from upstream @@ -145,15 +146,6 @@ Patch2015: %{name}-rh770439.patch Patch2016: %{name}-rh789209.patch Patch2017: %{name}-rh691912.patch -# Upstream BZ 13604 -Patch2018: %{name}-rh790292.patch - -# Upstream BZ 13603 -Patch2019: %{name}-rh790298.patch - -# Upstream BZ 13698 -Patch2020: %{name}-rh791161.patch - # Upstream BZ 9954 Patch2021: %{name}-rh739743.patch @@ -163,8 +155,6 @@ Patch2022: %{name}-rh800224.patch # Upstream BZ 14247 Patch2023: %{name}-rh827510.patch -Patch2024: %{name}-rh803286.patch - # Upstream BZ 13761 Patch2025: %{name}-rh788989-2.patch @@ -417,13 +407,13 @@ package or when debugging this package. %patch2015 -p1 %patch2016 -p1 %patch2017 -p1 -%patch2018 -p1 -%patch2019 -p1 -%patch2020 -p1 +%patch0018 -p1 +%patch0019 -p1 +%patch0020 -p1 %patch2021 -p1 %patch2022 -p1 %patch2023 -p1 -%patch2024 -p1 +%patch0024 -p1 %patch2025 -p1 %patch2026 -p1 %patch2027 -p1 @@ -449,10 +439,6 @@ package or when debugging this package. %patch0047 -p1 %patch0048 -p1 %patch0049 -p1 -%patch0050 -p1 -%patch0051 -p1 -%patch0052 -p1 -%patch0053 -p1 # On powerpc32, hp timing is only available in power4/power6 # libs, not in base, so pre-power4 dynamic linker is incompatible @@ -1247,6 +1233,10 @@ rm -f *.filelist* %endif %changelog +* Fri Nov 16 2012 Jeff Law - 2.16.90-29 + - Rsync with upstream sources + - Drop local patches for 803286, 791161, 790292, 790298 + * Wed Nov 7 2012 Jeff Law - 2.16.90-28 - Resync with upstream sources (#873397) diff --git a/sources b/sources index 21834fa..83f3f06 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ecc2e9f546028682530d4f57206b35a6 glibc-2.16.90-01f34a3b-fedora.tar.gz -57e4f3d836a45dfe7071452dd214660f glibc-2.16.90-01f34a3b.tar.gz +6d70e1594c0c90c7029f685595040447 glibc-2.16.90-d14fbb17-fedora.tar.gz +bc56a554f5c469260acbcd9f2b358351 glibc-2.16.90-d14fbb17.tar.gz