diff --git a/scripts/browserid.spec b/scripts/browserid.spec index 6e98d59e4c32965287b071fed0ed3b00bd46a01c..3b67f77ca8a12313b6e21b2ca5330a4b9a0599ba 100644 --- a/scripts/browserid.spec +++ b/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} diff --git a/scripts/rpmbuild.sh b/scripts/rpmbuild.sh index ed99a036b60ad4c1c4f5d9d0c2646c95e08f9de6..ccbc8ccd2005603da4cadb0c21f4054de3ebd015 100755 --- a/scripts/rpmbuild.sh +++ b/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