[spectrum/el5/master: 9/9] Merge branch 'master' into el5

[Matej Cepl]

commit 03a74e9ac0d81fa747b4ca3bb2ba3cc4c5123dc3
Merge: 885e2e5 1c475e3
Author: Matěj Cepl <mcepl at redhat.com>
Date:   Fri Aug 13 03:07:05 2010 +0200

    Merge branch 'master' into el5
    
    Conflicts:
    
    	.gitignore
    	sources
    	spectrum.spec

 .gitignore                 |    2 +-
 sources                    |    2 +-
 spectrum-1.4.0-cmake.patch |  112 ++++++++++++++++++++++++++++++++++++++++++++
 spectrum.spec              |    7 ++-
 4 files changed, 119 insertions(+), 4 deletions(-)
---
diff --cc .gitignore
index 2d8c951,610d03d..aa2fa41
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,2 +1,1 @@@
--spectrum-0.3.1.tar.gz
+ spectrum-1.4.0.tar.gz
diff --cc spectrum.spec
index 452f7b0,358f80b..f2667d2
--- a/spectrum.spec
+++ b/spectrum.spec
@@@ -139,6 -139,12 +139,9 @@@ f
  %config(noreplace) %{_sysconfdir}/logrotate.d/spectrum
  
  %changelog
+ * Thu Aug 12 2010 Matěj Cepl <mcepl at redhat.com> - 1.4.0-1
+ - New upstream release.
+ 
 -* Thu Jul 22 2010 David Malcolm <dmalcolm at redhat.com> - 0.3.1-2
 -- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
 -
  * Wed Jul 21 2010 Matěj Cepl <mcepl at redhat.com> - 0.3.1-1
  - New upstream release.
  - Restart the server on upgrade.