updated to version 1.1.8

This commit is contained in:
Martin Gieseking 2020-01-15 11:29:46 +01:00
parent 8b79280e7b
commit c784597487
5 changed files with 10 additions and 25 deletions

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/snappy-1.1.3.tar.gz /snappy-1.1.3.tar.gz
/snappy-1.1.4.tar.gz /snappy-1.1.4.tar.gz
/snappy-1.1.7.tar.gz /snappy-1.1.7.tar.gz
/snappy-1.1.8.tar.gz

View File

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -118,7 +118,7 @@ @@ -212,7 +212,7 @@
"${PROJECT_SOURCE_DIR}/snappy-test.cc" "snappy-test.cc"
) )
target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H) target_compile_definitions(snappy_unittest PRIVATE -DHAVE_CONFIG_H)
- target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES}) - target_link_libraries(snappy_unittest snappy ${GFLAGS_LIBRARIES})

View File

@ -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 <sys/uio.h>
#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)

View File

@ -1,6 +1,6 @@
Name: snappy Name: snappy
Version: 1.1.7 Version: 1.1.8
Release: 9%{?dist} Release: 1%{?dist}
Summary: Fast compression and decompression library Summary: Fast compression and decompression library
License: BSD License: BSD
@ -9,8 +9,6 @@ Source0: https://github.com/google/snappy/releases/download/%{version}/%{
# add missing dependency on gtest to snappy_unittest # add missing dependency on gtest to snappy_unittest
Patch0: %{name}-gtest.patch Patch0: %{name}-gtest.patch
# fix version macros in snappy-stubs-public.h.in (BZ #1527850)
Patch1: %{name}-version-macros.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc-c++ BuildRequires: gcc-c++
@ -39,7 +37,6 @@ developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1
%build %build
%cmake . %cmake .
@ -88,6 +85,10 @@ ctest -V %{?_smp_mflags}
%changelog %changelog
* Wed Jan 15 2020 Martin Gieseking <martin.gieseking@uos.de> - 1.1.8-1
- Updated to new release.
- Dropped version-related patch which has been applied upstream (BZ #1527850).
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-9 * Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.1.7-9
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

View File

@ -1 +1 @@
SHA512 (snappy-1.1.7.tar.gz) = 32046f532606ba545a4e4825c0c66a19be449f2ca2ff760a6fa170a3603731479a7deadb683546e5f8b5033414c50f4a9a29f6d23b7a41f047e566e69eca7caf SHA512 (snappy-1.1.8.tar.gz) = efe18ff1b3edda1b4b6cefcbc6da8119c05d63afdbf7a784f3490353c74dced76baed7b5f1aa34b99899729192b9d657c33c76de4b507a51553fa8001ae75c1c