Integrate locale/ into the browserid-server rpm build.

* add svn revision to rpm release number
* remove test-related static resources
* include locale svn revision in ver.txt

Conflicts:

	scripts/browserid.spec

scripts/browserid.spec

@@ -2,7 +2,7 @@
 
 Name:          browserid-server
 Version:       0.2012.02.08
-Release:       1%{?dist}
+Release:       1%{?dist}_%{svnrev}
 Summary:       BrowserID server
 Packager:      Pete Fritchman <petef@mozilla.com>
 Group:         Development/Libraries
@@ -12,7 +12,7 @@ Source0:       %{name}.tar.gz
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root
 AutoReqProv:   no
 Requires:      openssl nodejs
-BuildRequires: gcc-c++ git jre make npm openssl-devel
+BuildRequires: gcc-c++ git jre make npm openssl-devel expat-devel perl perl-JSON perl-Locale-PO
 
 %description
 browserid server & web home for browserid.org
@@ -23,8 +23,13 @@ browserid server & web home for browserid.org
 %build
 npm install
 export PATH=$PWD/node_modules/.bin:$PATH
+./locale/compile-mo.sh locale/
+./locale/compile-json.sh locale/ resources/static/i18n/
 scripts/compress.sh
+scripts/compress-locales.sh
+rm -r resources/static/build resources/static/test
 echo "$GIT_REVISION" > resources/static/ver.txt
+echo "locale svn r$SVN_REVISION" >> resources/static/ver.txt
 
 %install
 rm -rf %{buildroot}

scripts/rpmbuild.sh

@@ -3,7 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-
 set -e
 
 progname=$(basename $0)
@@ -20,8 +19,10 @@ tar --exclude rpmbuild --exclude .git \
 set +e
 
 export GIT_REVISION=$(git log -1 --oneline)
+export SVN_REVISION=$(svn info locale/ | sed -n -e "s,^Revision: ,,p")
 
-rpmbuild --define "_topdir $PWD/rpmbuild" -ba scripts/browserid.spec
+rpmbuild --define "_topdir $PWD/rpmbuild" \
+         --define "svnrev $SVN_REVISION" -ba scripts/browserid.spec
 rc=$?
 if [ $rc -eq 0 ]; then
     ls -l $PWD/rpmbuild/RPMS/*/*.rpm