diff --git a/glibc.spec b/glibc.spec
index 80248a2..c336346 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -270,180 +270,8 @@ contains the most important sets of shared libraries: the standard C
 library and the standard math library. Without these two libraries, a
 Linux system will not function.
 
-%post -p %{_sbindir}/glibc_post_upgrade
-
-%package -n locales
-Summary:	Base files for localization
-Group:		System/Internationalization
-
-%description -n locales
-These are the base files for language localization.
-You also need to install the specific locales-?? for the
-language(s) you want. Then the user need to set the
-LANG variable to their preferred language in their
-~/.profile configuration file.
-
-# Locale specifc packages
-%{expand:%(sh %{SOURCE1000} Afar aa aa_DJ aa_ER aa_ET)}
-%{expand:%(sh %{SOURCE1000} Afrikaans af af_ZA)}
-%{expand:%(sh %{SOURCE1000} Amharic am am_ET byn_ER gez_ER gez_ET om_ET om_KE sid_ET ti_ER ti_ET tig_ER wal_ET)}
-%{expand:%(sh %{SOURCE1000} Akan ak ak_GH)}
-%{expand:%(sh %{SOURCE1000} Angika anp anp_IN)}
-%{expand:%(sh %{SOURCE1000} Arabic ar ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SS ar_SY ar_TN ar_YE)}
-%{expand:%(sh %{SOURCE1000} Assamese as as_IN)}
-%{expand:%(sh %{SOURCE1000} Asturian ast ast_ES)}
-%{expand:%(sh %{SOURCE1000} Aymara ayc ayc_PE)}
-%{expand:%(sh %{SOURCE1000} Azeri az az_AZ)}
-%{expand:%(sh %{SOURCE1000} Belarusian be be_BY)}
-%{expand:%(sh %{SOURCE1000} Bemba bem bem_ZM)}
-%{expand:%(sh %{SOURCE1000} Berber ber ber_DZ ber_MA)}
-%{expand:%(sh %{SOURCE1000} Bulgarian bg bg_BG)}
-%{expand:%(sh %{SOURCE1000} Bengali bn bn_BD bn_IN)}
-%{expand:%(sh %{SOURCE1000} Tibetan bo bo_CN bo_IN)}
-%{expand:%(sh %{SOURCE1000} Breton br br_FR)}
-%{expand:%(sh %{SOURCE1000} Bosnian bs bs_BA)}
-%{expand:%(sh %{SOURCE1000} Catalan ca ca_AD ca_ES ca_FR ca_IT)}
-%{expand:%(sh %{SOURCE1000} "Crimean Tatar" crh crh_UA)}
-%{expand:%(sh %{SOURCE1000} Czech cs cs_CZ)}
-%{expand:%(sh %{SOURCE1000} Chuvash cv cv_RU)}
-%{expand:%(sh %{SOURCE1000} Welsh cy cy_GB)}
-%{expand:%(sh %{SOURCE1000} Danish da da_DK)}
-%{expand:%(sh %{SOURCE1000} German de de_AT de_BE de_CH de_DE de_LU)}
-%{expand:%(sh %{SOURCE1000} Dogri doi doi_IN)}
-%{expand:%(sh %{SOURCE1000} Dhivehi dv dv_MV)}
-%{expand:%(sh %{SOURCE1000} Dzongkha dz dz_BT)}
-%{expand:%(sh %{SOURCE1000} Greek el r:gr el_CY el_GR)}
-%{expand:%(sh %{SOURCE1000} English en en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_US en_ZA en_ZM en_ZW)}
-%{expand:%(sh %{SOURCE1000} Esperanto eo eo_XX)}
-# Potentially unhandled: es@tradicional?, an = Aragonese
-%{expand:%(sh %{SOURCE1000} Spanish es an_ES es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_ES es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE)}
-%{expand:%(sh %{SOURCE1000} Estonian et et_EE)}
-%{expand:%(sh %{SOURCE1000} Basque eu eu_ES)}
-%{expand:%(sh %{SOURCE1000} Farsi fa fa_IR)}
-%{expand:%(sh %{SOURCE1000} Finnish fi fi_FI)}
-%{expand:%(sh %{SOURCE1000} Fulah ff ff_SN)}
-%{expand:%(sh %{SOURCE1000} Faroese fo fo_FO)}
-%{expand:%(sh %{SOURCE1000} French fr fr_BE fr_CA fr_CH fr_FR fr_LU)}
-%{expand:%(sh %{SOURCE1000} Friulan fur fur_IT)}
-%{expand:%(sh %{SOURCE1000} Frisian fy fy_DE fy_NL)}
-%{expand:%(sh %{SOURCE1000} Irish ga ga_IE)}
-%{expand:%(sh %{SOURCE1000} "Scottish Gaelic" gd gd_GB)}
-%{expand:%(sh %{SOURCE1000} Galician gl gl_ES)}
-%{expand:%(sh %{SOURCE1000} Gujarati gu gu_IN)}
-%{expand:%(sh %{SOURCE1000} "Manx Gaelic" gv gv_GB)}
-%{expand:%(sh %{SOURCE1000} Hausa ha ha_NG)}
-%{expand:%(sh %{SOURCE1000} Hebrew he he_IL iw_IL)}
-%{expand:%(sh %{SOURCE1000} Hindi hi bho_IN brx_IN hi_IN ur_IN)}
-%{expand:%(sh %{SOURCE1000} Chhattisgarhi hne hne_IN)}
-%{expand:%(sh %{SOURCE1000} Croatian hr hr_HR)}
-%{expand:%(sh %{SOURCE1000} "Upper Sorbian" hsb hsb_DE)}
-%{expand:%(sh %{SOURCE1000} Breyol ht ht_HT)}
-%{expand:%(sh %{SOURCE1000} Hungarian hu hu_HU)}
-%{expand:%(sh %{SOURCE1000} Armenian hy hy_AM)}
-%{expand:%(sh %{SOURCE1000} Interlingua ia ia_FR)}
-%{expand:%(sh %{SOURCE1000} Indonesian id id_ID)}
-%{expand:%(sh %{SOURCE1000} Igbo ig ig_NG)}
-%{expand:%(sh %{SOURCE1000} Inupiaq ik ik_CA)}
-%{expand:%(sh %{SOURCE1000} Icelandic is is_IS)}
-%{expand:%(sh %{SOURCE1000} Italian it it_CH it_IT)}
-%{expand:%(sh %{SOURCE1000} Inuktitut iu iu_CA)}
-%{expand:%(sh %{SOURCE1000} Japanese ja ja ja_JP)}
-%{expand:%(sh %{SOURCE1000} Georgian ka ka_GE)}
-%{expand:%(sh %{SOURCE1000} Kazakh kk kk_KZ)}
-%{expand:%(sh %{SOURCE1000} Greenlandic kl kl_GL)}
-%{expand:%(sh %{SOURCE1000} Khmer km km_KH)}
-%{expand:%(sh %{SOURCE1000} Kannada kn kn_IN)}
-%{expand:%(sh %{SOURCE1000} Korean ko ko_KR)}
-%{expand:%(sh %{SOURCE1000} Konkani kok kok_IN)}
-%{expand:%(sh %{SOURCE1000} Kashmiri ks ks_IN ks_IN@devanagari)}
-%{expand:%(sh %{SOURCE1000} Kurdish ku ku_TR)}
-%{expand:%(sh %{SOURCE1000} Cornish kw kw_GB)}
-%{expand:%(sh %{SOURCE1000} Kyrgyz ky ky_KG)}
-%{expand:%(sh %{SOURCE1000} Luxembourgish lb lb_LU)}
-%{expand:%(sh %{SOURCE1000} Luganda lg lg_UG)}
-%{expand:%(sh %{SOURCE1000} Limburguish li li_BE li_NL)}
-%{expand:%(sh %{SOURCE1000} Ligurian lij lij_IT)}
-%{expand:%(sh %{SOURCE1000} Laotian lo lo_LA)}
-%{expand:%(sh %{SOURCE1000} Lithuanian lt lt_LT)}
-%{expand:%(sh %{SOURCE1000} Latvian lv lv_LV)}
-%{expand:%(sh %{SOURCE1000} Magahi mag mag_IN)}
-%{expand:%(sh %{SOURCE1000} Maithili mai mai_IN)}
-%{expand:%(sh %{SOURCE1000} Malagasy mg mg_MG)}
-%{expand:%(sh %{SOURCE1000} Mari mhr mhr_RU)}
-%{expand:%(sh %{SOURCE1000} Maori mi mi_NZ)}
-%{expand:%(sh %{SOURCE1000} Macedonian mk mk_MK)}
-%{expand:%(sh %{SOURCE1000} Malayalam ml ml_IN)}
-%{expand:%(sh %{SOURCE1000} Mongolian mn mn_MN)}
-%{expand:%(sh %{SOURCE1000} Manipuri mni mni_IN)}
-%{expand:%(sh %{SOURCE1000} Marathi mr mr_IN)}
-%{expand:%(sh %{SOURCE1000} Malay ms ms_MY)}
-%{expand:%(sh %{SOURCE1000} Maltese mt mt_MT)}
-%{expand:%(sh %{SOURCE1000} Burmese my my_MM)}
-%{expand:%(sh %{SOURCE1000} "Lower Saxon" nds nds_DE nds_NL)}
-%{expand:%(sh %{SOURCE1000} Nepali ne ne_NP)}
-%{expand:%(sh %{SOURCE1000} Nahuatl nhn nhn_MX)}
-%{expand:%(sh %{SOURCE1000} Niuean niu niu_NU niu_NZ)}
-%{expand:%(sh %{SOURCE1000} Dutch nl nl_AW nl_BE nl_NL)}
-%{expand:%(sh %{SOURCE1000} Norwegian no r:nb r:nn nb_NO nn_NO)}
-%{expand:%(sh %{SOURCE1000} Ndebele nr nr_ZA)}
-%{expand:%(sh %{SOURCE1000} "Northern Sotho" nso nso_ZA)}
-%{expand:%(sh %{SOURCE1000} Occitan oc oc_FR)}
-%{expand:%(sh %{SOURCE1000} Oriya or or_IN)}
-%{expand:%(sh %{SOURCE1000} Ossetian os os_RU)}
-%{expand:%(sh %{SOURCE1000} Punjabi pa pa_IN pa_PK)}
-%{expand:%(sh %{SOURCE1000} Papiamento pap r:pp pap_AN pap_AW pap_CW)}
-%{expand:%(sh %{SOURCE1000} Polish pl csb_PL pl_PL)}
-%{expand:%(sh %{SOURCE1000} Pashto ps ps_AF)}
-%{expand:%(sh %{SOURCE1000} Portuguese pt pt_BR pt_PT)}
-%{expand:%(sh %{SOURCE1000} Quechua quz quz_PE)}
-%{expand:%(sh %{SOURCE1000} Romanian ro ro_RO)}
-%{expand:%(sh %{SOURCE1000} Russian ru ru_RU ru_UA)}
-%{expand:%(sh %{SOURCE1000} Kinyarwanda rw rw_RW)}
-%{expand:%(sh %{SOURCE1000} Sanskrit sa sa_IN)}
-%{expand:%(sh %{SOURCE1000} Santali sat sat_IN)}
-%{expand:%(sh %{SOURCE1000} Sardinian sc sc_IT)}
-%{expand:%(sh %{SOURCE1000} Sindhi sd sd_IN sd_IN@devanagari)}
-%{expand:%(sh %{SOURCE1000} Saami se se_NO)}
-%{expand:%(sh %{SOURCE1000} Secwepemctsin shs shs_CA)}
-%{expand:%(sh %{SOURCE1000} Sinhala si si_LK)}
-%{expand:%(sh %{SOURCE1000} Slovak sk sk_SK)}
-%{expand:%(sh %{SOURCE1000} Slovenian sl sl_SI)}
-%{expand:%(sh %{SOURCE1000} Serbian sr sr_ME sr_RS)}
-%{expand:%(sh %{SOURCE1000} Somali so so_DJ so_ET so_KE so_SO)}
-%{expand:%(sh %{SOURCE1000} Albanian sq sq_AL sq_MK)}
-%{expand:%(sh %{SOURCE1000} Swati ss ss_ZA)}
-%{expand:%(sh %{SOURCE1000} Sotho st st_ZA)}
-%{expand:%(sh %{SOURCE1000} Swedish sv sv_FI sv_SE)}
-# sw_XX?
-%{expand:%(sh %{SOURCE1000} Swahili sw sw_KE sw_TZ)}
-%{expand:%(sh %{SOURCE1000} Silesian szl szl_PL)}
-%{expand:%(sh %{SOURCE1000} Tamil ta ta_IN ta_LK)}
-%{expand:%(sh %{SOURCE1000} Telugu te te_IN)}
-%{expand:%(sh %{SOURCE1000} Tajik tg tg_TJ)}
-%{expand:%(sh %{SOURCE1000} Thai th th_TH)}
-%{expand:%(sh %{SOURCE1000} Tharu/Tharuhati the the_NP)}
-%{expand:%(sh %{SOURCE1000} Turkmen tk tk_TM)}
-%{expand:%(sh %{SOURCE1000} Pilipino tl r:ph fil_PH tl_PH)}
-%{expand:%(sh %{SOURCE1000} Tswana tn tn_ZA)}
-%{expand:%(sh %{SOURCE1000} Turkish tr tr_CY tr_TR)}
-%{expand:%(sh %{SOURCE1000} Tsonga ts ts_ZA)}
-%{expand:%(sh %{SOURCE1000} Tatar tt tt_RU)}
-%{expand:%(sh %{SOURCE1000} Uyghur ug ug_CN)}
-%{expand:%(sh %{SOURCE1000} Unami unm unm_US)}
-%{expand:%(sh %{SOURCE1000} Ukrainian uk uk_UA)}
-%{expand:%(sh %{SOURCE1000} Urdu ur ur_PK)}
-%{expand:%(sh %{SOURCE1000} Uzbek uz uz_UZ)}
-%{expand:%(sh %{SOURCE1000} Venda ve ve_ZA)}
-%{expand:%(sh %{SOURCE1000} Vietnamese vi vi_VN)}
-%{expand:%(sh %{SOURCE1000} Walloon wa wa_BE)}
-%{expand:%(sh %{SOURCE1000} Walser wae wae_CH)}
-%{expand:%(sh %{SOURCE1000} Wolof wo wo_SN)}
-%{expand:%(sh %{SOURCE1000} Xhosa xh xh_ZA)}
-%{expand:%(sh %{SOURCE1000} Yiddish yi yi_US)}
-%{expand:%(sh %{SOURCE1000} Yoruba yo yo_NG)}
-%{expand:%(sh %{SOURCE1000} "Yue Chinese (Cantonese)" yue yue_HK)}
-%{expand:%(sh %{SOURCE1000} Chinese zh zh_CN zh_HK zh_SG zh_TW cmn_TW hak_TW lzh_TW nan_TW nam_TW@latin)}
-%{expand:%(sh %{SOURCE1000} Zulu zu zu_ZA)}
+%post
+%{_sbindir}/glibc_post_upgrade
 
 %files -f libc.lang
 %if %{with timezone}
