Merge pull request #2683 from jrgm/issue-2682-browserid-spec

fix missing CONTRIBUTORS and renaming of en-US and update Changelog
mozilla · Nov 7, 2012 · 4abf052 · 4abf052
2 parents 0f10fd1 + b7bdb09
commit 4abf052
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/ChangeLog b/ChangeLog
@@ -20,6 +20,7 @@ train-2012.10.26:
   * Fix class of sporatic dialog stalls at "Connection to Persona": #2629
   * Fix regression: "Dialog fails to show authenticate screen on Android": #2638
   * Fix regression: siteName not being displayed in dialog: #2634
+  * (hotfix 2012.11.05) fix missing CONTRIBUTORS and renaming of en-US: #2682
 
 train-2012.10.12:
   * Fix IE failing when authenticating with IdP from main site's /signin: #2287

diff --git a/scripts/browserid.spec b/scripts/browserid.spec
@@ -33,12 +33,15 @@ echo "locale svn r$SVN_REVISION" >> resources/static/ver.txt
 %install
 rm -rf %{buildroot}
 mkdir -p %{buildroot}%{_rootdir}
-for f in bin lib locale node_modules resources scripts *.json; do
+for f in bin lib locale node_modules resources scripts *.json CONTRIBUTORS; do
     cp -rp $f %{buildroot}%{_rootdir}/
 done
 mkdir -p %{buildroot}%{_rootdir}/config
 cp -p config/l10n-all.json %{buildroot}%{_rootdir}/config
 cp -p config/l10n-prod.json %{buildroot}%{_rootdir}/config
+# now let's link en to en-US
+mkdir -p %{buildroot}%{_rootdir}/resources/static/i18n/
+ln -s en-US %{buildroot}%{_rootdir}/resources/static/i18n/en
 
 %clean
 rm -rf %{buildroot}