4 files changed, 7 insertions, 2 deletions

diff --git a/Makefile.am b/Makefile.am
index 06aeaae..a3236ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,38 +1,41 @@
 SUBDIRS = content locale
 
 xpi_DATA = \
         install.rdf \
         AUTHORS COPYING NEWS
 
 EXTRA_DIST = NEWS NEWS.xml NEWS.xsl chrome.manifest
 
 XPI=${PACKAGE}-${VERSION}.xpi
 
 xpi: ${XPI}
 
 ${XPI}: install
-        test -z "${NO_UPDATE}" || sed -i -e '/em:updateURL/d' ${xpidir}/install.rdf
+        test -z "${NO_UPDATE}" || sed -i -e '/em:update\(URL\|Key\)/d' ${xpidir}/install.rdf
         cd ${xpichromedir} \
         && ${ZIP} -r -m ${PACKAGE}.jar */
         cd ${xpidir} \
         && ${ZIP} -r @abs_builddir@/$@ .
 
+update.rdf: update-template.rdf ${XPI}
+        sed -e "s/<!--SHA1-->/$$(sha1sum ${XPI}|cut -d\  -f1)/" <$< >$@
+
 install-data-local: ${xpidir}/chrome.manifest
 
 ${xpidir}/chrome.manifest: chrome.manifest Makefile
         sed \
          -e 's,^content[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,content \1 jar:chrome/${PACKAGE}.jar!/\2,' \
          -e 's,^locale[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)[[:space:]]\+\([^[:space:]]\+\)$$,locale \1 \2 jar:chrome/${PACKAGE}.jar!/\3,' \
          $< >$@
 
 clean-local:
         rm -rf ${xpidir} ${XPI}
 
 all-local: NEWS
 
 NEWS: NEWS.xsl NEWS.xml
         ${XSLTPROC} -o $@ NEWS.xsl NEWS.xml
 
 mozextptr: ${MOZ_EXT_ID}
 ${MOZ_EXT_ID}:
         echo @abs_srcdir@ >$@
diff --git a/configure.ac b/configure.ac
index 61b9747..6a478db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,28 +1,28 @@
 AC_INIT([fireflix], [0.0.6.2], [fireflix-bugs@klever.net])
 AC_CONFIG_SRCDIR([install.rdf.in])
 AM_INIT_AUTOMAKE([dist-bzip2])
 AC_SUBST([MOZ_EXT_ID],[{4269f719-86de-4668-b8ad-04752c23a69e}])
 
 AC_PATH_PROG([ZIP],[zip],[false])
 if test "${ZIP}" = "false" ; then
  AC_MSG_ERROR([zip is required to produce packaged extension])
 fi
 AC_PATH_PROG([XSLTPROC],[xsltproc],[true])
 
 AC_SUBST([xpidir],[\${top_builddir}/xpi])
 AC_SUBST([xpichromedir],[\${xpidir}/chrome])
 AC_SUBST([xpichromecontentdir],[\${xpichromedir}/content])
 AC_SUBST([xpichromelocaledir],[\${xpichromedir}/locale])
 
 COPYING="`sed -e 's/\\"/\\&quot;/g' -e 's,$,<br/>,g' -e 's/(c)/\\&#xa9;/g' ${srcdir}/COPYING|tr '\n' ' '`"
 AC_SUBST([COPYING])
 
 AC_CONFIG_FILES([
  Makefile
   install.rdf
-  update.rdf
+  update-template.rdf
  content/Makefile
   content/autoconf.dtd
  locale/Makefile
 ])
 AC_OUTPUT
diff --git a/install.rdf.in b/install.rdf.in
index 9a00e0d..8ccdf34 100644
--- a/install.rdf.in
+++ b/install.rdf.in
@@ -1,28 +1,29 @@
 <?xml version="1.0"?>
 <RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#" 
  xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
  <Description about="urn:mozilla:install-manifest">
   
   <em:id>@MOZ_EXT_ID@</em:id>
   <em:name>Fireflix</em:name>
   <em:version>@VERSION@</em:version>
   <em:description>Sidebar flickr management tool</em:description>
   <em:creator>Klever Group; http://www.klever.net/</em:creator>
   <em:homepageURL>http://kin.klever.net/fireflix/</em:homepageURL>
   <em:iconURL>chrome://fireflix/content/icons/32x32/fireflix.png</em:iconURL>
   <em:updateURL>http://kin.klever.net/fireflix/update?v=@VERSION@</em:updateURL>
   <em:aboutURL>chrome://fireflix/content/about.xul</em:aboutURL>
+  <em:updateKey>MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDc/WnetE1dTmWKY+KzphLYfqrjOc88fK7FaGSnHbwa4lpvt3gt6W0GwiCjUATvXu9zWoDU60VKPVhN0ohIOAnUuvtqSTfxjDBwDcsRXjg7fg4nofmA2mTeZtULYMymSCYZB+w6krmlOpEBpWZl14yf5Jc93Lc3gCZPDvH0xXZl9QIDAQAB</em:updateKey>
 
   <!-- Firefox -->
   <em:targetApplication>
    <Description>
     <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
     <em:minVersion>1.5</em:minVersion>
     <em:maxVersion>3.0.*</em:maxVersion>
    </Description>
   </em:targetApplication>
 
  </Description>
 
 </RDF>
diff --git a/update.rdf.in b/update-template.rdf.in
index aa368a6..4326468 100644
--- a/update.rdf.in
+++ b/update-template.rdf.in
@@ -1,26 +1,27 @@
 <?xml version="1.0"?>
 <RDF:RDF
   xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:em="http://www.mozilla.org/2004/em-rdf#">
 
  <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@">
   <em:updates>
    <RDF:Seq>
     <RDF:li resource="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@"/>
    </RDF:Seq>
   </em:updates>
  </RDF:Description>
 
  <RDF:Description about="urn:mozilla:extension:@MOZ_EXT_ID@:@VERSION@">
   <em:version>@VERSION@</em:version>
   <em:targetApplication>
    <Description>
     <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
     <em:minVersion>1.5</em:minVersion>
     <em:maxVersion>2.0.0.*</em:maxVersion>
     <em:updateLink>http://kin.klever.net/dist/@PACKAGE@-@VERSION@.xpi</em:updateLink>
+    <em:updateHash>sha1:<!--SHA1--></em:updateHash>
    </Description>
   </em:targetApplication>
  </RDF:Description>
 
 </RDF:RDF>