@@ -774,6 +602,204 @@ These are configuration files that describe possible time zones.
 %endif
 
 ########################################################################
+
+%if ! %{without locales}
+%package -n locales
+Summary:	Base files for localization
+Group:		System/Internationalization
+
+%description -n locales
+These are the base files for language localization.
+
+You also need to install the specific locales-?? for the language(s) you want.
+Then the user need to set the LANG variable to their preferred language in their
+~/.profile configuration file.
+
+%files -n locales
+%{_bindir}/locale_install.sh
+%{_bindir}/locale_uninstall.sh
+%config(noreplace) %{_sysconfdir}/sysconfig/locales
+%dir %{_datadir}/locale
+%dir %{_prefix}/lib/locale
+%ghost %{_prefix}/lib/locale/locale-archive
+%{_datadir}/locale/ISO*
+%{_datadir}/locale/CP*
+%{_datadir}/locale/UTF*
+%{_datadir}/locale/KOI*
+
+%post -n locales
+%{_bindir}/locale_install.sh "ENCODINGS"
+
+%preun -n locales
+%{_bindir}/locale_uninstall.sh "ENCODINGS"
+
+# Locale specifc packages
+%{expand:%(sh %{SOURCE1000} Afar aa aa_DJ aa_ER aa_ET)}
+%{expand:%(sh %{SOURCE1000} Afrikaans af af_ZA)}
+%{expand:%(sh %{SOURCE1000} Amharic am am_ET byn_ER gez_ER gez_ET om_ET om_KE sid_ET ti_ER ti_ET tig_ER wal_ET)}
+%{expand:%(sh %{SOURCE1000} Akan ak ak_GH)}
+%{expand:%(sh %{SOURCE1000} Angika anp anp_IN)}
+%{expand:%(sh %{SOURCE1000} Arabic ar ar_AE ar_BH ar_DZ ar_EG ar_IN ar_IQ ar_JO ar_KW ar_LB ar_LY ar_MA ar_OM ar_QA ar_SA ar_SD ar_SS ar_SY ar_TN ar_YE)}
+%{expand:%(sh %{SOURCE1000} Assamese as as_IN)}
+%{expand:%(sh %{SOURCE1000} Asturian ast ast_ES)}
+%{expand:%(sh %{SOURCE1000} Aymara ayc ayc_PE)}
+%{expand:%(sh %{SOURCE1000} Azeri az az_AZ)}
+%{expand:%(sh %{SOURCE1000} Belarusian be be_BY)}
+%{expand:%(sh %{SOURCE1000} Bemba bem bem_ZM)}
+%{expand:%(sh %{SOURCE1000} Berber ber ber_DZ ber_MA)}
+%{expand:%(sh %{SOURCE1000} Bulgarian bg bg_BG)}
+%{expand:%(sh %{SOURCE1000} Bengali bn bn_BD bn_IN)}
+%{expand:%(sh %{SOURCE1000} Tibetan bo bo_CN bo_IN)}
+%{expand:%(sh %{SOURCE1000} Breton br br_FR)}
+%{expand:%(sh %{SOURCE1000} Bosnian bs bs_BA)}
+%{expand:%(sh %{SOURCE1000} Catalan ca ca_AD ca_ES ca_FR ca_IT)}
+%{expand:%(sh %{SOURCE1000} "Crimean Tatar" crh crh_UA)}
+%{expand:%(sh %{SOURCE1000} Czech cs cs_CZ)}
+%{expand:%(sh %{SOURCE1000} Chuvash cv cv_RU)}
+%{expand:%(sh %{SOURCE1000} Welsh cy cy_GB)}
+%{expand:%(sh %{SOURCE1000} Danish da da_DK)}
+%{expand:%(sh %{SOURCE1000} German de de_AT de_BE de_CH de_DE de_LU)}
+%{expand:%(sh %{SOURCE1000} Dogri doi doi_IN)}
+%{expand:%(sh %{SOURCE1000} Dhivehi dv dv_MV)}
+%{expand:%(sh %{SOURCE1000} Dzongkha dz dz_BT)}
+%{expand:%(sh %{SOURCE1000} Greek el r:gr el_CY el_GR)}
+%{expand:%(sh %{SOURCE1000} English en en_AG en_AU en_BW en_CA en_DK en_GB en_HK en_IE en_IN en_NG en_NZ en_PH en_SG en_US en_ZA en_ZM en_ZW)}
+%{expand:%(sh %{SOURCE1000} Esperanto eo eo_XX)}
+# Potentially unhandled: es@tradicional?, an = Aragonese
+%{expand:%(sh %{SOURCE1000} Spanish es an_ES es_AR es_BO es_CL es_CO es_CR es_CU es_DO es_EC es_ES es_GT es_HN es_MX es_NI es_PA es_PE es_PR es_PY es_SV es_US es_UY es_VE)}
+%{expand:%(sh %{SOURCE1000} Estonian et et_EE)}
+%{expand:%(sh %{SOURCE1000} Basque eu eu_ES)}
+%{expand:%(sh %{SOURCE1000} Farsi fa fa_IR)}
+%{expand:%(sh %{SOURCE1000} Finnish fi fi_FI)}
+%{expand:%(sh %{SOURCE1000} Fulah ff ff_SN)}
+%{expand:%(sh %{SOURCE1000} Faroese fo fo_FO)}
+%{expand:%(sh %{SOURCE1000} French fr fr_BE fr_CA fr_CH fr_FR fr_LU)}
+%{expand:%(sh %{SOURCE1000} Friulan fur fur_IT)}
+%{expand:%(sh %{SOURCE1000} Frisian fy fy_DE fy_NL)}
+%{expand:%(sh %{SOURCE1000} Irish ga ga_IE)}
+%{expand:%(sh %{SOURCE1000} "Scottish Gaelic" gd gd_GB)}
+%{expand:%(sh %{SOURCE1000} Galician gl gl_ES)}
+%{expand:%(sh %{SOURCE1000} Gujarati gu gu_IN)}
+%{expand:%(sh %{SOURCE1000} "Manx Gaelic" gv gv_GB)}
+%{expand:%(sh %{SOURCE1000} Hausa ha ha_NG)}
+%{expand:%(sh %{SOURCE1000} Hebrew he he_IL iw_IL)}
+%{expand:%(sh %{SOURCE1000} Hindi hi bho_IN brx_IN hi_IN ur_IN)}
+%{expand:%(sh %{SOURCE1000} Chhattisgarhi hne hne_IN)}
+%{expand:%(sh %{SOURCE1000} Croatian hr hr_HR)}
+%{expand:%(sh %{SOURCE1000} "Upper Sorbian" hsb hsb_DE)}
+%{expand:%(sh %{SOURCE1000} Breyol ht ht_HT)}
+%{expand:%(sh %{SOURCE1000} Hungarian hu hu_HU)}
+%{expand:%(sh %{SOURCE1000} Armenian hy hy_AM)}
+%{expand:%(sh %{SOURCE1000} Interlingua ia ia_FR)}
+%{expand:%(sh %{SOURCE1000} Indonesian id id_ID)}
+%{expand:%(sh %{SOURCE1000} Igbo ig ig_NG)}
+%{expand:%(sh %{SOURCE1000} Inupiaq ik ik_CA)}
+%{expand:%(sh %{SOURCE1000} Icelandic is is_IS)}
+%{expand:%(sh %{SOURCE1000} Italian it it_CH it_IT)}
+%{expand:%(sh %{SOURCE1000} Inuktitut iu iu_CA)}
+%{expand:%(sh %{SOURCE1000} Japanese ja ja ja_JP)}
+%{expand:%(sh %{SOURCE1000} Georgian ka ka_GE)}
+%{expand:%(sh %{SOURCE1000} Kazakh kk kk_KZ)}
+%{expand:%(sh %{SOURCE1000} Greenlandic kl kl_GL)}
+%{expand:%(sh %{SOURCE1000} Khmer km km_KH)}
+%{expand:%(sh %{SOURCE1000} Kannada kn kn_IN)}
+%{expand:%(sh %{SOURCE1000} Korean ko ko_KR)}
+%{expand:%(sh %{SOURCE1000} Konkani kok kok_IN)}
+%{expand:%(sh %{SOURCE1000} Kashmiri ks ks_IN ks_IN@devanagari)}
+%{expand:%(sh %{SOURCE1000} Kurdish ku ku_TR)}
+%{expand:%(sh %{SOURCE1000} Cornish kw kw_GB)}
+%{expand:%(sh %{SOURCE1000} Kyrgyz ky ky_KG)}
+%{expand:%(sh %{SOURCE1000} Luxembourgish lb lb_LU)}
+%{expand:%(sh %{SOURCE1000} Luganda lg lg_UG)}
+%{expand:%(sh %{SOURCE1000} Limburguish li li_BE li_NL)}
+%{expand:%(sh %{SOURCE1000} Ligurian lij lij_IT)}
+%{expand:%(sh %{SOURCE1000} Laotian lo lo_LA)}
+%{expand:%(sh %{SOURCE1000} Lithuanian lt lt_LT)}
+%{expand:%(sh %{SOURCE1000} Latvian lv lv_LV)}
+%{expand:%(sh %{SOURCE1000} Magahi mag mag_IN)}
+%{expand:%(sh %{SOURCE1000} Maithili mai mai_IN)}
+%{expand:%(sh %{SOURCE1000} Malagasy mg mg_MG)}
+%{expand:%(sh %{SOURCE1000} Mari mhr mhr_RU)}
+%{expand:%(sh %{SOURCE1000} Maori mi mi_NZ)}
+%{expand:%(sh %{SOURCE1000} Macedonian mk mk_MK)}
+%{expand:%(sh %{SOURCE1000} Malayalam ml ml_IN)}
+%{expand:%(sh %{SOURCE1000} Mongolian mn mn_MN)}
+%{expand:%(sh %{SOURCE1000} Manipuri mni mni_IN)}
+%{expand:%(sh %{SOURCE1000} Marathi mr mr_IN)}
+%{expand:%(sh %{SOURCE1000} Malay ms ms_MY)}
+%{expand:%(sh %{SOURCE1000} Maltese mt mt_MT)}
+%{expand:%(sh %{SOURCE1000} Burmese my my_MM)}
+%{expand:%(sh %{SOURCE1000} "Lower Saxon" nds nds_DE nds_NL)}
+%{expand:%(sh %{SOURCE1000} Nepali ne ne_NP)}
+%{expand:%(sh %{SOURCE1000} Nahuatl nhn nhn_MX)}
+%{expand:%(sh %{SOURCE1000} Niuean niu niu_NU niu_NZ)}
+%{expand:%(sh %{SOURCE1000} Dutch nl nl_AW nl_BE nl_NL)}
+%{expand:%(sh %{SOURCE1000} Norwegian no r:nb r:nn nb_NO nn_NO)}
+%{expand:%(sh %{SOURCE1000} Ndebele nr nr_ZA)}
+%{expand:%(sh %{SOURCE1000} "Northern Sotho" nso nso_ZA)}
+%{expand:%(sh %{SOURCE1000} Occitan oc oc_FR)}
+%{expand:%(sh %{SOURCE1000} Oriya or or_IN)}
+%{expand:%(sh %{SOURCE1000} Ossetian os os_RU)}
+%{expand:%(sh %{SOURCE1000} Punjabi pa pa_IN pa_PK)}
+%{expand:%(sh %{SOURCE1000} Papiamento pap r:pp pap_AN pap_AW pap_CW)}
+%{expand:%(sh %{SOURCE1000} Polish pl csb_PL pl_PL)}
+%{expand:%(sh %{SOURCE1000} Pashto ps ps_AF)}
+%{expand:%(sh %{SOURCE1000} Portuguese pt pt_BR pt_PT)}
+%{expand:%(sh %{SOURCE1000} Quechua quz quz_PE)}
+%{expand:%(sh %{SOURCE1000} Romanian ro ro_RO)}
+%{expand:%(sh %{SOURCE1000} Russian ru ru_RU ru_UA)}
+%{expand:%(sh %{SOURCE1000} Kinyarwanda rw rw_RW)}
+%{expand:%(sh %{SOURCE1000} Sanskrit sa sa_IN)}
+%{expand:%(sh %{SOURCE1000} Santali sat sat_IN)}
+%{expand:%(sh %{SOURCE1000} Sardinian sc sc_IT)}
+%{expand:%(sh %{SOURCE1000} Sindhi sd sd_IN sd_IN@devanagari)}
+%{expand:%(sh %{SOURCE1000} Saami se se_NO)}
+%{expand:%(sh %{SOURCE1000} Secwepemctsin shs shs_CA)}
+%{expand:%(sh %{SOURCE1000} Sinhala si si_LK)}
+%{expand:%(sh %{SOURCE1000} Slovak sk sk_SK)}
+%{expand:%(sh %{SOURCE1000} Slovenian sl sl_SI)}
+%{expand:%(sh %{SOURCE1000} Serbian sr sr_ME sr_RS)}
+%{expand:%(sh %{SOURCE1000} Somali so so_DJ so_ET so_KE so_SO)}
+%{expand:%(sh %{SOURCE1000} Albanian sq sq_AL sq_MK)}
+%{expand:%(sh %{SOURCE1000} Swati ss ss_ZA)}
+%{expand:%(sh %{SOURCE1000} Sotho st st_ZA)}
+%{expand:%(sh %{SOURCE1000} Swedish sv sv_FI sv_SE)}
+# sw_XX?
+%{expand:%(sh %{SOURCE1000} Swahili sw sw_KE sw_TZ)}
+%{expand:%(sh %{SOURCE1000} Silesian szl szl_PL)}
+%{expand:%(sh %{SOURCE1000} Tamil ta ta_IN ta_LK)}
+%{expand:%(sh %{SOURCE1000} Telugu te te_IN)}
+%{expand:%(sh %{SOURCE1000} Tajik tg tg_TJ)}
+%{expand:%(sh %{SOURCE1000} Thai th th_TH)}
+%{expand:%(sh %{SOURCE1000} Tharu/Tharuhati the the_NP)}
+%{expand:%(sh %{SOURCE1000} Turkmen tk tk_TM)}
+%{expand:%(sh %{SOURCE1000} Pilipino tl r:ph fil_PH tl_PH)}
+%{expand:%(sh %{SOURCE1000} Tswana tn tn_ZA)}
+%{expand:%(sh %{SOURCE1000} Turkish tr tr_CY tr_TR)}
+%{expand:%(sh %{SOURCE1000} Tsonga ts ts_ZA)}
+%{expand:%(sh %{SOURCE1000} Tatar tt tt_RU)}
+%{expand:%(sh %{SOURCE1000} Uyghur ug ug_CN)}
+%{expand:%(sh %{SOURCE1000} Unami unm unm_US)}
+%{expand:%(sh %{SOURCE1000} Ukrainian uk uk_UA)}
+%{expand:%(sh %{SOURCE1000} Urdu ur ur_PK)}
+%{expand:%(sh %{SOURCE1000} Uzbek uz uz_UZ)}
+%{expand:%(sh %{SOURCE1000} Venda ve ve_ZA)}
+%{expand:%(sh %{SOURCE1000} Vietnamese vi vi_VN)}
+%{expand:%(sh %{SOURCE1000} Walloon wa wa_BE)}
+%{expand:%(sh %{SOURCE1000} Walser wae wae_CH)}
+%{expand:%(sh %{SOURCE1000} Wolof wo wo_SN)}
+%{expand:%(sh %{SOURCE1000} Xhosa xh xh_ZA)}
+%{expand:%(sh %{SOURCE1000} Yiddish yi yi_US)}
+%{expand:%(sh %{SOURCE1000} Yoruba yo yo_NG)}
+%{expand:%(sh %{SOURCE1000} "Yue Chinese (Cantonese)" yue yue_HK)}
+%{expand:%(sh %{SOURCE1000} Chinese zh zh_CN zh_HK zh_SG zh_TW cmn_TW hak_TW lzh_TW nan_TW nam_TW@latin)}
+%{expand:%(sh %{SOURCE1000} Zulu zu zu_ZA)}
+
+#-----------------------------------------------------------------------
+# without locales
+%endif
+########################################################################
+
 %prep
 %setup -q -a3 -a50
 
@@ -1318,21 +1344,3 @@ touch %{buildroot}%{_prefix}/lib/locale/locale-archive
 # package to be installed.
 export EXCLUDE_FROM_FULL_STRIP="ld-%{version}.so libpthread libc-%{version}.so libm-%{version}.so"
 
-%files -n locales
-%{_bindir}/locale_install.sh
-%{_bindir}/locale_uninstall.sh
-%config(noreplace) %{_sysconfdir}/sysconfig/locales
-%dir %{_datadir}/locale
-%dir %{_prefix}/lib/locale
-%ghost %{_prefix}/lib/locale/locale-archive
-%{_datadir}/locale/ISO*
-%{_datadir}/locale/CP*
-%{_datadir}/locale/UTF*
-%{_datadir}/locale/KOI*
-
-%post -n locales
-%{_bindir}/locale_install.sh "ENCODINGS"
-
-%preun -n locales
-%{_bindir}/locale_uninstall.sh "ENCODINGS"
-