Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package libcerf for openSUSE:Factory checked in at 2022-07-31 23:00:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libcerf (Old)
and /work/SRC/openSUSE:Factory/.libcerf.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libcerf"
Sun Jul 31 23:00:11 2022 rev:6 rq:989494 version:2.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/libcerf/libcerf.changes 2021-12-16 21:19:30.478525708 +0100
+++ /work/SRC/openSUSE:Factory/.libcerf.new.1533/libcerf.changes 2022-07-31 23:00:13.731567080 +0200
@@ -1,0 +2,9 @@
+Thu Jul 14 17:05:22 UTC 2022 - Dirk M��ller
+
+- update to 2.1:
+ - provide cerfConfig.cmake (contributed by Lori A. Burns and Christoph Junghans)
+ - libcerf.pc: remove hard-coded lib/
+ - version number incremented to overcome upstream problems with withdrawn release 2.0
+- drop 2.patch (upstream)
+
+-------------------------------------------------------------------
Old:
----
2.patch
libcerf-v1.17.tar.gz
New:
----
libcerf-v2.1.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libcerf.spec ++++++
--- /var/tmp/diff_new_pack.2jo4og/_old 2022-07-31 23:00:14.243568568 +0200
+++ /var/tmp/diff_new_pack.2jo4og/_new 2022-07-31 23:00:14.247568579 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libcerf
#
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2014 Christoph Junghans
#
# All modifications and additions to the file contributed by third parties
@@ -18,52 +18,48 @@
Name: libcerf
-Version: 1.17
+Version: 2.1
Release: 0
-
+Summary: A library that complex error functions
+License: MIT
+Group: Development/Libraries/C and C++
URL: https://jugit.fz-juelich.de/mlz/libcerf
Source0: https://jugit.fz-juelich.de/mlz/libcerf/-/archive/v%{version}/%{name}-v%{version}.tar.gz
-# PATCH-FIX-UPSTREAM 2.patch add cmake export for consumers e.g. libecpint
-# https://jugit.fz-juelich.de/mlz/libcerf/-/merge_requests/2
-Patch0: https://jugit.fz-juelich.de/mlz/libcerf/-/merge_requests/2.patch
# PATCH-FIX-OPENSUSE fix_return.patch fix return value in one function
Patch1: fix_return.patch
-Summary: A library that complex error functions
-License: MIT
-Group: Development/Libraries/C and C++
-
-
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: pkgconfig
%description
-libcerf is a self-contained numeric library that provides an efficient and accurate implementation of
-complex error functions, along with Dawson, Faddeeva, and Voigt functions.
+libcerf is a self-contained numeric library that provides an efficient and
+accurate implementation of complex error functions, along with Dawson,
+Faddeeva, and Voigt functions.
-%package -n libcerf1
+%package -n libcerf2
Summary: A library that provides complex error functions
Group: Development/Libraries/C and C++
-%description -n libcerf1
-libcerf is a self-contained numeric library that provides an efficient and accurate implementation of
-complex error functions, along with Dawson, Faddeeva, and Voigt functions.
+%description -n libcerf2
+libcerf is a self-contained numeric library that provides an efficient and
+accurate implementation of complex error functions, along with Dawson,
+Faddeeva, and Voigt functions.
%package devel
Summary: Development headers and libraries for libcerf
Group: Development/Libraries/C and C++
-Requires: libcerf1 = %{version}-%{release}
+Requires: libcerf2 = %{version}-%{release}
%description devel
-libcerf is a self-contained numeric library that provides an efficient and accurate implementation of
-complex error functions, along with Dawson, Faddeeva, and Voigt functions.
+libcerf is a self-contained numeric library that provides an efficient and
+accurate implementation of complex error functions, along with Dawson,
+Faddeeva, and Voigt functions.
This package contains development headers and libraries for libcerf
%prep
%setup -q -n %{name}-v%{version}
-%patch0 -p1
-%patch1 -p0
+%patch1
# Force cmake to use the paths passed at configure time
sed -i -e 's|lib/pkgconfig/|%{_lib}/pkgconfig/|' CMakeLists.txt
sed -i -e 's|DESTINATION lib|DESTINATION %{_lib}|' lib/CMakeLists.txt
@@ -79,13 +75,13 @@
mv %{buildroot}%{_datadir}/doc/cerf/* %{buildroot}%{_docdir}/%{name}
%fdupes %{buildroot}%{_prefix}
-%post -n libcerf1 -p /sbin/ldconfig
-%postun -n libcerf1 -p /sbin/ldconfig
+%post -n libcerf2 -p /sbin/ldconfig
+%postun -n libcerf2 -p /sbin/ldconfig
%check
%ctest
-%files -n libcerf1
+%files -n libcerf2
%license LICENSE
%{_libdir}/libcerf.so.*
@@ -95,6 +91,6 @@
%{_libdir}/pkgconfig/libcerf.pc
%{_mandir}/man3/*
%{_docdir}/%{name}
-%{_datadir}/cmake/cerf
+%{_libdir}/cmake/cerf
%changelog
++++++ libcerf-v1.17.tar.gz -> libcerf-v2.1.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcerf-v1.17/CHANGELOG new/libcerf-v2.1/CHANGELOG
--- old/libcerf-v1.17/CHANGELOG 2021-06-29 12:21:11.000000000 +0200
+++ new/libcerf-v2.1/CHANGELOG 2022-04-08 21:09:20.000000000 +0200
@@ -1,5 +1,10 @@
== Revision history of libcerf, maintained by Joachim Wuttke ==
+libcerf-2.1, released 8apr22:
+ - provide cerfConfig.cmake (contributed by Lori A. Burns and Christoph Junghans)
+ - libcerf.pc: remove hard-coded lib/
+ - version number incremented to overcome upstream problems with withdrawn release 2.0
+
libcerf-1.17, released 29jun21:
- Correct pkgconfig installation directory (use GNU install dirs, install to LIBDIR/pkgconfig)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcerf-v1.17/CMakeLists.txt new/libcerf-v2.1/CMakeLists.txt
--- old/libcerf-v1.17/CMakeLists.txt 2021-06-29 12:21:11.000000000 +0200
+++ new/libcerf-v2.1/CMakeLists.txt 2022-04-08 21:09:20.000000000 +0200
@@ -32,8 +32,8 @@
set(CMAKE_C_STANDARD 99)
endif()
-set(CERF_SOVERSION 1) # API version
-set(CERF_VERSION ${CERF_SOVERSION}.17) # minor version
+set(CERF_SOVERSION 2) # API version
+set(CERF_VERSION ${CERF_SOVERSION}.1) # minor version
include(GNUInstallDirs)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcerf-v1.17/cmake/cerfConfig.cmake.in new/libcerf-v2.1/cmake/cerfConfig.cmake.in
--- old/libcerf-v1.17/cmake/cerfConfig.cmake.in 1970-01-01 01:00:00.000000000 +0100
+++ new/libcerf-v2.1/cmake/cerfConfig.cmake.in 2022-04-08 21:09:20.000000000 +0200
@@ -0,0 +1,103 @@
+# cerfConfig.cmake
+# ----------------
+#
+# cerf cmake module.
+# This module sets the following variables in your project:
+#
+# ::
+#
+# cerf_FOUND - true if cerf and all required components found on the system
+#
+#
+# Available components: shared static
+#
+# ::
+#
+# shared - search for only shared library
+# static - search for only static library
+# C - search for C library only
+# CXX - search for CXX library only
+#
+#
+# Exported targets:
+#
+# ::
+#
+# If cerf is found, this module defines the following :prop_tgt:`IMPORTED`
+# targets. Target is shared _or_ static, so, for both, use separate, not
+# overlapping, installations. ::
+#
+# cerf::cerf - the main cerf library with header attached.
+# cerf::cerfcpp - the C++ cerf library
+#
+#
+# Suggested usage:
+#
+# ::
+#
+# find_package(cerf)
+# find_package(cerf 1.17.0 EXACT CONFIG REQUIRED COMPONENTS shared C)
+#
+#
+# The following variables can be set to guide the search for this package:
+#
+# ::
+#
+# cerf_DIR - CMake variable, set to directory containing this Config file
+# CMAKE_PREFIX_PATH - CMake variable, set to root directory of this package
+# PATH - environment variable, set to bin directory of this package
+# CMAKE_DISABLE_FIND_PACKAGE_cerf - CMake variable, disables
+# find_package(cerf) when not REQUIRED, perhaps to force internal build
+
+@PACKAGE_INIT@
+
+set(PN cerf)
+set (_valid_components
+ static
+ shared
+ C
+ CXX
+)
+
+# check library style component
+if(@BUILD_SHARED_LIBS@)
+ set(${PN}_shared_FOUND 1)
+else()
+ set(${PN}_static_FOUND 1)
+endif()
+list(FIND ${PN}_FIND_COMPONENTS "shared" _seek_shared)
+list(FIND ${PN}_FIND_COMPONENTS "static" _seek_static)
+
+# check library language component
+if(@CERF_CPP@)
+ set(${PN}_CXX_FOUND 1)
+ set(_target "cerfcpp")
+else()
+ set(${PN}_C_FOUND 1)
+ set(_target "cerf")
+endif()
+list(FIND ${PN}_FIND_COMPONENTS "C" _seek_C)
+list(FIND ${PN}_FIND_COMPONENTS "CXX" _seek_CXX)
+
+check_required_components(${PN})
+
+#-----------------------------------------------------------------------------
+# Don't include targets if this file is being picked up by another
+# project which has already built this as a subproject
+#-----------------------------------------------------------------------------
+if(NOT TARGET ${PN}::${_target})
+
+ include("${CMAKE_CURRENT_LIST_DIR}/${PN}Targets.cmake")
+
+ get_property(_loc TARGET ${PN}::${_target} PROPERTY LOCATION)
+ get_property(_ill TARGET ${PN}::${_target} PROPERTY INTERFACE_LINK_LIBRARIES)
+
+ get_property(_id TARGET ${PN}::${_target} PROPERTY INCLUDE_DIRECTORIES)
+ get_property(_iid TARGET ${PN}::${_target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES)
+
+ # message("cerf::${_target}")
+ # message("loc ${_loc}")
+ # message("ill ${_ill}")
+ # message("id ${_id}")
+ # message("iid ${_iid}")
+endif()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcerf-v1.17/lib/CMakeLists.txt new/libcerf-v2.1/lib/CMakeLists.txt
--- old/libcerf-v1.17/lib/CMakeLists.txt 2021-06-29 12:21:11.000000000 +0200
+++ new/libcerf-v2.1/lib/CMakeLists.txt 2022-04-08 21:09:20.000000000 +0200
@@ -1,6 +1,8 @@
set(lib cerf)
+set(intf "c_interface")
if (${CERF_CPP})
set(lib cerfcpp)
+ set(intf "cxx_interface")
endif()
message(STATUS
"libcerf/lib: build library ${lib}, CERF_CPP=${CERF_CPP}, shared=${BUILD_SHARED_LIBS}")
@@ -29,8 +31,13 @@
target_link_libraries(${lib} m)
endif()
+target_include_directories(${lib} INTERFACE
+ $
+ $)
+
install(
TARGETS ${lib}
+ EXPORT ${intf}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
@@ -40,6 +47,22 @@
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
COMPONENT Headers)
+include(CMakePackageConfigHelpers)
+set(CMAKECONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/cerf")
+configure_package_config_file(${PROJECT_SOURCE_DIR}/cmake/cerfConfig.cmake.in
+ "${CMAKE_CURRENT_BINARY_DIR}/cerfConfig.cmake"
+ INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/cerfConfigVersion.cmake
+ VERSION ${CERF_VERSION}
+ COMPATIBILITY SameMajorVersion)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cerfConfig.cmake
+ ${CMAKE_CURRENT_BINARY_DIR}/cerfConfigVersion.cmake
+ DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+install(EXPORT ${intf}
+ NAMESPACE "cerf::"
+ FILE "cerfTargets.cmake"
+ DESTINATION ${CMAKECONFIG_INSTALL_DIR})
+
set(CPACK_PACKAGE_VENDOR "Forschungszentrum J��lich GmbH")
set(CPACK_PACKAGE_VERSION ${CERF_VERSION})
set(CPACK_GENERATOR "ZIP")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libcerf-v1.17/libcerf.pc.in new/libcerf-v2.1/libcerf.pc.in
--- old/libcerf-v1.17/libcerf.pc.in 2021-06-29 12:21:11.000000000 +0200
+++ new/libcerf-v2.1/libcerf.pc.in 2022-04-08 21:09:20.000000000 +0200
@@ -1,7 +1,7 @@
prefix=@CMAKE_INSTALL_PREFIX@
exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
Name: libcerf
Description: Complex error function library