diff --git a/.rev b/.rev
index 167cecc..f96f8c5 100644
--- a/.rev
+++ b/.rev
@@ -145,4 +145,15 @@
860444
+<<<<<<< Updated upstream
+=======
+
+ e1a81faba8590f82335dfd1d0df87319
+ 20210324.0
+
+ dimstar_suse
+
+ 886674
+
+>>>>>>> Stashed changes
diff --git a/Correctly-install-pkgconfig.patch b/Correctly-install-pkgconfig.patch
new file mode 100644
index 0000000..fd930c1
--- /dev/null
+++ b/Correctly-install-pkgconfig.patch
@@ -0,0 +1,12 @@
+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/_service b/_service
deleted file mode 100644
index 354f946..0000000
--- a/_service
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
- https://github.com/abseil/abseil-cpp
- git
- enable
- abseil-cpp
- %cd
- 61c9bf3e3e1c28a4aa6d7f1be4b37fd473bb5529
-
-
- *.tar
- xz
-
-
-
diff --git a/_servicedata b/_servicedata
deleted file mode 100644
index 29ee0e7..0000000
--- a/_servicedata
+++ /dev/null
@@ -1,4 +0,0 @@
-
-
- https://github.com/abseil/abseil-cpp
- 61c9bf3e3e1c28a4aa6d7f1be4b37fd473bb5529
\ No newline at end of file
diff --git a/abseil-cpp-20210324.0.tar.gz b/abseil-cpp-20210324.0.tar.gz
new file mode 120000
index 0000000..62598b6
--- /dev/null
+++ b/abseil-cpp-20210324.0.tar.gz
@@ -0,0 +1 @@
+/ipfs/bafybeiduxqdbnn2sagzuf5wy5p3ez5odhpedtuvdxmscmvfq3d7avfcn2m
\ No newline at end of file
diff --git a/abseil-cpp.changes b/abseil-cpp.changes
index 3b11ef4..eb646cc 100644
--- a/abseil-cpp.changes
+++ b/abseil-cpp.changes
@@ -1,4 +1,28 @@
-------------------------------------------------------------------
+<<<<<<< Updated upstream
+=======
+Tue Apr 13 18:39:09 UTC 2021 - Ferdinand Thiessen
+
+- Update to LTS version 20210324.0
+ * Breaking: The empty absl::container target has been removed from
+ the CMake build. This target had no effect and references to
+ this target in user code can safely be removed.
+ * New: The cleanup library has been released. This library contains
+ the control-flow-construct-like type absl::Cleanup which is used
+ for executing a callback on scope exit.
+ * New: The numeric library now includes bits.h, a polyfill header
+ containing implementations of C++20's bitwise math functions.
+ * New: Abseil now installs pkg-config files to make it easier to
+ use Abseil with some other build systems.
+ * New: Abseil now respects the default CMake installation paths.
+ Standard CMake variables like CMAKE_INSTALL_PREFIX can be used
+ to change the installation path.
+- Added Correctly-install-pkgconfig.patch from upstream to fix
+ installation of pkgconfig files
+- Call ldconfig on post and postun
+
+-------------------------------------------------------------------
+>>>>>>> Stashed changes
Tue Dec 29 12:18:55 UTC 2020 - Matthias Eliasson
- Update to version 20200923.2
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index aa8f832..e3418ea 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -1,7 +1,7 @@
#
# spec file for package abseil-cpp
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,15 +17,22 @@
Name: abseil-cpp
+<<<<<<< Updated upstream
Version: 20200923.2
+=======
+Version: 20210324.0
+>>>>>>> Stashed changes
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
+BuildRequires: pkgconfig
%description
Abseil is a collection of C++11 libraries which augment the C++
@@ -50,19 +57,24 @@ cat >"%{_builddir}/abslx.sym" <<-EOF
ABSL_%{version} { global: *; };
EOF
%define build_ldflags -Wl,--version-script=%{_builddir}/abslx.sym
-%cmake -DBUILD_SHARED_LIBS:BOOL=ON
+%cmake
%install
%cmake_install
%fdupes %{buildroot}/%{_prefix}
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
%files
%license LICENSE
-%doc README.md
-%{_libdir}/libabsl_*.so
+%{_libdir}/libabsl_*.so.*
%files devel
-%{_includedir}/absl/
-%{_libdir}/cmake/
+%doc README.md
+%{_includedir}/absl
+%{_libdir}/cmake/absl
+%{_libdir}/libabsl_*.so
+%{_libdir}/pkgconfig/absl_*.pc
%changelog