[mozilla-noscript/el6/master: 21/21] Merge branch 'master' into el6

[tomspur]

commit 6d7d20692fd6a8f23c1f03bffe15f412caf0fd2f
Merge: e2bab2b c339cc4
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Thu Aug 19 21:29:11 2010 +0200

    Merge branch 'master' into el6
    
    - require firefox and not mozilla-filesystem on el5
    - update to new version
    
    Conflicts:
    	.gitignore
    	mozilla-noscript.spec
    	noscript-preferences.patch
    	sources

 .gitignore                 |    1 +
 mozilla-noscript.spec      |   14 ++++++++++++--
 noscript-preferences.patch |   13 +++++++------
 sources                    |    2 +-
 4 files changed, 21 insertions(+), 9 deletions(-)
---
diff --cc .gitignore
index c541c25,443526a..b23a392
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,3 +1,2 @@@
 -noscript-1.10.xpi
 -noscript-2.0.xpi
 +noscript-1.9.9.39.xpi
+ /noscript-2.0.2.1.xpi
diff --cc mozilla-noscript.spec
index eb95333,5179a52..d095dd1
--- a/mozilla-noscript.spec
+++ b/mozilla-noscript.spec
@@@ -67,6 -71,19 +71,12 @@@ rm -rf %{buildroot
  
  
  %changelog
+ * Thu Aug 19 2010 Thomas Spura <tomspur at fedoraproject.org> - 2.0.2.1-2
+ - require firefox and not mozilla-filesystem on el5
+ 
+ * Wed Aug 18 2010 Thomas Spura <tomspur at fedoraproject.org> - 2.0.2.1-1
+ - update to new version
+ 
 -* Fri Jul 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 2.0-1
 -- update to new version
 -
 -* Sun Jul 18 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.10-1
 -- new version
 -- renew preferences patch
 -
  * Wed Jun 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.9.9.97-1
  - new version