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

[tomspur]

commit 292dc6c4d16150094ade2fe9d40a8c4f45f9a52b
Merge: bfc8a53 6d7d206
Author: Thomas Spura <tomspur at fedoraproject.org>
Date:   Thu Aug 19 21:39:40 2010 +0200

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

 mozilla-noscript.spec      |   14 ++++++++++++--
 noscript-preferences.patch |   13 +++++++------
 sources                    |    2 +-
 3 files changed, 20 insertions(+), 9 deletions(-)
---
diff --cc mozilla-noscript.spec
index 02a7db7,d095dd1..6371bec
--- a/mozilla-noscript.spec
+++ b/mozilla-noscript.spec
@@@ -67,6 -71,18 +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
+ 
 -* Wed Jun 30 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.9.9.97-1
 -- new version
 -
 -* Sat Jun 12 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.9.9.87-1
 -- new version
 -
  * Fri May 28 2010 Thomas Spura <tomspur at fedoraproject.org> - 1.9.9.81-1
  - new version