Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package ldas-tools-al for openSUSE:Factory checked in at 2024-09-05 15:47:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ldas-tools-al (Old) and /work/SRC/openSUSE:Factory/.ldas-tools-al.new.10096 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ldas-tools-al" Thu Sep 5 15:47:14 2024 rev:2 rq:1198812 version:2.6.7 Changes: -------- --- /work/SRC/openSUSE:Factory/ldas-tools-al/ldas-tools-al.changes 2020-10-24 15:18:00.792261123 +0200 +++ /work/SRC/openSUSE:Factory/.ldas-tools-al.new.10096/ldas-tools-al.changes 2024-09-05 15:47:59.058056036 +0200 @@ -1,0 +2,6 @@ +Thu Jan 18 17:35:32 UTC 2024 - Atri Bhattacharya <[email protected]> + +- Update to version 2.6.7: + * Many corrections to support building on RHEL 8 + +------------------------------------------------------------------- Old: ---- ldas-tools-al-2.6.4.tar.gz New: ---- ldas-tools-al-2.6.7.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ldas-tools-al.spec ++++++ --- /var/tmp/diff_new_pack.ylNG4o/_old 2024-09-05 15:47:59.546076302 +0200 +++ /var/tmp/diff_new_pack.ylNG4o/_new 2024-09-05 15:47:59.550076469 +0200 @@ -1,7 +1,7 @@ # # spec file for package ldas-tools-al # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -18,7 +18,7 @@ %define shlib libldastoolsal7 Name: ldas-tools-al -Version: 2.6.4 +Version: 2.6.7 Release: 0 Summary: LDAS (LIGO Data Analysis System) tools abstraction toolkit License: GPL-2.0-or-later ++++++ ldas-tools-al-2.6.4.tar.gz -> ldas-tools-al-2.6.7.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/CMakeLists.txt new/ldas-tools-al-2.6.7/CMakeLists.txt --- old/ldas-tools-al-2.6.4/CMakeLists.txt 2019-10-24 07:11:09.000000000 +0200 +++ new/ldas-tools-al-2.6.7/CMakeLists.txt 2021-09-30 02:55:20.000000000 +0200 @@ -30,7 +30,7 @@ #------------------------------------------------------------------------ set( LDAS_TOOLS_AL_PACKAGE_NAME ldas-tools-al ) -set( LDAS_TOOLS_AL_VERSION 2.6.4 ) +set( LDAS_TOOLS_AL_VERSION 2.6.7 ) set( PROJECT_DESCRIPTION @@ -43,9 +43,9 @@ "as used by the LDAS Tools Suite." ) +set( LDAS_TOOLS_CMAKE_VERSION 1.2.3 ) - -set( LDAS_TOOLS_CMAKE_VERSION 1.1.1 ) +set( BOOST_MINIMUM_VERSION 1.67 ) cmake_minimum_required(VERSION 3.2) set(CMAKE_CXX_STANDARD 11) @@ -65,19 +65,34 @@ # Locate the standard LDAS Tools cmake macro directory #------------------------------------------------------------------------ -include( "${CMAKE_SOURCE_DIR}/config/LocateLDASToolsCMake.cmake" ) +include( GNUInstallDirs ) -include(CheckSymbolExists) +set(LDAS_TOOLS_CMAKE_MODULES_DIRS + ${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/ldas-tools/cmake/Modules + ${CMAKE_INSTALL_FULL_DATADIR}/ldas-tools/cmake/Modules + ) + +find_package( + LDASToolsCMake + CONFIG + REQUIRED + HINTS ${LDAS_TOOLS_CMAKE_MODULES_DIRS} + PATHS ${LDAS_TOOLS_CMAKE_MODULES_DIRS} + ) #======================================================================== # Start pulling in the LDAS Tools macros for easy setup #======================================================================== -find_package(AxLDASTools) +message(STATUS "$CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}") +find_package(AxLDASTools REQUIRED) cx_msg_debug_variable( CMAKE_INSTALL_DOCDIR ) cx_msg_debug_variable( CMAKE_INSTALL_FULL_DOCDIR ) +cx_msg_debug_variable( BOOST_INCLUDEDIR ) +cx_msg_debug_variable( BOOST_LIBRARYDIR ) + cm_init( ${LDAS_TOOLS_AL_PACKAGE_NAME} "${LDAS_TOOLS_AL_VERSION}" @@ -168,7 +183,7 @@ cm_check_headers(stdlib.h) find_package( - Boost "1.53.0" REQUIRED + Boost ${BOOST_MINIMUM_VERSION} REQUIRED ) foreach(dir ${Boost_INCLUDE_DIRS} ) @@ -219,6 +234,8 @@ #dnl Check for individual functions #dnl ===================================================================== # +include(CheckSymbolExists) + cm_check_funcs(clock_gettime) cm_func_strerror_r( ) cm_check_funcs(fpathconf) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/ChangeLog new/ldas-tools-al-2.6.7/ChangeLog --- old/ldas-tools-al-2.6.4/ChangeLog 2019-10-23 23:19:10.000000000 +0200 +++ new/ldas-tools-al-2.6.7/ChangeLog 1970-01-01 01:00:00.000000000 +0100 @@ -1,68 +0,0 @@ -Release History -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -This file contains information about the LDASTools AL - component of the LDASTools Suite - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.6.4 - October 23, 2019 - * Added cx_ldas_prog_cxx() configuration check to obtain C++ standard - flag for use in package config file. - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.6.3 - August 14, 2019 - * Converted to CMake (Closes #22) - * Increased thread stack size to PTHREAD_STACK_MIN + 64k - * Reformatted comments in SOLoader.hh for Doxygen (Closes #69) - * Corrected Portfile to have proper description (Closes #55) - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.6.2 - December 6, 2018 - * Addressed packaging issues - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.6.1 - November 27, 2018 - * Added requirement of C++ 2011 standard - * Standardize source code format by using clang-format - * Removed check for type sizes as this now comes from stdint.h - * Removed LDASUnexpected as the interface is depricated as of C++ 2011 (fixes #43) - * Updated library versioning - - ldastoolsal - 7:0:0 - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.6.0 - June 19, 2018 - * Removed hand rolled smart pointers in favor of boost smart pointers - * Changed version of ldastoolsal library to 6:0:0 - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.5.6 - November 14, 2016 - * Corrected allocation of dirent_type (#4739) - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.5.2 - September 9, 2016 - * Added functions Interval and Timeout needed by new diskcache - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.5.1 - September 9, 2016 - * Added --disable-warnings-as-errors to allow compilation on systems - where warning messages have not yet been addressed - * Added conditional setting of DESTDIR in python.mk to prevent install - issues. - * Modified leap second table for gpstime for 2017 Jan 1 leap second. - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.5.0 - April 7, 2016 - Official release of splitting LDASTools into separate source packages - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.4.99.1 - March 11, 2016 - -The following problems have been resolved in this release: - * Corrections to spec files. - -~~~~~~~~~~~~~~~~~~~~~~~~~~ -Release 2.4.99.0 - March 3, 2016 - -The following problems have been resolved in this release: - * Separated code into independant source distribution - * Enhanced the Dictionary class diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/ChangeLog.md new/ldas-tools-al-2.6.7/ChangeLog.md --- old/ldas-tools-al-2.6.4/ChangeLog.md 1970-01-01 01:00:00.000000000 +0100 +++ new/ldas-tools-al-2.6.7/ChangeLog.md 2021-09-30 02:55:20.000000000 +0200 @@ -0,0 +1,56 @@ +# Release 2.6.7 - September 29, 2021 + - Many corrections to support building on RHEL 8 + +# Release 2.6.6 - August 13, 2021 + - Corrected Debian package resolution order for boost libaries (closes #107) + +# Release 2.6.5 - October 23, 2019 + - Minor changes for default compilers + +# Release 2.6.4 - October 23, 2019 + - Added cx_ldas_prog_cxx() configuration check to obtain C++ standard + flag for use in package config file. + +# Release 2.6.3 - August 14, 2019 + - Converted to CMake (Closes #22) + - Increased thread stack size to PTHREAD_STACK_MIN + 64k + - Reformatted comments in SOLoader.hh for Doxygen (Closes #69) + - Corrected Portfile to have proper description (Closes #55) + +# Release2.6.2 - December 6, 2018 + - Addressed packaging issues + +# Release2.6.1 - November 27, 2018 + - Added requirement of C++ 2011 standard + - Standardize source code format by using clang-format + - Removed check for type sizes as this now comes from stdint.h + - Removed LDASUnexpected as the interface is depricated as of C++ 2011 (fixes #43) + - Updated library versioning + - ldastoolsal - 7:0:0 + +# Release2.6.0 - June 19, 2018 + - Removed hand rolled smart pointers in favor of boost smart pointers + - Changed version of ldastoolsal library to 6:0:0 + +# Release2.5.6 - November 14, 2016 + - Corrected allocation of dirent_type (#4739) + +# Release2.5.2 - September 9, 2016 + - Added functions Interval and Timeout needed by new diskcache + +# Release2.5.1 - September 9, 2016 + - Added --disable-warnings-as-errors to allow compilation on systems + where warning messages have not yet been addressed + - Added conditional setting of DESTDIR in python.mk to prevent install + issues. + - Modified leap second table for gpstime for 2017 Jan 1 leap second. + +# Release2.5.0 - April 7, 2016 + - Official release of splitting LDASTools into separate source packages + +# Release2.4.99.1 - March 11, 2016 + - Corrections to spec files. + +# Release2.4.99.0 - March 3, 2016 + - Separated code into independant source distribution + - Enhanced the Dictionary class diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/NEWS new/ldas-tools-al-2.6.7/NEWS --- old/ldas-tools-al-2.6.4/NEWS 2019-10-23 23:19:10.000000000 +0200 +++ new/ldas-tools-al-2.6.7/NEWS 1970-01-01 01:00:00.000000000 +0100 @@ -1,83 +0,0 @@ -NEWS: -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Release 2.6.4 - October 23, 2019 - * Added cx_ldas_prog_cxx() configuration check to obtain C++ standard - flag for use in package config file. - -Release 2.6.3 - August 14, 2019 - * Converted to CMake (Closes #22) - * Increased thread stack size to PTHREAD_STACK_MIN + 64k - * Reformatted comments in SOLoader.hh for Doxygen (Closes #69) - * Corrected Portfile to have proper description (Closes #55) - -Release 2.6.2 - December 6, 2018 - * Addressed packaging issues - -Release 2.6.1 - November 27, 2018 - * Added requirement of C++ 2011 standard - * Standardize source code format by using clang-format - * Removed check for type sizes as this now comes from stdint.h - * Removed LDASUnexpected as the interface is depricated as of C++ 2011 (fixes #43) - * Updated library versioning - - ldastoolsal - 7:0:0 - -Release 2.6.0 - June 19, 2018 - * Removed hand rolled smart pointers in favor of boost smart pointers - * Changed version of ldastoolsal library to 6:0:0 - -Release 2.5.7 - October 25, 2017 - * Added method to read Timeout value of LDASTools::AL::Directory class - * Added TriStatePool class which allows for proper cleaning up of - tasks that have timed out. Currently only used by Directory - class (#5929). - * Replace readdir_r() with readdir() as readdir_r() has been - depricated. - * Removed dynamic throw specifications. - * Removed installation of unused exception library. - -Release 2.5.6 - November 14, 2016 - * Corrected allocation of dirent_type (#4739) - -Release 2.5.5 - October 22, 2016 - * Have this package be responsible for LDAStools/__init__.py file - -Release 2.5.4 - October 10, 2016 - * Corrections to how threads handle signals. - * Optimized registration of signal handler. - -Release 2.5.3 - September 26, 2016 - * Added ability to have verbose debugging of Threads class - -Release 2.5.2 - September 9, 2016 - * Added functions Interval and Timeout needed by new diskcache - -Release 2.5.1 - September 9, 2016 - * Added --disable-warnings-as-errors to allow compilation on systems - where warning messages have not yet been addressed - * Added conditional setting of DESTDIR in python.mk to prevent install - issues. - * Modified leap second table for gpstime for 2017 Jan 1 leap second. - -Release 2.5.0 - April 7, 2016 - Official release of splitting LDASTools into separate source packages - -Release 2.4.99.5 - March 24, 2016 - Modified postint to check for directory existance where applicable - Added missing build dependencies to spec file - -Release 2.4.99.4 - March 23, 2016 - Added postint and postrm files for Debian - Made building for packages verbose - -Release 2.4.99.3 - March 23, 2016 - Debian packaging fixes - -Release 2.4.99.2 - March 22, 2016 - Debian packaging fixes - -Release 2.4.99.1 - March 11, 2016 - RPM fixes - -Release 2.4.99.0 - March 3, 2016 - Split LDASTools Suite into separate source packages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/config/LocateLDASToolsCMake.cmake new/ldas-tools-al-2.6.7/config/LocateLDASToolsCMake.cmake --- old/ldas-tools-al-2.6.4/config/LocateLDASToolsCMake.cmake 2019-10-23 18:43:32.000000000 +0200 +++ new/ldas-tools-al-2.6.7/config/LocateLDASToolsCMake.cmake 1970-01-01 01:00:00.000000000 +0100 @@ -1,40 +0,0 @@ -include( GNUInstallDirs ) - -if ( CMAKE_PREFIX_PATH) - set( ENV{PKG_CONFIG_PATH} "${CMAKE_PREFIX_PATH}/${CMAKE_INSTALL_LIBDIR}/pkgconfig:$ENV{PKG_CONFIG_PATH}" ) -endif( ) -if ( PKG_CONFIG_PATH ) - set( ENV{PKG_CONFIG_PATH} "${PKG_CONFIG_PATH}:$ENV{PKG_CONFIG_PATH}" ) -endif ( PKG_CONFIG_PATH ) - -find_package(PkgConfig) - -if ( CM_MSG_DEBUG_VERBOSE ) - message( STATUS "+++ DEBUG +++ CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH} " ) - message( STATUS "+++ DEBUG +++ PKG_CONFIG_PATH: ${PKG_CONFIG_PATH} " ) - message( STATUS "+++ DEBUG +++ ENV{PKG_CONFIG_PATH}: $ENV{PKG_CONFIG_PATH} " ) -endif( ) - -pkg_check_modules(LTCMAKE REQUIRED ldastoolscmake>=${LDAS_TOOLS_CMAKE_VERSION}) - -if ( LTCMAKE_FOUND ) - set( ENV{PKG_CONFIG_PATH} "${LTCMAKE_PREFIX}/lib64/pkgconfig:${LTCMAKE_PREFIX}/lib/pkgconfig:$ENV{PKG_CONFIG_PATH}" ) -endif ( ) -execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=LDASTOOLS_CMAKE_MODULE_DIR ldastoolscmake - OUTPUT_VARIABLE _PATH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) -if ( _PATH ) - set( CMAKE_MODULE_PATH "${_PATH}" ${CMAKE_MODULE_PATH} CACHE STRING "Module search prefix" FORCE ) -endif( ) -message( STATUS "+++ DEBUG +++ CMAKE_MODULE_PATH: ${CMAKE_MODULE_PATH}" ) -execute_process( - COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=prefix ldastoolscmake - OUTPUT_VARIABLE _PATH - OUTPUT_STRIP_TRAILING_WHITESPACE) -if ( _PATH ) - set( CMAKE_PREFIX_PATH "${_PATH}" ${CMAKE_PREFIX_PATH} CACHE STRING "Search prefix" FORCE ) -endif( ) -message( STATUS "+++ DEBUG +++ CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}" ) - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/config/Portfile.in new/ldas-tools-al-2.6.7/config/Portfile.in --- old/ldas-tools-al-2.6.4/config/Portfile.in 2019-09-26 01:17:40.000000000 +0200 +++ new/ldas-tools-al-2.6.7/config/Portfile.in 2021-03-26 14:47:46.000000000 +0100 @@ -15,18 +15,23 @@ long_description @PROJECT_DESCRIPTION_LONG@ homepage @PACKAGE_URL@ -master_sites http://software.ligo.org/lscsoft/source/ +master_sites @LDAS_TOOLS_SOURCE_URL@ -checksums rmd160 @RMD160@ \ - sha256 @SHA256@ \ - size @SIZE@ - -depends_build port:pkgconfig \ - port:cmake \ - port:ldas-tools-cmake -depends_lib port:lib/libssl.dylib:openssl \ - port:zlib \ - port:bzip2 +checksums \ + rmd160 @RMD160@ \ + sha256 @SHA256@ \ + size @SIZE@ + +depends_build \ + port:cmake \ + port:pkgconfig \ + port:boost \ + port:ldas-tools-cmake + +depends_lib \ + port:lib/libssl.dylib:openssl \ + port:zlib \ + port:bzip2 configure.args -DCMAKE_INSTALL_FULL_SYSCONFDIR=${prefix}/etc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/config/control.in new/ldas-tools-al-2.6.7/config/control.in --- old/ldas-tools-al-2.6.4/config/control.in 2019-06-08 01:01:41.000000000 +0200 +++ new/ldas-tools-al-2.6.7/config/control.in 2021-03-26 14:47:46.000000000 +0100 @@ -13,15 +13,19 @@ time, gcc, g++, - libboost-dev, doxygen, graphviz, + libboost1.67-dev | libboost-dev, + libboost-filesystem1.67-dev | libboost-filesystem-dev, + libboost-program-options1.67-dev | libboost-program-options-dev, ldas-tools-cmake (>= @LDAS_TOOLS_CMAKE_VERSION@) Standards-Version: 3.8.6 Package: ldas-tools-al Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libboost-filesystem1.74.0 | libboost-filesystem1.71.0 | libboost-filesystem1.67.0, + libboost-program-options1.74.0 | libboost-program-options1.71.0 | libboost-program-options1.67.0, zlib1g Conflicts: ldas-tools-al, ldas-tools-general Replaces: ldas-tools-al, ldas-tools-general @@ -32,9 +36,11 @@ Architecture: any Depends: ${misc:Depends}, cmake, - libboost-dev, zlib1g-dev, libssl-dev, + libboost1.74-dev | libboost1.71-dev | libboost1.67-dev, + libboost-filesystem1.74-dev | libboost-filesystem1.71-dev | libboost-filesystem1.67-dev, + libboost-program-options1.74-dev | libboost-program-options1.71-dev | libboost-program-options1.67-dev, ldas-tools-cmake(>= @LDAS_TOOLS_CMAKE_VERSION@), ldas-tools-al (= ${binary:Version}) Provides: ldas-tools-al-dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/config/ldas-tools-al.spec new/ldas-tools-al-2.6.7/config/ldas-tools-al.spec --- old/ldas-tools-al-2.6.4/config/ldas-tools-al.spec 2019-10-24 15:32:42.000000000 +0200 +++ new/ldas-tools-al-2.6.7/config/ldas-tools-al.spec 2021-09-30 16:47:33.000000000 +0200 @@ -1,37 +1,45 @@ # -*- mode: RPM-SPEC; indent-tabs-mode: nil -*- %define name ldas-tools-al %define tarbasename %{name} +%define check_boost169 ( 0%{?rhel} && 0%{?rhel} <= 8 ) +%define check_cmake3 ( 0%{?rhel} && 0%{?rhel} <= 7 ) -%if %{?cmake3:1}%{!?cmake3:0} -%define __cmake %__cmake3 -%define cmake cmake3 -%define ctest ctest3 -%endif +#------------------------------------------------------------------------ +# OS configuration +#------------------------------------------------------------------------ Summary: LDAS tools abstraction toolkit Name: %{name} -Version: 2.6.4 +Version: 2.6.7 Release: 1%{?dist} License: GPLv2+ URL: "https://wiki.ligo.org/Computing/LDASTools"; Group: Application/Scientific BuildRoot: %{buildroot} -Source0: http://software.ligo.org/lscsoft/source/ldas-tools-al-%{version}.tar.gz +Source0: https://software.igwn.org/lscsoft/source/ldas-tools-al-%{version}.tar.gz Obsoletes: ldas-tools-general <= 2.6 +%if %{check_boost169} +Requires: boost169 >= 1.67 +%else +Requires: boost >= 1.67 +%endif Requires: openssl Requires: zlib BuildRequires: gcc, gcc-c++, glibc BuildRequires: gawk BuildRequires: make BuildRequires: rpm-build -Buildrequires: ldas-tools-cmake >= 1.1.1 -BuildRequires: boost-devel +Buildrequires: ldas-tools-cmake >= 1.2.3 +%if %{check_boost169} +BuildRequires: boost169-devel >= 1.67, boost169 >= 1.67 +%else +BuildRequires: boost-devel >= 1.67, boost >= 1.67 +%endif Buildrequires: openssl-devel Buildrequires: pkgconfig Buildrequires: zlib-devel -%if 0%{?rhl} <= 7 || 0%{?sl7} <= 7 -BuildRequires: cmake3 >= 3.6 -BuildRequires: cmake +%if %{check_cmake3} +BuildRequires: cmake3 >= 3.6, cmake %else BuildRequires: cmake >= 3.6 %endif @@ -45,8 +53,12 @@ Obsoletes: ldas-tools-general-devel <= 2.6 Group: Development/Scientific Summary: LDAS tools abstraction toolkit development files -Requires: ldas-tools-al = 2.6.4 -Requires: boost-devel +Requires: ldas-tools-al = 2.6.7 +%if %{check_boost169} +Requires: boost169-devel >= 1.67, boost169 >= 1.67 +%else +Requires: boost-devel >= 1.67, boost >= 1.67 +%endif %description devel This provides the develpement files the abstraction library. %prep @@ -62,10 +74,21 @@ #------------------------------------------------------------------------ export PKG_CONFIG_PATH="${LDASTOOLSDEV_PKG_CONFIG_PATH:-}${LDASTOOLSDEV_PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" -%cmake \ +%if %{check_boost169} +export BOOST_CONFIGURE_OPTIONS="-DBoost_NO_SYSTEM_PATHS=True -DBOOST_INCLUDEDIR=%{_includedir}/boost169 -DBOOST_LIBRARYDIR=%{_libdir}/boost169" +%endif +%if %{check_cmake3} +export CMAKE_PROGRAM=cmake3 +%else +export CMAKE_PROGRAM=cmake +%endif + +${CMAKE_PROGRAM} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ -DCMAKE_INSTALL_DOCDIR=%{_docdir} \ + ${BOOST_CONFIGURE_OPTIONS} \ %{tarbasename}-%{version} make VERBOSE=1 %{?_smp_mflags} @@ -107,6 +130,15 @@ %{_docdir} %changelog +* Wed Sep 29 2021 Edward Maros <[email protected]> - 2.6.7-1 +- Built for new release + +* Fri Aug 13 2021 Edward Maros <[email protected]> - 2.6.6-1 +- Built for new release + +* Tue Mar 9 2021 Edward Maros <[email protected]> - 2.6.5-1 +- Built for new release + * Wed Oct 23 2019 Edward Maros <[email protected]> - 2.6.4-1 - Built for new release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/config/ldas-tools-al.spec.in new/ldas-tools-al-2.6.7/config/ldas-tools-al.spec.in --- old/ldas-tools-al-2.6.4/config/ldas-tools-al.spec.in 2019-10-23 23:19:10.000000000 +0200 +++ new/ldas-tools-al-2.6.7/config/ldas-tools-al.spec.in 2021-09-30 02:55:20.000000000 +0200 @@ -1,12 +1,12 @@ # -*- mode: RPM-SPEC; indent-tabs-mode: nil -*- %define name @PROJECT_NAME@ %define tarbasename %{name} +%define check_boost169 ( 0%{?rhel} && 0%{?rhel} <= 8 ) +%define check_cmake3 ( 0%{?rhel} && 0%{?rhel} <= 7 ) -%if %{?cmake3:1}%{!?cmake3:0} -%define __cmake %__cmake3 -%define cmake cmake3 -%define ctest ctest3 -%endif +#------------------------------------------------------------------------ +# OS configuration +#------------------------------------------------------------------------ Summary: LDAS tools abstraction toolkit Name: %{name} @@ -16,8 +16,13 @@ URL: @PACKAGE_URL@ Group: Application/Scientific BuildRoot: %{buildroot} -Source0: http://software.ligo.org/lscsoft/source/ldas-tools-al-%{version}.tar.gz +Source0: @LDAS_TOOLS_SOURCE_URL@/ldas-tools-al-%{version}.tar.gz Obsoletes: ldas-tools-general <= 2.6 +%if %{check_boost169} +Requires: boost169 >= @BOOST_MINIMUM_VERSION@ +%else +Requires: boost >= @BOOST_MINIMUM_VERSION@ +%endif Requires: openssl Requires: zlib BuildRequires: gcc, gcc-c++, glibc @@ -25,13 +30,16 @@ BuildRequires: make BuildRequires: rpm-build Buildrequires: ldas-tools-cmake >= @LDAS_TOOLS_CMAKE_VERSION@ -BuildRequires: boost-devel +%if %{check_boost169} +BuildRequires: boost169-devel >= @BOOST_MINIMUM_VERSION@, boost169 >= @BOOST_MINIMUM_VERSION@ +%else +BuildRequires: boost-devel >= @BOOST_MINIMUM_VERSION@, boost >= @BOOST_MINIMUM_VERSION@ +%endif Buildrequires: openssl-devel Buildrequires: pkgconfig Buildrequires: zlib-devel -%if 0%{?rhl} <= 7 || 0%{?sl7} <= 7 -BuildRequires: cmake3 >= 3.6 -BuildRequires: cmake +%if %{check_cmake3} +BuildRequires: cmake3 >= 3.6, cmake %else BuildRequires: cmake >= 3.6 %endif @@ -46,7 +54,11 @@ Group: Development/Scientific Summary: LDAS tools abstraction toolkit development files Requires: ldas-tools-al = @PROJECT_VERSION@ -Requires: boost-devel +%if %{check_boost169} +Requires: boost169-devel >= @BOOST_MINIMUM_VERSION@, boost169 >= @BOOST_MINIMUM_VERSION@ +%else +Requires: boost-devel >= @BOOST_MINIMUM_VERSION@, boost >= @BOOST_MINIMUM_VERSION@ +%endif %description devel This provides the develpement files the abstraction library. %prep @@ -62,10 +74,21 @@ #------------------------------------------------------------------------ export PKG_CONFIG_PATH="${LDASTOOLSDEV_PKG_CONFIG_PATH:-}${LDASTOOLSDEV_PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" -%cmake \ +%if %{check_boost169} +export BOOST_CONFIGURE_OPTIONS="-DBoost_NO_SYSTEM_PATHS=True -DBOOST_INCLUDEDIR=%{_includedir}/boost169 -DBOOST_LIBRARYDIR=%{_libdir}/boost169" +%endif +%if %{check_cmake3} +export CMAKE_PROGRAM=cmake3 +%else +export CMAKE_PROGRAM=cmake +%endif + +${CMAKE_PROGRAM} \ -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ + -DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DCMAKE_EXPORT_COMPILE_COMMANDS=1 \ -DCMAKE_INSTALL_DOCDIR=%{_docdir} \ + ${BOOST_CONFIGURE_OPTIONS} \ %{tarbasename}-%{version} make VERBOSE=1 %{?_smp_mflags} @@ -107,6 +130,15 @@ %{_docdir} %changelog +* Wed Sep 29 2021 Edward Maros <[email protected]> - 2.6.7-1 +- Built for new release + +* Fri Aug 13 2021 Edward Maros <[email protected]> - 2.6.6-1 +- Built for new release + +* Tue Mar 9 2021 Edward Maros <[email protected]> - 2.6.5-1 +- Built for new release + * Wed Oct 23 2019 Edward Maros <[email protected]> - 2.6.4-1 - Built for new release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/debian/changelog new/ldas-tools-al-2.6.7/debian/changelog --- old/ldas-tools-al-2.6.4/debian/changelog 2019-10-23 23:19:10.000000000 +0200 +++ new/ldas-tools-al-2.6.7/debian/changelog 2021-09-30 02:55:20.000000000 +0200 @@ -1,3 +1,21 @@ +ldas-tools-al (2.6.7-1) unstable; urgency=low + + * Built for new release + + -- Edward Maros <[email protected]> Wed, 29 Sep 2021 13:50:37 -0700 + +ldas-tools-al (2.6.6-1) unstable; urgency=low + + * Built for new release + + -- Edward Maros <[email protected]> Fri, 13 Aug 2021 07:40:19 -0700 + +ldas-tools-al (2.6.5-1) unstable; urgency=low + + * Built for new release + + -- Edward Maros <[email protected]> Tue, 09 Mar 2021 17:04:45 -0800 + ldas-tools-al (2.6.4-1) unstable; urgency=low * Built for new release diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/debian/control new/ldas-tools-al-2.6.7/debian/control --- old/ldas-tools-al-2.6.4/debian/control 2019-10-24 15:32:42.000000000 +0200 +++ new/ldas-tools-al-2.6.7/debian/control 2021-09-30 16:47:34.000000000 +0200 @@ -13,15 +13,19 @@ time, gcc, g++, - libboost-dev, doxygen, graphviz, - ldas-tools-cmake (>= 1.1.1) + libboost1.67-dev | libboost-dev, + libboost-filesystem1.67-dev | libboost-filesystem-dev, + libboost-program-options1.67-dev | libboost-program-options-dev, + ldas-tools-cmake (>= 1.2.3) Standards-Version: 3.8.6 Package: ldas-tools-al Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, + libboost-filesystem1.74.0 | libboost-filesystem1.71.0 | libboost-filesystem1.67.0, + libboost-program-options1.74.0 | libboost-program-options1.71.0 | libboost-program-options1.67.0, zlib1g Conflicts: ldas-tools-al, ldas-tools-general Replaces: ldas-tools-al, ldas-tools-general @@ -32,10 +36,12 @@ Architecture: any Depends: ${misc:Depends}, cmake, - libboost-dev, zlib1g-dev, libssl-dev, - ldas-tools-cmake(>= 1.1.1), + libboost1.74-dev | libboost1.71-dev | libboost1.67-dev, + libboost-filesystem1.74-dev | libboost-filesystem1.71-dev | libboost-filesystem1.67-dev, + libboost-program-options1.74-dev | libboost-program-options1.71-dev | libboost-program-options1.67-dev, + ldas-tools-cmake(>= 1.2.3), ldas-tools-al (= ${binary:Version}) Provides: ldas-tools-al-dev Conflicts: ldas-tools-al-dev, ldas-tools-general-dev diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/debian/copyright new/ldas-tools-al-2.6.7/debian/copyright --- old/ldas-tools-al-2.6.4/debian/copyright 2018-05-18 23:11:08.000000000 +0200 +++ new/ldas-tools-al-2.6.7/debian/copyright 2021-03-26 14:47:46.000000000 +0100 @@ -1,7 +1,7 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: LDASTools Upstream-Contact: Edward Maros <[email protected]> -Upstream-Source: https://software.ligo.org/lscsoft/source +Upstream-Source: https://software.igwn.org/lscsoft/source License: GPL-2+ This program is free software; you can redistribute it diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/debian/rules new/ldas-tools-al-2.6.7/debian/rules --- old/ldas-tools-al-2.6.4/debian/rules 2019-10-24 15:32:42.000000000 +0200 +++ new/ldas-tools-al-2.6.7/debian/rules 2021-09-30 16:47:34.000000000 +0200 @@ -5,6 +5,6 @@ override_dh_auto_configure: dh_auto_configure --buildsystem=cmake -- \ - -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/ldas/ldas-tools-al-2.6.4 \ + -DCMAKE_INSTALL_DOCDIR=/usr/share/doc/ldas/ldas-tools-al-2.6.7 \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DCMAKE_EXPORT_COMPILE_COMMANDS=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/src/CMakeLists.txt new/ldas-tools-al-2.6.7/src/CMakeLists.txt --- old/ldas-tools-al-2.6.4/src/CMakeLists.txt 2019-09-26 01:17:40.000000000 +0200 +++ new/ldas-tools-al-2.6.7/src/CMakeLists.txt 2021-03-26 14:47:46.000000000 +0100 @@ -55,10 +55,11 @@ ## Removed LDASUnexpected class ## 7:1:0 - 2019.08.14 ( ldas-tools-al-2.6.3 ) ## Minor patching +## 7:2:0 - 2021.03.09 ( ldas-tools-al-2.6.5 ) ##------------------------------------------------------------------------ set( libldastoolsal_la_CURRENT 7 ) -set( libldastoolsal_la_REVISION 1 ) +set( libldastoolsal_la_REVISION 2 ) set( libldastoolsal_la_AGE 0 ) #lib_LTLIBRARIES = libldastoolsal.la diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/src/Exec.hh new/ldas-tools-al-2.6.7/src/Exec.hh --- old/ldas-tools-al-2.6.4/src/Exec.hh 2018-10-22 22:43:13.000000000 +0200 +++ new/ldas-tools-al-2.6.7/src/Exec.hh 2021-03-26 14:47:46.000000000 +0100 @@ -53,11 +53,11 @@ bool IfExited( ) const; - bool CoreDump( ); + bool CoreDump( ) const; - int ExitCode( ); + int ExitCode( ) const; - int Signal( ); + int Signal( ) const; virtual void Spawn( ); @@ -103,13 +103,13 @@ } inline bool - Exec::CoreDump( ) + Exec::CoreDump( ) const { return m_child_exit.s_core_dump; } inline int - Exec::ExitCode( ) + Exec::ExitCode( ) const { return m_child_exit.s_exit_code; } @@ -121,7 +121,7 @@ } inline int - Exec::Signal( ) + Exec::Signal( ) const { return m_child_exit.s_signal; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/src/PSInfo.cc new/ldas-tools-al-2.6.7/src/PSInfo.cc --- old/ldas-tools-al-2.6.4/src/PSInfo.cc 2018-10-22 22:43:13.000000000 +0200 +++ new/ldas-tools-al-2.6.7/src/PSInfo.cc 2021-03-26 14:47:46.000000000 +0100 @@ -112,7 +112,7 @@ //------------------------------------------------------------------- // Obtain the current time //------------------------------------------------------------------- - gettimeofday( &now, (void*)NULL ); + gettimeofday( &now, NULL ); //------------------------------------------------------------------- // Translate user id to user name //------------------------------------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/src/ReadWriteLock.cc new/ldas-tools-al-2.6.7/src/ReadWriteLock.cc --- old/ldas-tools-al-2.6.4/src/ReadWriteLock.cc 2018-10-22 22:43:13.000000000 +0200 +++ new/ldas-tools-al-2.6.7/src/ReadWriteLock.cc 2021-03-26 14:47:46.000000000 +0100 @@ -151,7 +151,7 @@ { struct timeval tv; - gettimeofday( &tv, (void*)NULL ); + gettimeofday( &tv, NULL ); timeout.tv_sec = tv.tv_sec; timeout.tv_nsec = tv.tv_usec * 1000; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/ldas-tools-al-2.6.4/src/ReadWriteLockBaton.cc new/ldas-tools-al-2.6.7/src/ReadWriteLockBaton.cc --- old/ldas-tools-al-2.6.4/src/ReadWriteLockBaton.cc 2018-10-22 22:43:13.000000000 +0200 +++ new/ldas-tools-al-2.6.7/src/ReadWriteLockBaton.cc 2021-03-26 14:47:46.000000000 +0100 @@ -103,7 +103,7 @@ { struct timeval tv; - gettimeofday( &tv, (void*)NULL ); + gettimeofday( &tv, NULL ); Now.tv_sec = tv.tv_sec; Now.tv_nsec = tv.tv_usec * 1000;
