- update to 1.1.8:

* Small performance improvements.
  * Removed snappy::string alias for std::string.
  * Improved CMake configuration.
- remove snappy-pcfile.patch (never went upstream)

OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/snappy?expand=0&rev=16
This commit is contained in:
Dirk Mueller 2020-08-25 13:20:09 +00:00 committed by Git OBS Bridge
parent 9407e215eb
commit 407c983dec
5 changed files with 16 additions and 86 deletions

View File

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

3
1.1.8.tar.gz Normal file
View File

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

View File

@ -1,76 +0,0 @@
From 3c55d5cdf3b037cc2ea3d94642ba18a548c3b091 Mon Sep 17 00:00:00 2001
From: "Robert J. Gebis" <rjgebis@gmail.com>
Date: Sat, 26 Aug 2017 11:58:09 -0500
Subject: [PATCH] Added pkg-config file and .gitignore
---
.gitignore | 1 +
CMakeLists.txt | 14 +++++++++++++-
cmake/snappy.pc.in | 10 ++++++++++
3 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 .gitignore
create mode 100644 cmake/snappy.pc.in
Index: snappy-1.1.7/.gitignore
===================================================================
--- /dev/null
+++ snappy-1.1.7/.gitignore
@@ -0,0 +1 @@
+build
Index: snappy-1.1.7/CMakeLists.txt
===================================================================
--- snappy-1.1.7.orig/CMakeLists.txt
+++ snappy-1.1.7/CMakeLists.txt
@@ -1,5 +1,8 @@
cmake_minimum_required(VERSION 3.1)
-project(Snappy VERSION 1.1.7 LANGUAGES C CXX)
+
+set(SNAPPY_VER 1.1.7)
+
+project(Snappy VERSION ${SNAPPY_VER} LANGUAGES C CXX)
# BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to make
# it prominent in the GUI.
@@ -52,6 +55,10 @@ configure_file(
"${PROJECT_BINARY_DIR}/config.h"
)
+configure_file(
+ "${CMAKE_CURRENT_SOURCE_DIR}/cmake/snappy.pc.in"
+ "${CMAKE_CURRENT_BINARY_DIR}/snappy.pc")
+
# We don't want to define HAVE_ macros in public headers. Instead, we use
# CMake's variable substitution with 0/1 variables, which will be seen by the
# preprocessor as constants.
@@ -141,6 +148,9 @@ if(SNAPPY_BUILD_TESTS)
endif(SNAPPY_BUILD_TESTS)
include(GNUInstallDirs)
+
+set(INSTALL_PKGCONFIG_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig" CACHE PATH "Installation directory for pkgconfig (.pc) files")
+
install(TARGETS snappy
EXPORT SnappyTargets
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
@@ -172,3 +182,6 @@ install(
"${PROJECT_BINARY_DIR}/SnappyConfigVersion.cmake"
DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/Snappy"
)
+
+install(FILES ${PROJECT_BINARY_DIR}/snappy.pc
+ DESTINATION ${INSTALL_PKGCONFIG_DIR})
Index: snappy-1.1.7/cmake/snappy.pc.in
===================================================================
--- /dev/null
+++ snappy-1.1.7/cmake/snappy.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=@CMAKE_INSTALL_PREFIX@
+libdir=@CMAKE_INSTALL_LIBDIR@
+includedir=@CMAKE_INSTALL_PREFIX@/include
+
+Name: snappy
+Description: Fast compressor/decompressor library.
+Version: @SNAPPY_VER@
+Libs: -L@CMAKE_INSTALL_LIBDIR@ -lsnappy
+Cflags: -I@CMAKE_INSTALL_PREFIX@/include

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Aug 25 13:06:16 UTC 2020 - Dirk Mueller <dmueller@suse.com>
- update to 1.1.8:
* Small performance improvements.
* Removed snappy::string alias for std::string.
* Improved CMake configuration.
- remove snappy-pcfile.patch (never went upstream)
-------------------------------------------------------------------
Thu Feb 8 15:00:05 UTC 2018 - jengelh@inai.de

View File

@ -1,7 +1,7 @@
#
# spec file for package snappy
#
# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -12,21 +12,20 @@
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define libname libsnappy1
Name: snappy
Version: 1.1.7
Version: 1.1.8
Release: 0
Summary: A compressor/decompressor library favoring time
License: BSD-3-Clause
Group: Development/Libraries/C and C++
Url: https://github.com/google/snappy/
URL: https://github.com/google/snappy/
Source0: https://github.com/google/snappy/archive/%{version}.tar.gz
Source99: baselibs.conf
Patch0: snappy-pcfile.patch
BuildRequires: cmake
BuildRequires: gcc-c++
BuildRequires: lzo-devel
@ -68,7 +67,6 @@ This package holds the development files for snappy.
%prep
%setup -q
%autopatch -p1
%build
%cmake
@ -93,6 +91,5 @@ export LD_LIBRARY_PATH=%{buildroot}%{_libdir}${LD_LIBRARY_PATH:+:${LD_LIBRARY_PA
%{_libdir}/libsnappy.so
%dir %{_libdir}/cmake/Snappy/
%{_libdir}/cmake/Snappy/*
%{_libdir}/pkgconfig/snappy.pc
%changelog