- Version bump to 1.1.3:

* See the NEWS file for full details
- Switch to distribution from github
- Remove upstreamed patch:
  * snappy-1.1.1-random-return.patch

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

1.1.3.tar.gz

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

snappy-1.1.1-random-return.patch

@@ -1,54 +0,0 @@
----
- snappy-test.h      |    8 ++++++--
- snappy_unittest.cc |    1 +
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-Index: snappy_unittest.cc
-===================================================================
---- snappy_unittest.cc.orig
-+++ snappy_unittest.cc
-@@ -161,6 +161,7 @@ static size_t MinimumRequiredOutputSpace
- 
-     default:
-       LOG(FATAL) << "Unknown compression type number " << comp;
-+      return -1; //make gcc happy
-   }
- }
- 
-Index: snappy-test.h
-===================================================================
---- snappy-test.h.orig
-+++ snappy-test.h
-@@ -132,13 +132,15 @@
- }  // namespace File
- 
- namespace file {
--  int Defaults() { }
-+  int Defaults() { return 0; } //make gcc happy
- 
-   class DummyStatus {
-    public:
-     void CheckSuccess() { }
-   };
- 
-+  DummyStatus _dummy_ret;
-+
-   DummyStatus GetContents(const string& filename, string* data, int unused) {
-     FILE* fp = fopen(filename.c_str(), "rb");
-     if (fp == NULL) {
-@@ -158,6 +160,7 @@
-     }
- 
-     fclose(fp);
-+    return _dummy_ret; //make gcc happy
-   }
- 
-   DummyStatus SetContents(const string& filename,
-@@ -176,6 +179,7 @@
-     }
- 
-     fclose(fp);
-+    return _dummy_ret; //make gcc happy
-   }
- }  // namespace file
- 

snappy-1.1.2.tar.gz

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

snappy.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Jul 29 10:42:56 UTC 2015 - tchvatal@suse.com
+
+- Version bump to 1.1.3:
+  * See the NEWS file for full details
+- Switch to distribution from github
+- Remove upstreamed patch:
+  * snappy-1.1.1-random-return.patch
+
 -------------------------------------------------------------------
 Wed Jul 29 09:58:16 UTC 2015 - dimstar@opensuse.org
 

snappy.spec

@@ -17,22 +17,23 @@
 
 
 %define lib_name libsnappy1
-
 Name:           snappy
-Version:        1.1.2
+Version:        1.1.3
 Release:        0
 Summary:        A fast compressor/decompressor library
 License:        BSD-3-Clause
 Group:          Development/Libraries/C and C++
-Url:            http://code.google.com/p/snappy/
+Url:            https://github.com/google/snappy/
-Source0:        http://snappy.googlecode.com/files/%{name}-%{version}.tar.gz
+Source0:        https://github.com/google/snappy/archive/%{version}.tar.gz
 Source99:       baselibs.conf
-#PATCH-FIX-OPENSUSE: fix minor things in unittest, probably not worth for upstreaming ...
+BuildRequires:  autoconf
-Patch0:         snappy-1.1.1-random-return.patch
+BuildRequires:  automake
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildRequires:  gcc-c++
+BuildRequires:  libtool
 BuildRequires:  lzo-devel
+BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Snappy is a compression/decompression library. It does not aim for maximum
@@ -60,9 +61,9 @@ in 64-bit mode, Snappy compresses at about 250 MB/sec or more and decompresses a
 This package holds the shared library of snappy.
 
 %package devel
-Requires:       %{lib_name} = %{version}
 Summary:        Development files for snappy
 Group:          Development/Libraries/C and C++
+Requires:       %{lib_name} = %{version}
 
 %description devel
 Snappy is a compression/decompression library. It does not aim for maximum
@@ -78,9 +79,9 @@ This package holds the development files for snappy.
 
 %prep
 %setup -q
-%patch0 -p0
 
 %build
+autoreconf -fvi
 # mvyskocil: disable assertions to improve a speed a bit in microbenchmarks and hopefully in real-world use as well
 # http://code.google.com/p/snappy/issues/detail?id=40
 %configure CXXFLAGS="%{optflags} -DNDEBUG" \
@@ -88,20 +89,18 @@ This package holds the development files for snappy.
     --disable-static \
     --docdir=%{_defaultdocdir}/%{name}
 
-make %{?_smp_flags}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
+make DESTDIR=%{buildroot} install %{?_smp_mflags}
-find %{buildroot} -name \*.la -delete -print
+find %{buildroot} -type f -name "*.la" -delete -print
 rm %{buildroot}/%{_defaultdocdir}/%{name}/INSTALL
 
 %check
-make check
+make %{?_smp_mflags} check
-
-%clean
-rm -rf %{buildroot}
 
 %post   -n %{lib_name} -p /sbin/ldconfig
+
 %postun -n %{lib_name} -p /sbin/ldconfig
 
 %files -n %{lib_name}