Hello community, here is the log from the commit of package octave-forge-lssa for openSUSE:Factory checked in at 2020-10-26 16:19:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/octave-forge-lssa (Old) and /work/SRC/openSUSE:Factory/.octave-forge-lssa.new.3463 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "octave-forge-lssa" Mon Oct 26 16:19:26 2020 rev:6 rq:843792 version:0.1.4 Changes: -------- --- /work/SRC/openSUSE:Factory/octave-forge-lssa/octave-forge-lssa.changes 2019-11-27 16:05:10.533113206 +0100 +++ /work/SRC/openSUSE:Factory/.octave-forge-lssa.new.3463/octave-forge-lssa.changes 2020-10-26 16:19:53.547107855 +0100 @@ -1,0 +2,6 @@ +Fri Oct 23 15:44:49 UTC 2020 - Stefan BrĂ¼ns <stefan.bru...@rwth-aachen.de> + +- Update to version 0.1.4: + * Code updates to support install in Octave 6.0 + +------------------------------------------------------------------- Old: ---- lssa-0.1.3.tar.gz New: ---- lssa-0.1.4.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ octave-forge-lssa.spec ++++++ --- /var/tmp/diff_new_pack.kbPaaS/_old 2020-10-26 16:19:54.147108338 +0100 +++ /var/tmp/diff_new_pack.kbPaaS/_new 2020-10-26 16:19:54.151108341 +0100 @@ -1,7 +1,7 @@ # # spec file for package octave-forge-lssa # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,12 +18,12 @@ %define octpkg lssa Name: octave-forge-%{octpkg} -Version: 0.1.3 +Version: 0.1.4 Release: 0 Summary: Least squares spectral analysis for Octave License: GPL-3.0-or-later Group: Productivity/Scientific/Math -URL: https://octave.sourceforge.io +URL: https://octave.sourceforge.io/%{octpkg}/ Source0: https://downloads.sourceforge.net/octave/%{octpkg}-%{version}.tar.gz BuildRequires: gcc-c++ BuildRequires: octave-devel @@ -55,7 +55,6 @@ %octave --eval "pkg rebuild" %files -%defattr(-,root,root) %{octpackages_dir}/%{octpkg}-%{version} %{octlib_dir}/%{octpkg}-%{version} ++++++ lssa-0.1.3.tar.gz -> lssa-0.1.4.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lssa-0.1.3/DESCRIPTION new/lssa-0.1.4/DESCRIPTION --- old/lssa-0.1.3/DESCRIPTION 2018-07-26 23:34:55.841567636 +0200 +++ new/lssa-0.1.4/DESCRIPTION 2020-10-19 03:28:54.000000000 +0200 @@ -1,6 +1,6 @@ Name: lssa -Version: 0.1.3 -Date: 2018-07-23 +Version: 0.1.4 +Date: 2020-10-18 Author: Ben Lewis <ben...@gmail.com> Maintainer: Ben Lewis <ben...@gmail.com>, John Donoghue <john.donog...@ieee.org> Title: Least squares spectral analysis @@ -8,7 +8,8 @@ irregularly-spaced time series. Currently includes functions based off the Lomb-Scargle periodogram and Adolf Mathias' implementation for R and C (see URLs). -Url: http://www.jstatsoft.org/v11/i02 +Url: https://octave.sourceforge.io/lssa/ +Url2: http://www.jstatsoft.org/v11/i02 Problems: fast implementations, wavelet functions are currently not functional. Depends: octave (>= 3.6.0) Autoload: no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lssa-0.1.3/Makefile new/lssa-0.1.4/Makefile --- old/lssa-0.1.3/Makefile 2018-07-26 23:34:55.841567636 +0200 +++ new/lssa-0.1.4/Makefile 2020-10-19 03:28:54.000000000 +0200 @@ -52,11 +52,19 @@ vcs := $(if $(wildcard .hg),hg,$(if $(wildcard .git),git,unknown)) ifeq ($(vcs),hg) release_dir_dep := .hg/dirstate +HG := hg +HG_CMD = $(HG) --config alias.$(1)=$(1) --config defaults.$(1)= $(1) +HG_ID := $(shell $(call HG_CMD,identify) --id | sed -e 's/+//' ) +REPO_TIMESTAMP := $(firstword $(shell $(call HG_CMD,log) --rev $(HG_ID) --template '{date|hgdate}')) endif ifeq ($(vcs),git) release_dir_dep := .git/index +GIT := git +REPO_TIMESTAMP := $(firstword $(shell $(GIT) log -n1 --date=unix --format="%ad")) endif +TAR_REPRODUCIBLE_OPTIONS := --sort=name --mtime="@$(REPO_TIMESTAMP)" --owner=0 --group=0 --numeric-owner +TAR_OPTIONS := --format=ustar $(TAR_REPRODUCIBLE_OPTIONS) ## .PHONY indicates targets that are not filenames ## (https://www.gnu.org/software/make/manual/html_node/Phony-Targets.html) @@ -95,7 +103,7 @@ ## An implicit rule with a recipe to build the tarballs correctly. %.tar.gz: % - $(TAR) -c -f - --posix -C "$(target_dir)/" "$(notdir $<)" | gzip -9n > "$@" + $(TAR) -cf - $(TAR_OPTIONS) -C "$(target_dir)/" "$(notdir $<)" | gzip -9n > "$@" clean-tarballs: @echo "## Cleaning release tarballs (package + html)..." @@ -208,15 +216,14 @@ ## https://octave.sourceforge.io/doctest/index.html doctest: $(install_stamp) $(run_in_place) --eval 'pkg load doctest;' \ - --eval "targets = '$(shell (ls inst; ls src | $(GREP) .oct) | $(CUT) -f2 -d@ | $(CUT) -f1 -d.)';" \ - --eval "targets = strsplit (targets, ' '); doctest (targets);" + --eval "targets = pkg('list', '$(package)'){1}.dir;" \ + --eval "doctest (targets);" ## Test package. octave_test_commands = \ ' pkgs = pkg("list", "$(package)"); \ - cd ("$(target_dir)/"); \ - dirs = {sprintf(".installation/%s-%s", pkgs{1}.name, pkgs{1}.version)}; \ + dirs = {pkgs{1}.dir}; \ __run_test_suite__ (dirs, {}); ' ## the following works, too, but provides no overall summary output as diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lssa-0.1.3/NEWS new/lssa-0.1.4/NEWS --- old/lssa-0.1.3/NEWS 2018-07-26 23:34:55.845567600 +0200 +++ new/lssa-0.1.4/NEWS 2020-10-19 03:28:54.000000000 +0200 @@ -1,3 +1,7 @@ +Summary of changes in lssa 0.1.4: + + ** Code updates to support install in Octave 6.0 + Summary of changes in lssa 0.1.3: ** Mark fastlscomplex BIT as a known failure (Bug #53963) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lssa-0.1.3/src/fastlscomplex.cc new/lssa-0.1.4/src/fastlscomplex.cc --- old/lssa-0.1.3/src/fastlscomplex.cc 2018-07-26 23:34:55.853567529 +0200 +++ new/lssa-0.1.4/src/fastlscomplex.cc 2020-10-19 03:28:54.000000000 +0200 @@ -1,5 +1,5 @@ /* Copyright (C) 2012 Benjamin Lewis <ben...@gmail.com> - * Copyright (C) 2016-2018 John Donoghue <john.donoghue.ieee.org> + * Copyright (C) 2016-2020 John Donoghue <john.donoghue.ieee.org> * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -51,6 +51,16 @@ if (args.length() != 5) print_usage(); + else if (!args(0).is_matrix_type() || args(0).rows() != 1) + { + error ("fastlscomplex: expected times to be a row vector"); + return retval; + } + else if (!args(1).is_matrix_type() || args(1).rows() != 1) + { + error ("fastlscomplex: expected magnitude to be a row vector"); + return retval; + } else { @@ -61,26 +71,41 @@ int ncoeff = args(4).int_value (); if (tvals.numel () != xvals.numel ()) - if (tvals.numel () > xvals.numel ()) - error ("fastlscomplex: More time values than magnitude values"); - else - error ("fastlscomplex: More magnitude values than time values"); + { + if (tvals.numel () > xvals.numel ()) + { + error ("fastlscomplex: More time values than magnitude values"); + return retval; + } + else + { + error ("fastlscomplex: More magnitude values than time values"); + return retval; + } + } if (ncoeff == 0) - error ("fastlscomplex: No coefficients to compute"); + { + error ("fastlscomplex: No coefficients to compute"); + return retval; + } if (noctaves == 0) - error ("fastlscomplex: No octaves to compute over"); + { + error ("fastlscomplex: No octaves to compute over"); + return retval; + } if (omegamax == 0) - error ("fastlscomplex: No difference between minimal and maximal frequency"); - - if (! error_state) { - ComplexRowVector results; - if (flscomplex (tvals, xvals, omegamax, noctaves, ncoeff, results)) - retval(0) = octave_value (results); - else - error ("fastlscomplex: error in the underlying flscomplex function"); + error ("fastlscomplex: No difference between minimal and maximal frequency"); + return retval; } + ComplexRowVector results; + if (flscomplex (tvals, xvals, omegamax, noctaves, ncoeff, results)) + retval(0) = octave_value (results); + else + { + error ("fastlscomplex: error in the underlying flscomplex function"); + } } return retval;