[fusecompress: 2/2] Merge branch 'master' of ssh://pkgs.fedoraproject.org/fusecompress

[Toshio くらとみ]

commit b9c5d03e315b057047c4f5daa0ced7261692faee
Merge: e3d5781 f0c26ff
Author: Toshio Kuratomi <toshio at fedoraproject.org>
Date:   Mon Aug 1 14:02:46 2011 -0700

    Merge branch 'master' of ssh://pkgs.fedoraproject.org/fusecompress
    
    Conflicts:
    	fusecompress.spec

 fusecompress.spec |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)
---
diff --cc fusecompress.spec
index f7dd255,131116a..8bf3312
--- a/fusecompress.spec
+++ b/fusecompress.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:           fusecompress
  Version:        2.6
- Release: 9.20110801git913897f4%{?dist}
 -Release:        10.20100223git754bc0de%{?dist}
++Release: 11.20110801git913897f4%{?dist}
  Summary:        FUSE based compressed filesystem implementation
  
  Group:          System Environment/Libraries
@@@ -72,10 -72,12 +72,16 @@@ rm -rf $RPM_BUILD_ROO
  
  
  %changelog
- * Mon Aug 01 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-9.20110801git913897f4
++* Mon Aug 01 2011 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-11.20110801git913897f4
 +- Update to newer upstream snapshot
 +- Rebuild for new boost
 +
+ * Sun Apr 17 2011 Kalev Lember <kalev at smartlink.ee> - 2.6-10.20100223git754bc0de
+ - Rebuilt for boost 1.46.1 soname bump
+ 
+ * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6-9.20100223git754bc0de
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+ 
  * Tue Aug 17 2010 Toshio Kuratomi <toshio at fedoraproject.org> - 2.6-8.20100223git754bc0de
  - Patch for newer boost
  - Make sure our patches are upstream