Sync from SUSE:SLFO:Main libcerf revision 30c312f09b32a9921e42fd7c82f9d7ff

This commit is contained in:
Adrian Schröter 2024-09-30 10:42:53 +02:00
parent 964a1ff2d4
commit d37d009de1
2 changed files with 21 additions and 8 deletions

View File

@ -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 <dmueller@suse.com>
- handle different doc location based on version of cmake macros
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Oct 11 03:59:43 UTC 2023 - ming li <mli@suse.com> Wed Oct 11 03:59:43 UTC 2023 - ming li <mli@suse.com>
- update to 2.4: - update to 2.4:
* CMake: runtime destination corrected (bin, not lib) * 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 <dmueller@suse.com> Mon May 29 19:26:08 UTC 2023 - Dirk Müller <dmueller@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package libcerf # spec file for package libcerf
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# Copyright (c) 2014 Christoph Junghans <junghans@votca.org> # Copyright (c) 2014 Christoph Junghans <junghans@votca.org>
# #
# All modifications and additions to the file contributed by third parties # 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 This package contains development headers and libraries for libcerf
%prep %prep
%setup -q -n %{name}-v%{version} %autosetup -p0 -n %{name}-v%{version}
%patch1
# Force cmake to use the paths passed at configure time # Force cmake to use the paths passed at configure time
sed -i -e 's|lib/pkgconfig/|%{_lib}/pkgconfig/|' CMakeLists.txt sed -i -e 's|lib/pkgconfig/|%{_lib}/pkgconfig/|' CMakeLists.txt
sed -i -e 's|DESTINATION lib|DESTINATION %{_lib}|' lib/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 %install
%cmake_install %cmake_install
mkdir -p %{buildroot}%{_docdir}/%{name} 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} %fdupes %{buildroot}%{_prefix}
%post -n libcerf2 -p /sbin/ldconfig %post -n libcerf2 -p /sbin/ldconfig