Accepting request 206746 from home:posophe:branches:devel:libraries:c_c++

Update

OBS-URL: https://build.opensuse.org/request/show/206746
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/snappy?expand=0&rev=6

snappy-1.1.0.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:1fa82bc588bb93fa74dfc0e2e9b7d63b6e2a20ede323ef42bf0af0f947676160
-size 1719945

snappy-1.1.1-random-return.patch

@@ -19,7 +19,7 @@ Index: snappy-test.h
 ===================================================================
 --- snappy-test.h.orig
 +++ snappy-test.h
-@@ -132,13 +132,15 @@ namespace File {
+@@ -132,13 +132,15 @@
  }  // namespace File
  
  namespace file {
@@ -33,25 +33,18 @@ Index: snappy-test.h
  
 +  DummyStatus _dummy_ret;
 +
-   DummyStatus ReadFileToString(const char* filename, string* data, int unused) {
-     FILE* fp = fopen(filename, "rb");
+   DummyStatus GetContents(const string& filename, string* data, int unused) {
+     FILE* fp = fopen(filename.c_str(), "rb");
      if (fp == NULL) {
-@@ -158,12 +160,13 @@ namespace file {
+@@ -158,6 +160,7 @@
      }
  
      fclose(fp);
 +    return _dummy_ret; //make gcc happy
    }
  
-   DummyStatus ReadFileToString(const string& filename,
-                                string* data,
-                                int unused) {
--    ReadFileToString(filename.c_str(), data, unused);
-+    return ReadFileToString(filename.c_str(), data, unused);
-   }
- 
-   DummyStatus WriteStringToFile(const string& str,
-@@ -182,6 +185,7 @@ namespace file {
+   DummyStatus SetContents(const string& filename,
+@@ -176,6 +179,7 @@
      }
  
      fclose(fp);

snappy-1.1.1.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d79f04a41b0b513a014042a4365ec999a1ad5575e10d5e5578720010cb62fab3
+size 1777992

snappy.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Wed Nov 13 12:44:42 UTC 2013 - p.drouand@gmail.com
+
+- Update to version 1.1.1
+  * Add support for uncompressing to iovecs (scatter I/O).
+  * Speed up decompression by ~2%; much more so (~13-20%) on
+    a few benchmarks on given compilers and CPUs.
+  * Fix a few issues with MSVC compilation.
+  * Support truncated test data in the benchmark.
+- Adapt patch to upstream changes
+  * snappy-random-return.patch > snappy-1.1.1-random-return.patch
+
 -------------------------------------------------------------------
 Thu Aug 22 12:56:27 UTC 2013 - cdenicolo@suse.com
 

snappy.spec

@@ -18,7 +18,7 @@
 %define lib_name libsnappy1
 
 Name:           snappy
-Version:        1.1.0
+Version:        1.1.1
 Release:        0
 Summary:        A fast compressor/decompressor library
 License:        BSD-3-Clause
@@ -26,7 +26,7 @@ Group:          Development/Libraries/C and C++
 Url:            http://code.google.com/p/snappy/
 Source0:        http://snappy.googlecode.com/files/%{name}-%{version}.tar.gz
 #PATCH-FIX-OPENSUSE: fix minor things in unittest, probably not worth for upstreaming ...
-Patch0:         snappy-random-return.patch
+Patch0:         snappy-1.1.1-random-return.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
 BuildRequires:  lzo-devel