Accepting request 886674 from devel:kubic

OBS-URL: https://build.opensuse.org/request/show/886674
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/abseil-cpp?expand=0&rev=17

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} $<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()
+ 

_service

@@ -1,15 +0,0 @@
-<services>
-  <service mode="disabled" name="tar_scm">
-    <param name="url">https://github.com/abseil/abseil-cpp</param>
-    <param name="scm">git</param>
-    <param name="changesgenerate">enable</param>
-    <param name="filename">abseil-cpp</param>
-    <param name="versionformat">%cd</param>
-    <param name="revision">61c9bf3e3e1c28a4aa6d7f1be4b37fd473bb5529</param>
-  </service>
-  <service mode="disabled" name="recompress">
-    <param name="file">*.tar</param>
-    <param name="compression">xz</param>
-  </service>
-  <service mode="disabled" name="set_version"/>
-</services>

_servicedata

@@ -1,4 +0,0 @@
-<servicedata>
-<service name="tar_scm">
-                <param name="url">https://github.com/abseil/abseil-cpp</param>
-              <param name="changesrevision">61c9bf3e3e1c28a4aa6d7f1be4b37fd473bb5529</param></service></servicedata>

abseil-cpp-20200923.2.tar.gz

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

abseil-cpp-20210324.0.tar.gz

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

abseil-cpp.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Tue Apr 13 18:39:09 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
+
+- 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
+
 -------------------------------------------------------------------
 Tue Dec 29 12:18:55 UTC 2020 - Matthias Eliasson <elimat@opensuse.org>
 

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,18 @@
 
 
 Name:           abseil-cpp
-Version:        20200923.2
+Version:        20210324.0
 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 +53,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/
+%doc README.md
-%{_libdir}/cmake/
+%{_includedir}/absl
+%{_libdir}/cmake/absl
+%{_libdir}/libabsl_*.so
+%{_libdir}/pkgconfig/absl_*.pc
 
 %changelog