From d37d009de1e6603fad5e040429a06269dd66793fb74b6aa50610c27d359e2791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 30 Sep 2024 10:42:53 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main libcerf revision 30c312f09b32a9921e42fd7c82f9d7ff --- libcerf.changes | 20 ++++++++++++++++---- libcerf.spec | 9 +++++---- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/libcerf.changes b/libcerf.changes index 780fdb6..f35b440 100644 --- a/libcerf.changes +++ b/libcerf.changes @@ -1,9 +1,21 @@ +------------------------------------------------------------------- +Thu Feb 29 15:47:43 UTC 2024 - pgajdos@suse.com + +- Use %autosetup macro. Allows to eliminate the usage of deprecated + %patchN + +------------------------------------------------------------------- +Mon Feb 5 10:43:55 UTC 2024 - Dirk Müller + +- handle different doc location based on version of cmake macros + ------------------------------------------------------------------- Wed Oct 11 03:59:43 UTC 2023 - ming li - update to 2.4: * CMake: runtime destination corrected (bin, not lib) - * CMake: removed option PORTABLE and compiler flag -march (unavailable on some architectures) + * CMake: removed option PORTABLE and compiler flag -march + (unavailable on some architectures) ------------------------------------------------------------------- Mon May 29 19:26:08 UTC 2023 - Dirk Müller @@ -42,7 +54,7 @@ Tue Dec 14 18:21:54 UTC 2021 - Christoph Junghans Sat Dec 4 18:23:25 UTC 2021 - Christoph Junghans - Bump v1.17 - - Correct pkgconfig installation directory (use GNU install + - Correct pkgconfig installation directory (use GNU install dirs, install to LIBDIR/pkgconfig - added 2.patch from upstream PR#2 to add cmake export - added fix_return.patch to fix missing return value @@ -56,7 +68,7 @@ Wed Nov 22 16:42:07 UTC 2017 - junghans@votca.org ------------------------------------------------------------------- Tue Nov 21 15:58:05 UTC 2017 - idonmez@suse.com -- Fix source url +- Fix source url ------------------------------------------------------------------- Fri Oct 9 20:05:30 UTC 2015 - junghans@votca.org @@ -72,7 +84,7 @@ Fri Oct 9 20:05:30 UTC 2015 - junghans@votca.org ------------------------------------------------------------------- Fri Jul 24 10:38:34 UTC 2015 - werner@suse.de -- Use official upstream URL +- Use official upstream URL ------------------------------------------------------------------- Mon Jul 14 16:46:08 UTC 2014 - junghans@votca.org diff --git a/libcerf.spec b/libcerf.spec index 86c4149..06741fc 100644 --- a/libcerf.spec +++ b/libcerf.spec @@ -1,7 +1,7 @@ # # spec file for package libcerf # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2014 Christoph Junghans # # All modifications and additions to the file contributed by third parties @@ -58,8 +58,7 @@ Faddeeva, and Voigt functions. This package contains development headers and libraries for libcerf %prep -%setup -q -n %{name}-v%{version} -%patch1 +%autosetup -p0 -n %{name}-v%{version} # 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 @@ -72,7 +71,9 @@ sed -i -e 's|${prefix}/lib|@LIB_INSTALL_DIR@|' libcerf.pc.in %install %cmake_install mkdir -p %{buildroot}%{_docdir}/%{name} -mv %{buildroot}%{_datadir}/doc/cerf/* %{buildroot}%{_docdir}/%{name} +if [ -d %{buildroot}%{_datadir}/doc/cerf ]; then + mv %{buildroot}%{_datadir}/doc/cerf/* %{buildroot}%{_docdir}/%{name} +fi %fdupes %{buildroot}%{_prefix} %post -n libcerf2 -p /sbin/ldconfig