From a1b6a46b1adf32b6fddee0b87459a642083e9d63f5181a97ba682331403f954f Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 27 Apr 2021 19:35:08 +0000
Subject: [PATCH] Accepting request 888697 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/888697
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=18
---
 Correctly-install-pkgconfig.patch | 12 ------------
 abseil-cpp-20210324.0.tar.gz      |  3 ---
 abseil-cpp-20210324.1.tar.gz      |  3 +++
 abseil-cpp.changes                |  8 ++++++++
 abseil-cpp.spec                   |  4 +---
 5 files changed, 12 insertions(+), 18 deletions(-)
 delete mode 100644 Correctly-install-pkgconfig.patch
 delete mode 100644 abseil-cpp-20210324.0.tar.gz
 create mode 100644 abseil-cpp-20210324.1.tar.gz

diff --git a/Correctly-install-pkgconfig.patch b/Correctly-install-pkgconfig.patch
deleted file mode 100644
index 25cd7e8..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} $<JOIN:${ABSL_CC_LIB_LINKOPTS}, > $<$<NOT:$<BOOL:${ABSL_CC_LIB_IS_INTERFACE}>>:-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 100644
index 62b3e1b..0000000
--- a/abseil-cpp-20210324.0.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:dd7db6815204c2a62a2160e32c55e97113b0a0178b2f090d6bab5ce36111db4b
-size 1774094
diff --git a/abseil-cpp-20210324.1.tar.gz b/abseil-cpp-20210324.1.tar.gz
new file mode 100644
index 0000000..48327f8
--- /dev/null
+++ b/abseil-cpp-20210324.1.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:441db7c09a0565376ecacf0085b2d4c2bbedde6115d7773551bc116212c2a8d6
+size 1774134
diff --git a/abseil-cpp.changes b/abseil-cpp.changes
index b4cf82c..a48b1f5 100644
--- a/abseil-cpp.changes
+++ b/abseil-cpp.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Sun Apr 25 05:42:19 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- 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 <rpm@fthiessen.de>
 
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 1b56524..699572e 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