diff --git a/Fix-Travis-CI-configuration-for-OSX.patch b/Fix-Travis-CI-configuration-for-OSX.patch deleted file mode 100644 index 1950d00..0000000 --- a/Fix-Travis-CI-configuration-for-OSX.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e69d9f880677f2aa3488c80b953ec4309f0dfa2e Mon Sep 17 00:00:00 2001 -From: costan -Date: Thu, 4 Jan 2018 14:26:40 -0800 -Subject: [PATCH 03/35] Fix Travis CI configuration for OSX. - ---- - .travis.yml | 15 +++++++++++---- - 1 file changed, 11 insertions(+), 4 deletions(-) - -diff --git a/.travis.yml b/.travis.yml -index 9841e9a..8816edb 100644 ---- a/.travis.yml -+++ b/.travis.yml -@@ -38,10 +38,17 @@ addons: - - clang-4.0 - - install: --# Travis doesn't have a nice way to install homebrew packages yet. --# https://github.com/travis-ci/travis-ci/issues/5377 --- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew update; fi --- if [ "$TRAVIS_OS_NAME" == "osx" ]; then brew install gcc@6; fi -+# Travis doesn't have a DSL for installing homebrew packages yet. Status tracked -+# in https://github.com/travis-ci/travis-ci/issues/5377 -+# The Travis VM image for Mac already has a link at /usr/local/include/c++, -+# causing Homebrew's gcc@6 installation to error out. This was reported to -+# Homebrew maintainers at https://github.com/Homebrew/brew/issues/1742 and -+# removing the link emerged as a workaround. -+- if [ "$TRAVIS_OS_NAME" == "osx" ]; then -+ brew update; -+ if [ -L /usr/local/include/c++ ]; then rm /usr/local/include/c++; fi; -+ brew install gcc@6; -+ fi - # /usr/bin/gcc is stuck to old versions by on both Linux and OSX. - - if [ "$CXX" = "g++" ]; then export CXX="g++-6" CC="gcc-6"; fi - - echo ${CC} --- -1.8.3.1 - diff --git a/snappy-1.1.7.tar.gz b/snappy-1.1.7.tar.gz deleted file mode 100644 index 3ef8371..0000000 Binary files a/snappy-1.1.7.tar.gz and /dev/null differ diff --git a/snappy-1.1.8.tar.gz b/snappy-1.1.8.tar.gz new file mode 100644 index 0000000..9b4034a Binary files /dev/null and b/snappy-1.1.8.tar.gz differ diff --git a/snappy-gtest.patch b/snappy-gtest.patch index 94ad525..c553fc3 100644 --- a/snappy-gtest.patch +++ b/snappy-gtest.patch @@ -1,8 +1,8 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -118,7 +118,7 @@ - "${PROJECT_SOURCE_DIR}/snappy-test.cc" +@@ -212,7 +212,7 @@ + "snappy-test.cc" ) target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) - target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) diff --git a/snappy-version-macros.patch b/snappy-version-macros.patch deleted file mode 100644 index c46ef64..0000000 --- a/snappy-version-macros.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/snappy-stubs-public.h.in b/snappy-stubs-public.h.in -index 3fd79bb..bb5b222 100644 ---- a/snappy-stubs-public.h.in -+++ b/snappy-stubs-public.h.in -@@ -48,9 +48,9 @@ - #include - #endif // HAVE_SYS_UIO_H - --#define SNAPPY_MAJOR ${SNAPPY_MAJOR} --#define SNAPPY_MINOR ${SNAPPY_MINOR} --#define SNAPPY_PATCHLEVEL ${SNAPPY_PATCHLEVEL} -+#define SNAPPY_MAJOR ${PROJECT_VERSION_MAJOR} -+#define SNAPPY_MINOR ${PROJECT_VERSION_MINOR} -+#define SNAPPY_PATCHLEVEL ${PROJECT_VERSION_PATCH} - #define SNAPPY_VERSION \ - ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL) - diff --git a/snappy.pc b/snappy.pc index 6b0ad09..0acb99b 100644 --- a/snappy.pc +++ b/snappy.pc @@ -3,8 +3,8 @@ exec_prefix=${prefix} includedir=${prefix}/include libdir=${prefix}/lib64 -Name: snappy +Name: snappy Description: A fast compression/decompression library -Version: 1.1.7 +Version: 1.1.8 Libs: -L\${libdir} -lsnappy Cflags: -I\${includedir} diff --git a/snappy.spec b/snappy.spec index 9d6821d..d428bab 100644 --- a/snappy.spec +++ b/snappy.spec @@ -1,6 +1,6 @@ Name: snappy -Version: 1.1.7 -Release: 10 +Version: 1.1.8 +Release: 1 Summary: A fast compressor/decompressor License: BSD URL: https://github.com/google/snappy @@ -8,10 +8,8 @@ Source0: https://github.com/google/snappy/archive/%{version}/%{name}-%{version}. Source1: snappy.pc Patch0: snappy-gtest.patch -Patch1: snappy-version-macros.patch -Patch6000: Fix-Travis-CI-configuration-for-OSX.patch -BuildRequires: gcc-c++ automake autoconf gtest-devel cmake +BuildRequires: gcc-c++ gtest-devel cmake %description Snappy is a compression/decompression library. It does not aim for maximum compression, @@ -19,7 +17,7 @@ or compatibility with any other compression library; instead, it aims for very h speeds and reasonable compression. %package devel -Summary: Development files for snappy +Summary: Development files for snappy Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: cmake-filesystem pkgconfig @@ -70,6 +68,9 @@ make test %doc NEWS README.md %changelog +* Fri Apr 24 2020 Yufa Fang - 1.1.8-1 +- Update to 1.1.8 and remove useless BuildRequires + * Wed Oct 9 2019 shenyangyang - 1.1.7-10 - Type:enhancement - ID:NA