[file: 2/2] Merge

[Jan Kaluža]

commit f16ffc2b281cdf59d1bda6530f8ac8bbb0eaa265
Merge: 2097b7d 0406fa3
Author: Jan Kaluza <hanzz.k at gmail.com>
Date:   Thu Feb 10 09:30:32 2011 +0100

    Merge

 file.spec |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --cc file.spec
index 11b01b0,e20c88c..0e487b2
--- a/file.spec
+++ b/file.spec
@@@ -5,7 -5,7 +5,7 @@@
  Summary: A utility for determining file types
  Name: file
  Version: 5.05
--Release: 2%{?dist}
++Release: 3%{?dist}
  License: BSD
  Group: Applications/File
  Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
@@@ -155,10 -148,9 +155,13 @@@ rm -rf $RPM_BUILD_ROO
  %endif
  
  %changelog
- * Thu Feb 10 2011 Jan Kaluza <jkaluza at redhat.com> - 5.05-2
++* Thu Feb 10 2011 Jan Kaluza <jkaluza at redhat.com> - 5.05-3
 +- fix #676543 - improved TeX and LaTeX recognition
 +- fix #676041 - detect all supported RPM architectures
 +
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.05-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Jan 18 2011 Jan Kaluza <jkaluza at redhat.com> - 5.05-1
  - fix #670319 - update to new upstream release 5.05
  - removed useless patches