Browse code
glibc: install en_US.UTF-8 locale by default
Change-Id: I37c5291b3e65148a43bd0f896a6add50ed9f6296
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/1752
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Vinay Kulkarni <kulkarniv@vmware.com>
Alexey Makhalov authored on 2016/11/24 09:54:57Showing 1 changed files
| ... | ... |
@@ -4,7 +4,7 @@ |
| 4 | 4 |
Summary: Main C library |
| 5 | 5 |
Name: glibc |
| 6 | 6 |
Version: 2.22 |
| 7 |
-Release: 12%{?dist}
|
|
| 7 |
+Release: 13%{?dist}
|
|
| 8 | 8 |
License: LGPLv2+ |
| 9 | 9 |
URL: http://www.gnu.org/software/libc |
| 10 | 10 |
Group: Applications/System |
| ... | ... |
@@ -150,6 +150,13 @@ cat > %{buildroot}%{_sysconfdir}/ld.so.conf <<- "EOF"
|
| 150 | 150 |
EOF |
| 151 | 151 |
popd |
| 152 | 152 |
%find_lang %{name} --all-name
|
| 153 |
+pushd localedata |
|
| 154 |
+# Generate out of locale-archive an (en_US.) UTF-8 locale |
|
| 155 |
+mkdir -p %{buildroot}/usr/lib/locale
|
|
| 156 |
+I18NPATH=. GCONV_PATH=../../glibc-build/iconvdata LC_ALL=C ../../glibc-build/locale/localedef --no-archive --prefix=%{buildroot} -A ../intl/locale.alias -i locales/en_US -c -f charmaps/UTF-8 en_US.UTF-8
|
|
| 157 |
+mv %{buildroot}/usr/lib/locale/en_US.utf8 %{buildroot}/usr/lib/locale/en_US.UTF-8
|
|
| 158 |
+popd |
|
| 159 |
+ |
|
| 153 | 160 |
|
| 154 | 161 |
%post |
| 155 | 162 |
printf "Creating ldconfig cache\n";/sbin/ldconfig |
| ... | ... |
@@ -160,7 +167,7 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig |
| 160 | 160 |
%files |
| 161 | 161 |
%defattr(-,root,root) |
| 162 | 162 |
%dir %{_localstatedir}/cache/nscd
|
| 163 |
-%dir %{_libdir}/locale
|
|
| 163 |
+%{_libdir}/locale/*
|
|
| 164 | 164 |
%dir %{_sysconfdir}/ld.so.conf.d
|
| 165 | 165 |
%config(noreplace) %{_sysconfdir}/nsswitch.conf
|
| 166 | 166 |
%config(noreplace) %{_sysconfdir}/ld.so.conf
|
| ... | ... |
@@ -183,6 +190,7 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig |
| 183 | 183 |
%{_datadir}/i18n/charmaps/UTF-8.gz
|
| 184 | 184 |
%{_datadir}/i18n/charmaps/ISO-8859-1.gz
|
| 185 | 185 |
%{_datadir}/i18n/locales/en_US
|
| 186 |
+%{_datarootdir}/locale/locale.alias
|
|
| 186 | 187 |
%{_localstatedir}/lib/nss_db/Makefile
|
| 187 | 188 |
%exclude /usr/bin/mtrace |
| 188 | 189 |
|
| ... | ... |
@@ -207,10 +215,11 @@ printf "Creating ldconfig cache\n";/sbin/ldconfig |
| 207 | 207 |
|
| 208 | 208 |
%files -f %{name}.lang lang
|
| 209 | 209 |
%defattr(-,root,root) |
| 210 |
-%{_datarootdir}/locale/locale.alias
|
|
| 211 | 210 |
|
| 212 | 211 |
|
| 213 | 212 |
%changelog |
| 213 |
+* Wed Nov 23 2016 Alexey Makhalov <amakhalov@vmware.com> 2.22-13 |
|
| 214 |
+- Install en_US.UTF-8 locale by default |
|
| 214 | 215 |
* Wed Nov 16 2016 Alexey Makhalov <amakhalov@vmware.com> 2.22-12 |
| 215 | 216 |
- Added i18n subpackage |
| 216 | 217 |
* Tue Oct 25 2016 Alexey Makhalov <amakhalov@vmware.com> 2.22-11 |