From 6e05bce9837205ae16dcd6fe2c3f12f69a727e98 Mon Sep 17 00:00:00 2001 From: RBrownSUSE <> Date: May 11 2021 21:15:43 +0000 Subject: Update abseil-cpp to version 20210324.1 / rev 18 via SR 888697 https://build.opensuse.org/request/show/888697 by user RBrownSUSE + dimstar_suse --- diff --git a/.files b/.files index 7058e1b..6a98f97 100644 Binary files a/.files and b/.files differ diff --git a/.rev b/.rev index 7f28e08..af76ad5 100644 --- a/.rev +++ b/.rev @@ -153,4 +153,12 @@ 886674 + + 883ae5becb0e60f9c32d0ed621a48aa4 + 20210324.1 + + dimstar_suse + + 888697 + diff --git a/Correctly-install-pkgconfig.patch b/Correctly-install-pkgconfig.patch deleted file mode 100644 index fd930c1..0000000 --- a/Correctly-install-pkgconfig.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur abseil-cpp-20210324.0/CMake/AbseilHelpers.cmake new/CMake/AbseilHelpers.cmake ---- abseil-cpp-20210324.0/CMake/AbseilHelpers.cmake 2021-03-25 14:27:44.000000000 +0100 -+++ new/CMake/AbseilHelpers.cmake 2021-04-13 20:37:44.361137790 +0200 -@@ -181,7 +181,7 @@ - Libs: -L\${libdir} $ $<$>:-labsl_${_NAME}>\n\ - Cflags: -I\${includedir}${PC_CFLAGS}\n") - INSTALL(FILES "${CMAKE_BINARY_DIR}/lib/pkgconfig/absl_${_NAME}.pc" -- DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") - endif() - endif() - diff --git a/abseil-cpp-20210324.0.tar.gz b/abseil-cpp-20210324.0.tar.gz deleted file mode 120000 index 62598b6..0000000 --- a/abseil-cpp-20210324.0.tar.gz +++ /dev/null @@ -1 +0,0 @@ -/ipfs/bafybeiduxqdbnn2sagzuf5wy5p3ez5odhpedtuvdxmscmvfq3d7avfcn2m \ No newline at end of file diff --git a/abseil-cpp-20210324.1.tar.gz b/abseil-cpp-20210324.1.tar.gz new file mode 120000 index 0000000..9ea5161 --- /dev/null +++ b/abseil-cpp-20210324.1.tar.gz @@ -0,0 +1 @@ +/ipfs/bafybeifjloiaidh3ueiwj23smbf5ludpexsw5css5yhyzhpvijckoh2bfq \ No newline at end of file diff --git a/abseil-cpp.changes b/abseil-cpp.changes index 8dfd801..fbc280f 100644 --- a/abseil-cpp.changes +++ b/abseil-cpp.changes @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Sun Apr 25 05:42:19 UTC 2021 - Ferdinand Thiessen + +- Update to LTS version 20210324.1 + * Fixed missing absl::Cleanup + * Fixed pkgconfig install path +- Dropped upstream merged Correctly-install-pkgconfig.patch + +------------------------------------------------------------------- Tue Apr 13 18:39:09 UTC 2021 - Ferdinand Thiessen - Update to LTS version 20210324.0 diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 9831822..a803e68 100644 --- a/abseil-cpp.spec +++ b/abseil-cpp.spec @@ -17,14 +17,12 @@ Name: abseil-cpp -Version: 20210324.0 +Version: 20210324.1 Release: 0 Summary: C++11 libraries which augment the C++ stdlib License: Apache-2.0 URL: https://abseil.io/ Source0: https://github.com/abseil/abseil-cpp/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz -# PATCH-FIX-UPSTREAM Correctly-install-pkgconfig.patch -- https://github.com/abseil/abseil-cpp/commit/7f4d0ba0be4c70fd71eb4c08a6422c8c2f7faa0b -Patch0: Correctly-install-pkgconfig.patch BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: fdupes