Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cfitsio for openSUSE:Factory checked in at 2024-07-04 16:27:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cfitsio (Old) and /work/SRC/openSUSE:Factory/.cfitsio.new.2080 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "cfitsio" Thu Jul 4 16:27:42 2024 rev:29 rq:1185346 version:4.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/cfitsio/cfitsio.changes 2024-01-07 21:39:01.781241581 +0100 +++ /work/SRC/openSUSE:Factory/.cfitsio.new.2080/cfitsio.changes 2024-07-04 16:28:35.463158559 +0200 @@ -1,0 +2,36 @@ +Thu Jun 13 09:33:38 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com> + +- Update to version 4.4.0: + * Reorganization of helper utility code; added fitsverify + * CMakeLists.txt: Changed install location of + cfitsio-targets.cmake to conform with the one listed in + cfitsio-config.cmake.in (i.e. including the extra "cfitsio" + subdir of lib/cmake). + * calculator functions that read GTIs do more correct validity + checking of GTI input files + * fits_insert_rows now works if input table starts with both no + rows and no columns + * Can now write internal memory files of size > 2^32 directly to + a gzip-compressed output file. + * Added support for unsigned long long types to fits_update_key. + * Added ability for Windows builds to handle UTF-8 needed for + reading filenames with non-ASCII characters. + * Added 2-byte int test to speed.c utility. + * Made fix to http file handler to expand the allowed URL + length. +- Change License tag to NASA-1.3 in keeping with upstream. +- Switch to cmake+ninja for build. +- Switch BuildRequires to pkgconfig based packages where possible. +- Add a bunch of cmake build related patches to make the output + close to that generated by autotools: + * cfitsio-cmake-devel-scripts-destination.patch: Fix destination of + pkgconfig and cmake scripts from /usr/lib to %{_libdir}. + * cfitsio-cmake-allow-user-specified-incdir.patch: Allow specifying + user-defined include dir into which to install header files. + * cfitsio-cmake-lowercase-util-names.patch: Use lowercase + names for utility binaries when building using cmake (same as + autotools) + * cfitsio-cmake-match-autotools-soversion.patch: Same so + number as used in configure.in. + +------------------------------------------------------------------- @@ -943 +978,0 @@ - Old: ---- cfitsio-4.3.1.tar.gz New: ---- cfitsio-4.4.0.tar.gz cfitsio-cmake-allow-user-specified-incdir.patch cfitsio-cmake-devel-scripts-destination.patch cfitsio-cmake-lowercase-util-names.patch cfitsio-cmake-match-autotools-soversion.patch BETA DEBUG BEGIN: New: pkgconfig and cmake scripts from /usr/lib to %{_libdir}. * cfitsio-cmake-allow-user-specified-incdir.patch: Allow specifying user-defined include dir into which to install header files. New: close to that generated by autotools: * cfitsio-cmake-devel-scripts-destination.patch: Fix destination of pkgconfig and cmake scripts from /usr/lib to %{_libdir}. New: user-defined include dir into which to install header files. * cfitsio-cmake-lowercase-util-names.patch: Use lowercase names for utility binaries when building using cmake (same as New: autotools) * cfitsio-cmake-match-autotools-soversion.patch: Same so number as used in configure.in. BETA DEBUG END: ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cfitsio.spec ++++++ --- /var/tmp/diff_new_pack.N60nCq/_old 2024-07-04 16:28:37.047216384 +0200 +++ /var/tmp/diff_new_pack.N60nCq/_new 2024-07-04 16:28:37.067217114 +0200 @@ -17,18 +17,30 @@ %define so_ver 10 +%define __builder ninja Name: cfitsio -Version: 4.3.1 +Version: 4.4.0 Release: 0 Summary: Library for manipulating FITS data files -License: ISC +License: NASA-1.3 URL: https://heasarc.gsfc.nasa.gov/fitsio/ Source0: https://heasarc.gsfc.nasa.gov/FTP/software/fitsio/c/%{name}-%{version}.tar.gz +# PATCH-FIX-UPSTREAM cfitsio-cmake-allow-user-specified-incdir.patch badshah400@gmail.com -- Allow user-specified include dir +Patch0: cfitsio-cmake-allow-user-specified-incdir.patch +# PATCH-FIX-UPSTREAM cfitsio-cmake-devel-scripts-destination.patch badshah400@gmail.com -- Fix installation dir for pkgconfig and cmake scripts +Patch1: cfitsio-cmake-devel-scripts-destination.patch +# PATCH-FIX-UPSTREAM cfitsio-cmake-lowercase-util-names.patch badshah400@gmail.com -- Use lowercase name for utility binaries when building using cmake (same as autotools) +Patch2: cfitsio-cmake-lowercase-util-names.patch +# PATCH-FIX-UPSTREAM cfitsio-cmake-match-autotools-soversion.patch badshah400@gmail.com -- Use same so version when building with cmake as when done using autotools +Patch3: cfitsio-cmake-match-autotools-soversion.patch +BuildRequires: cmake +BuildRequires: gcc-c++ BuildRequires: gcc-fortran -BuildRequires: libcurl-devel +BuildRequires: ninja BuildRequires: pkgconfig -BuildRequires: zlib-devel BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) %description CFITSIO is a library of C and Fortran subroutines for reading and writing data @@ -75,51 +87,50 @@ in FITS files. %prep -%setup -q -# Disable build of static library -sed -i -e 's/\(.*:.*\)lib${PACKAGE}.a/\1/' Makefile.in +%autosetup -p1 %build -%configure \ - --enable-reentrant \ - --includedir=%{_includedir}/cfitsio \ - --with-bzip2 \ +%cmake \ + -DINCLUDE_INSTALL_DIR=%{_includedir}/cfitsio \ + -DUSE_BZIP2=ON \ + -DTESTS=ON \ + -DUTILS=ON \ %ifarch x86_64 - --enable-sse2 \ + -DUSE_SSE2=ON \ %endif %{nil} -%make_build shared -%make_build fpack funpack fitscopy +%cmake_build %install -%make_install +%cmake_install %check # testsuite -%make_build testprog -LD_LIBRARY_PATH=. ./testprog > testprog.lis -diff testprog.lis testprog.out -cmp testprog.fit testprog.std ; echo $? +%ctest -%post -n libcfitsio%{so_ver} -p /sbin/ldconfig -%postun -n libcfitsio%{so_ver} -p /sbin/ldconfig +%ldconfig_scriptlets -n libcfitsio%{so_ver} %files -%doc README docs/{changes.txt,fpackguide.pdf} -%license License.txt +%doc README.md docs/{changes.txt,fpackguide.pdf} +%license licenses/NASA_Open_Source_Agreement_1.3.txt %{_bindir}/fitscopy +%{_bindir}/fitsverify %{_bindir}/fpack %{_bindir}/funpack %files devel +%license licenses/NASA_Open_Source_Agreement_1.3.txt %{_includedir}/%{name}/ %{_libdir}/libcfitsio.so %{_libdir}/pkgconfig/cfitsio.pc +%{_libdir}/cmake/%{name}/ +%{_libdir}/%{name}-%{version}/ %files devel-doc %doc docs/{cfitsio.ps,cfortran.doc,fitsio.doc,fitsio.ps,quick.ps} %files -n libcfitsio%{so_ver} +%license licenses/NASA_Open_Source_Agreement_1.3.txt %{_libdir}/libcfitsio.so.%{so_ver}* ++++++ cfitsio-4.3.1.tar.gz -> cfitsio-4.4.0.tar.gz ++++++ ++++ 56992 lines of diff (skipped) ++++++ cfitsio-cmake-allow-user-specified-incdir.patch ++++++ --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: cfitsio-4.4.0/CMakeLists.txt =================================================================== --- cfitsio-4.4.0.orig/CMakeLists.txt +++ cfitsio-4.4.0/CMakeLists.txt @@ -219,7 +219,7 @@ ENDIF() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}") set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}") -set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/") +set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/" CACHE PATH "Install dir for header files") set (BIN_DESTINATION "${CMAKE_INSTALL_PREFIX}/bin") SET(H_FILES fitsio.h fitsio2.h longnam.h) ++++++ cfitsio-cmake-devel-scripts-destination.patch ++++++ --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: cfitsio-4.4.0/CMakeLists.txt =================================================================== --- cfitsio-4.4.0.orig/CMakeLists.txt +++ cfitsio-4.4.0/CMakeLists.txt @@ -358,7 +358,7 @@ ENDIF(UTILS) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cfitsio.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/cfitsio.pc @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-config.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cfitsio-config.cmake @ONLY) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/cfitsio-config-version.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/cfitsio-config-version.cmake @ONLY) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cfitsio.pc DESTINATION lib/pkgconfig/) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cfitsio.pc DESTINATION ${LIB_DESTINATION}/pkgconfig/) install(FILES ${CFITSIO_BINARY_DIR}/cfitsio-config.cmake ${CFITSIO_BINARY_DIR}/cfitsio-config-version.cmake - DESTINATION lib/cfitsio-${CFITSIO_VERSION}) + DESTINATION ${LIB_DESTINATION}/cfitsio-${CFITSIO_VERSION}) ++++++ cfitsio-cmake-lowercase-util-names.patch ++++++ --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) Index: cfitsio-4.4.0/CMakeLists.txt =================================================================== --- cfitsio-4.4.0.orig/CMakeLists.txt +++ cfitsio-4.4.0/CMakeLists.txt @@ -326,29 +326,29 @@ ENDIF(TESTS) #============================================================================== IF (UTILS) - ADD_EXECUTABLE(FPack utilities/fpack.c utilities/fpackutil.c) - TARGET_LINK_LIBRARIES(FPack ${LIB_NAME}) + ADD_EXECUTABLE(fpack utilities/fpack.c utilities/fpackutil.c) + TARGET_LINK_LIBRARIES(fpack ${LIB_NAME}) - ADD_EXECUTABLE(Funpack utilities/funpack.c utilities/fpackutil.c) - TARGET_LINK_LIBRARIES(Funpack ${LIB_NAME}) + ADD_EXECUTABLE(funpack utilities/funpack.c utilities/fpackutil.c) + TARGET_LINK_LIBRARIES(funpack ${LIB_NAME}) - ADD_EXECUTABLE(Fitscopy utilities/fitscopy.c) - TARGET_LINK_LIBRARIES(Fitscopy ${LIB_NAME}) + ADD_EXECUTABLE(fitscopy utilities/fitscopy.c) + TARGET_LINK_LIBRARIES(fitscopy ${LIB_NAME}) - ADD_EXECUTABLE(Fitsverify + ADD_EXECUTABLE(fitsverify utilities/ftverify.c utilities/fvrf_data.c utilities/fvrf_file.c utilities/fvrf_head.c utilities/fvrf_key.c utilities/fvrf_misc.c) - TARGET_COMPILE_DEFINITIONS(Fitsverify PRIVATE -DSTANDALONE) - TARGET_LINK_LIBRARIES(Fitsverify ${LIB_NAME}) + TARGET_COMPILE_DEFINITIONS(fitsverify PRIVATE -DSTANDALONE) + TARGET_LINK_LIBRARIES(fitsverify ${LIB_NAME}) # To expand the command line arguments in Windows, see: # http://msdn.microsoft.com/en-us/library/8bch7bkk.aspx if(MSVC AND NOT CMAKE_SYSTEM_NAME MATCHES "WindowsStore") - set_target_properties(FPack Funpack PROPERTIES LINK_FLAGS "setargv.obj") + set_target_properties(fpack funpack PROPERTIES LINK_FLAGS "setargv.obj") endif(MSVC) - install(TARGETS FPack Funpack Fitscopy Fitsverify RUNTIME DESTINATION bin) + install(TARGETS fpack funpack fitscopy fitsverify RUNTIME DESTINATION bin) ENDIF(UTILS) ++++++ cfitsio-cmake-match-autotools-soversion.patch ++++++ --- CMakeLists.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) Index: cfitsio-4.4.0/CMakeLists.txt =================================================================== --- cfitsio-4.4.0.orig/CMakeLists.txt +++ cfitsio-4.4.0/CMakeLists.txt @@ -288,7 +288,12 @@ IF (BZIP2_FOUND) SET (PKG_CONFIG_LIBS "${PKG_CONFIG_LIBS} -lbz2") ENDIF(BZIP2_FOUND) -SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR}) +# Set SOVERSION same as autotools +set(${PROJECT_NAME}_SONAME 10) +SET_TARGET_PROPERTIES(${LIB_NAME} + PROPERTIES VERSION ${${PROJECT_NAME}_SONAME}.${${PROJECT_NAME}_VERSION} + SOVERSION ${${PROJECT_NAME}_SONAME} +) include(GNUInstallDirs) include(CMakePackageConfigHelpers)