Accepting request 1198799 from science

OBS-URL: https://build.opensuse.org/request/show/1198799 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ldas-tools-framecpp?expand=0&rev=3
Accepting request 1197478 from home:badshah400:branches:science
2024-09-05 13:47:12 +00:00 · 2024-09-04 18:43:58 +00:00
5 changed files with 144 additions and 98 deletions
--- a/ldas-tools-framecpp-2.7.0.tar.gz
+++ b/ldas-tools-framecpp-2.7.0.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:539ae6ab7966f4e1379dfeb711d02e9edc087e1a8acab057af8a7405b16788a9
-size 3096209
--- a/ldas-tools-framecpp-3.0.4.tar.gz
+++ b/ldas-tools-framecpp-3.0.4.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6c5769f5eeee5b5eace74d0e617527b03574af6c5c0a5e30b2ef60a63e05b599
+size 1074828
--- a/ldas-tools-framecpp-no-return-from-nonvoid-func.patch
+++ b/ldas-tools-framecpp-no-return-from-nonvoid-func.patch
@@ -1,12 +0,0 @@
-Index: ldas-tools-framecpp-2.7.0/test/ChecksumValidator.cc
-===================================================================
--- ldas-tools-framecpp-2.7.0.orig/test/ChecksumValidator.cc
-+++ ldas-tools-framecpp-2.7.0/test/ChecksumValidator.cc
-@@ -82,6 +82,7 @@ test_helper( const char*  TestDir,
-             BOOST_CHECK( ( ret == 0 ) == Expected );
-         }
-     }
-+    return retval;
- }
- 
- void
--- a/ldas-tools-framecpp.changes
+++ b/ldas-tools-framecpp.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Thu Aug 29 13:44:28 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 3.0.4:
+  * Corrected initialization order
+  * Initialized all option variables for framecpp_verify (closes
+    #209)
+  * Restored CRC effecientcy (closes #164)
+  * Restore framecpp_compare (closes #165)
+  * Corrected handling of composite compression modes
+  * Corrected translation of compression mode flags going from
+    version 8 frame specification to version 9 frame specification
+  * Added ability to specify version of frame to write
+- Enable LTO.
+
+-------------------------------------------------------------------
+Thu Jan 18 21:14:23 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 3.0.2:
+  * Corrected handling of ZERO_SUPPRESS_OTHERWISE_GZIP (closes
+    computing/ldastools/LDAS_Tools#159)
+  * Added GetNDataValid function and other functions to
+    access/manipulate dataValid vector to FrVect (closes
+    computing/ldastools/LDAS_Tools#160)
+  * Modified function signature of
+    FrameCPP::Version9::FrVect::SetDataValid to accept const
+    CHAR_U* as first parameter (closes
+    computing/ldastools/LDAS_Tools#161)
+- Changes from older versions: see
+  %{_docdir}/ldas-tools-framecpp-devel/ChangeLog.md
+- Update shared lib names to keep up with upstream so versions,
+  and define macros to keep them all consistent across the spec.
+- Use cmake macros to build; in addition pass
+  -DCMAKE_SKIP_INSTALL_RPATH=ON to avoid rpaths in installed
+  binaries.
+- Disable builds on 32 bit systems where builds fail due to `long
+  long unsigned int` vs `size_t` types mismatch.
+- Boost >= 1.67.0 is now required for builds.
+- Drop ldas-tools-framecpp-no-return-from-nonvoid-func.patch:
+  fixed upstream.
+
 -------------------------------------------------------------------
 Wed Apr 27 09:49:40 UTC 2022 - Jan Engelhardt <jengelh@inai.de>

--- a/ldas-tools-framecpp.spec
+++ b/ldas-tools-framecpp.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package ldas-tools-framecpp
 #
-# Copyright (c) 2022 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,17 +16,24 @@
 #


-%define _lto_cflags %{nil}
+%define shlib       libframecpp16
+%define shlib_c     libframecppc4
+%define shlib_cmn   libframecppcmn12
+%define shlib_fcpp3 libframecpp3-8
+%define shlib_fcpp4 libframecpp4-10
+%define shlib_fcpp6 libframecpp6-10
+%define shlib_fcpp7 libframecpp7-6
+%define shlib_fcpp8 libframecpp8-11
+%define shlib_fcpp9 libframecpp9-0
+
 Name:           ldas-tools-framecpp
-Version:        2.7.0
+Version:        3.0.4
 Release:        0
 Summary:        Toolkit providing C++ bindings for dealing with frame data
 License:        GPL-2.0-or-later
 Group:          Productivity/Scientific/Physics
-URL:            http://software.ligo.org
-Source:         http://software.ligo.org/lscsoft/source/%{name}-%{version}.tar.gz
-# PATCH-FIX-UPSTREAM ldas-tools-framecpp-no-return-from-nonvoid-func.patch badshah400@gmail.com -- Fix a non-void function not returning any value
-Patch0:         ldas-tools-framecpp-no-return-from-nonvoid-func.patch
+URL:            https://software.ligo.org
+Source:         https://software.ligo.org/lscsoft/source/%{name}-%{version}.tar.gz
 # PATCH-FIX-UPSTREAM ldas-tools-framecpp-fix-pkgconfig.patch badshah400@gmail.com -- Fix paths in pkgconfig file when absolute paths to LIBDIR and INCLUDEDIR are specified to cmake
 Patch1:         ldas-tools-framecpp-fix-pkgconfig.patch
 BuildRequires:  cmake
@@ -34,14 +41,22 @@ BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
 BuildRequires:  graphviz
-BuildRequires:  libboost_headers-devel
+BuildRequires:  gtest
+BuildRequires:  libboost_chrono-devel
+BuildRequires:  libboost_filesystem-devel
+BuildRequires:  libboost_headers-devel >= 1.67.0
 BuildRequires:  libboost_program_options-devel
+BuildRequires:  libboost_serialization-devel
+BuildRequires:  libboost_system-devel
 BuildRequires:  memory-constraints
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(ldastoolsal)
 BuildRequires:  pkgconfig(ldastoolscmake)
+BuildRequires:  pkgconfig(libzstd)
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
+# Build failures for 32 bit archs: `long long unsigned int` vs `size_t` types mismatch
+ExcludeArch:    %{ix86} %{arm32}

 %description
 LDAS (LIGO Data Analysis System) is a collection of libraries and executables
@@ -50,90 +65,101 @@ tools abstraction toolkit for LDAS.

 This package provides C++ bindings for libframe for dealing with frame files.

-%package -n libframecpp12
+%package -n %{shlib}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp12
+%description -n %{shlib}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecpp3-6
+%package -n %{shlib_fcpp3}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp3-6
+%description -n %{shlib_fcpp3}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecpp4-8
+%package -n %{shlib_fcpp4}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp4-8
+%description -n %{shlib_fcpp4}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecpp6-8
+%package -n %{shlib_fcpp6}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp6-8
+%description -n %{shlib_fcpp6}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecpp7-4
+%package -n %{shlib_fcpp7}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp7-4
+%description -n %{shlib_fcpp7}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecpp8-7
+%package -n %{shlib_fcpp8}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecpp8-7
+%description -n %{shlib_fcpp8}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

-%package -n libframecppc3
+%package -n %{shlib_fcpp9}
+Summary:        C++ bindings for ldas-tools
+Group:          System/Libraries
+Conflicts:      libframecpp
+
+%description -n %{shlib_fcpp9}
+This package provides a shared library for %{name} - a toolkit providing C++
+bindings for working with frame data.
+
+%package -n %{shlib_c}
 Summary:        C bindings for ldas-tools
 Group:          System/Libraries

-%description -n libframecppc3
+%description -n %{shlib_c}
 This package provides a shared library for %{name} - a toolkit providing C
 bindings for working with frame data.

-%package -n libframecppcmn11
+%package -n %{shlib_cmn}
 Summary:        C++ bindings for ldas-tools
 Group:          System/Libraries
 Conflicts:      libframecpp

-%description -n libframecppcmn11
+%description -n %{shlib_cmn}
 This package provides a shared library for %{name} - a toolkit providing C++
 bindings for working with frame data.

 %package devel
 Summary:        Headers and source files for developing with %{name}
 Group:          Development/Libraries/C and C++
+Requires:       %{shlib_cmn} = %{version}-%{release}
+Requires:       %{shlib_c} = %{version}-%{release}
+Requires:       %{shlib_fcpp3} = %{version}-%{release}
+Requires:       %{shlib_fcpp4} = %{version}-%{release}
+Requires:       %{shlib_fcpp6} = %{version}-%{release}
+Requires:       %{shlib_fcpp7} = %{version}-%{release}
+Requires:       %{shlib_fcpp8} = %{version}-%{release}
+Requires:       %{shlib_fcpp9} = %{version}-%{release}
+Requires:       %{shlib} = %{version}-%{release}
 Requires:       libboost_program_options-devel
-Requires:       libframecpp12 = %{version}-%{release}
-Requires:       libframecpp3-6 = %{version}-%{release}
-Requires:       libframecpp4-8 = %{version}-%{release}
-Requires:       libframecpp6-8 = %{version}-%{release}
-Requires:       libframecpp7-4 = %{version}-%{release}
-Requires:       libframecpp8-7 = %{version}-%{release}
-Requires:       libframecppc3 = %{version}-%{release}
-Requires:       libframecppcmn11 = %{version}-%{release}
 Requires:       pkgconfig(ldastoolsal)
+Requires:       pkgconfig(libzstd)
 Requires:       pkgconfig(openssl)
 Requires:       pkgconfig(zlib)

@@ -144,7 +170,7 @@ using %{name} - a toolkit providing C++ bindings for libframe.
 %package c-devel
 Summary:        Headers and source files for developing with %{name}'s in C
 Group:          Development/Libraries/C and C++
-Requires:       libframecppc3 = %{version}-%{release}
+Requires:       %{shlib_c} = %{version}-%{release}

 %description c-devel
 This package provides the headers and sources needed for developing programs
@@ -170,81 +196,69 @@ This package provides the API documentation for %{name} in HTML format.

 %build
 %limit_build -m 2000
-# Out-of-source builds using %%cmake macros don't work
-cmake -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \\\
-      -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \\\
-      -DLIB_INSTALL_DIR:PATH=%{_libdir} \\\
-      -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \\\
-      -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \\\
-      -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \\\
-      -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \\\
-      -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \\\
-      -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \\\
-      -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \\\
-      -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \\\
-      -DBUILD_SHARED_LIBS:BOOL=ON \\\
-      -DBUILD_STATIC_LIBS:BOOL=OFF \\\
-      -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \\\
-      -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \\\
-      -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \\\
-      -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \\\
-      -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \\\
-      .
-make VERBOSE=1 %{?_smp_mflags}
+%cmake \
+  -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name} \
+  -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+%cmake_build

 %install
-%make_install
+%cmake_install

 find %{buildroot} -type f -name "*.la" -delete -print
 find %{buildroot}%{_libdir} -name "*.a" -delete -print

-%fdupes %{buildroot}/%{_prefix}
+%fdupes %{buildroot}%{_docdir}/%{name}/
+%fdupes %{buildroot}%{_includedir}/framecpp/

-%post   -n libframecpp12 -p /sbin/ldconfig
-%postun -n libframecpp12 -p /sbin/ldconfig
-%post   -n libframecpp3-6 -p /sbin/ldconfig
-%postun -n libframecpp3-6 -p /sbin/ldconfig
-%post   -n libframecpp4-8 -p /sbin/ldconfig
-%postun -n libframecpp4-8 -p /sbin/ldconfig
-%post   -n libframecpp6-8 -p /sbin/ldconfig
-%postun -n libframecpp6-8 -p /sbin/ldconfig
-%post   -n libframecpp7-4 -p /sbin/ldconfig
-%postun -n libframecpp7-4 -p /sbin/ldconfig
-%post   -n libframecpp8-7 -p /sbin/ldconfig
-%postun -n libframecpp8-7 -p /sbin/ldconfig
-%post   -n libframecppc3 -p /sbin/ldconfig
-%postun -n libframecppc3 -p /sbin/ldconfig
-%post   -n libframecppcmn11 -p /sbin/ldconfig
-%postun -n libframecppcmn11 -p /sbin/ldconfig
+%post   -n %{shlib} -p /sbin/ldconfig
+%postun -n %{shlib} -p /sbin/ldconfig
+%post   -n %{shlib_c} -p /sbin/ldconfig
+%postun -n %{shlib_c} -p /sbin/ldconfig
+%post   -n %{shlib_cmn} -p /sbin/ldconfig
+%postun -n %{shlib_cmn} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp3} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp3} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp4} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp4} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp6} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp6} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp7} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp7} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp8} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp8} -p /sbin/ldconfig
+%post   -n %{shlib_fcpp9} -p /sbin/ldconfig
+%postun -n %{shlib_fcpp9} -p /sbin/ldconfig

