Merge remote branch 'origin/master' into f13

This commit is contained in:
Robert Scheck 2011-05-28 15:11:40 +02:00
commit e7762f0951
3 changed files with 7 additions and 4 deletions

2
.gitignore vendored
View file

@ -1 +1 @@
zcp-6.40.7.tar.gz
zcp-6.40.8.tar.gz

View file

@ -1 +1 @@
2be6100d73e2d4e7756cca7c871849ac zcp-6.40.7.tar.gz
b27fadb5dbde71377d2ec6aabbccaad8 zcp-6.40.8.tar.gz

View file

@ -119,7 +119,7 @@
%global beta_or_rc 0
%global actual_release 1
%global svnrevision 26119
%global svnrevision 27223
%global with_clucene 1
%global with_ldap 1
%global with_xmlto 1
@ -137,7 +137,7 @@
Summary: Open Source Edition of the Zarafa Collaboration Platform
Name: zarafa
Version: 6.40.7
Version: 6.40.8
%if %{beta_or_rc}
Release: 0.%{actual_release}.svn%{svnrevision}%{?dist}
%else
@ -1015,6 +1015,9 @@ fi
%endif
%changelog
* Sat May 28 2011 Robert Scheck <robert@fedoraproject.org> 6.40.8-1
- Upgrade to 6.40.8
* Wed Apr 06 2011 Robert Scheck <robert@fedoraproject.org> 6.40.7-1
- Upgrade to 6.40.7