[esteid-browser-plugin] Build with firebreath 1.7

[Kalev Lember]

commit 4c524f551aa0bc1fc4fced75193276d136346927
Author: Kalev Lember <kalevlember at gmail.com>
Date:   Sun Jun 9 11:05:14 2013 +0200

    Build with firebreath 1.7

 .gitignore                 |    1 +
 esteid-browser-plugin.spec |   13 ++++++++++---
 sources                    |    2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a7cb93a..7aa37b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /esteid-browser-plugin-*.tar.bz2
 /firebreath-*.tar.bz2
+/firebreath-1.7-b73d799.tar.gz
diff --git a/esteid-browser-plugin.spec b/esteid-browser-plugin.spec
index 67ffc5b..73dd3a8 100644
--- a/esteid-browser-plugin.spec
+++ b/esteid-browser-plugin.spec
@@ -4,7 +4,11 @@
 
 # Extension ID for this package, from install.rdf
 %global extension_id \{aa84ce40-4253-11da-8cd6-0800200c9a66\}
-%global firebreath_version 1.5.2
+
+# Firebreath version to use
+%global fb_commit b73d7996b9641191667fb2445a0d50349072bb3c
+%global fb_shortcommit %(c=%{fb_commit}; echo ${c:0:7})
+%global fb_version 1.7
 
 Name:           esteid-browser-plugin
 Version:        1.3.4
@@ -25,7 +29,7 @@ URL:            http://code.google.com/p/esteid/
 # upstream: http://www.firebreath.org. By design, projects using Firebreath are
 # supposed to be built within Firebreath's build system, so we need the tarball
 # for building.
-Source0:        http://firebreath.googlecode.com/files/firebreath-%{firebreath_version}.tar.bz2
+Source0:        https://github.com/firebreath/FireBreath/archive/%{fb_commit}/firebreath-%{fb_version}-%{fb_shortcommit}.tar.gz
 # ... and the source code for esteid-browser-plugin itself:
 Source1:        http://esteid.googlecode.com/files/%{name}-%{version}.tar.bz2
 
@@ -68,7 +72,7 @@ Firefox and Thunderbird.
 
 %prep
 # Extract firebreath
-%setup -q -n firebreath-%{firebreath_version}
+%setup -q -n FireBreath-%{fb_commit}
 
 # Extract esteid-browser-plugin into firebreath's projects/ subdir
 mkdir -p projects
@@ -79,6 +83,8 @@ popd
 # Remove bundled libraries
 rm -rf src/3rdParty/boost
 rm -rf src/libs
+# ... and binaries
+rm -f cmake/*.exe
 
 pushd projects/esteid-browser-plugin-%{version}
 %patch1 -p1 -b .opensc-0.13
@@ -131,6 +137,7 @@ done
 %changelog
 * Sun Jun 09 2013 Kalev Lember <kalevlember at gmail.com> - 1.3.4-1
 - Update to 1.3.4
+- Build with firebreath 1.7
 
 * Sun Jun 09 2013 Kalev Lember <kalevlember at gmail.com> - 1.3.3-6
 - Fix pkcs11 module loading with opensc 0.13.0
diff --git a/sources b/sources
index 785c292..7ee1201 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 f47654f21a3d5caafb8f3d087cecaf58  esteid-browser-plugin-1.3.4.tar.bz2
-14e5854f90655f87eddf6d0d5f735f46  firebreath-1.5.2.tar.bz2
+56010848597821b82f9d45fdb6bb905d  firebreath-1.7-b73d799.tar.gz