-%files -n libframecpp12
+%files -n %{shlib}
 %{_libdir}/libframecpp.so.*

-%files -n libframecppcmn11
+%files -n %{shlib_cmn}
 %{_libdir}/libframecppcmn.so.*

-%files -n libframecpp3-6
+%files -n %{shlib_fcpp3}
 %{_libdir}/libframecpp3.so.*

-%files -n libframecpp4-8
+%files -n %{shlib_fcpp4}
 %{_libdir}/libframecpp4.so.*

-%files -n libframecpp6-8
+%files -n %{shlib_fcpp6}
 %{_libdir}/libframecpp6.so.*

-%files -n libframecpp7-4
+%files -n %{shlib_fcpp7}
 %{_libdir}/libframecpp7.so.*

-%files -n libframecpp8-7
+%files -n %{shlib_fcpp8}
 %{_libdir}/libframecpp8.so.*

-%files -n libframecppc3
+%files -n %{shlib_fcpp9}
+%{_libdir}/libframecpp9.so.*
+
+%files -n %{shlib_c}
 %{_libdir}/libframecppc.so.*

-%files -n libframecppcmn11
-%{_libdir}/libframecppcmn.so.*
-
 %files devel
+%license COPYING
+%doc ChangeLog.md README
 %{_includedir}/framecpp/
 %{_libdir}/libframecpp.so
 %{_libdir}/libframecppcmn.so
@@ -253,15 +267,18 @@ find %{buildroot}%{_libdir} -name "*.a" -delete -print
 %{_libdir}/libframecpp6.so
 %{_libdir}/libframecpp7.so
 %{_libdir}/libframecpp8.so
+%{_libdir}/libframecpp9.so
 %exclude %{_libdir}/pkgconfig/framecppc.pc
 %{_libdir}/pkgconfig/*.pc

 %files c-devel
+%license COPYING
 %{_includedir}/framecppc/
 %{_libdir}/libframecppc.so
 %{_libdir}/pkgconfig/framecppc.pc

 %files utils
+%license COPYING
 %{_bindir}/*

 %files doc