Accepting request 1208052 from science

OBS-URL: https://build.opensuse.org/request/show/1208052
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/dynare?expand=0&rev=9

_service

@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<services>
+  <service name="obs_scm" mode="manual">
+		<param name="url">https://git.dynare.org/Dynare/dynare</param>
+    <param name="scm">git</param>
+    <param name="versionformat">@PARENT_TAG@</param>
+    <param name="revision">6.2</param>
+    <param name="filename">dynare</param>
+    <param name="submodules">enable</param>
+  </service>
+  <service name="tar" mode="buildtime"/>
+  <service name="recompress" mode="buildtime">
+    <param name="file">*.tar</param>
+    <param name="compression">zstd</param>
+  </service>
+  <service name="set_version" mode="buildtime"/>
+</services>

dynare-5.5.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:11deae32997e79e500a9802c6408067749485ea7ef3c08bbf24141f2b0e00326
-size 17924820

dynare-6.2.obscpio

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f54308db85c4e8b2b6175da36090b6bcd7737f44ba5d0bd9081b5d9b9d40ce2
+size 61428750

dynare-libdir.patch

@@ -0,0 +1,62 @@
+---
+ meson.build |   14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+Index: dynare-6.1/meson.build
+===================================================================
+--- dynare-6.1.orig/meson.build
++++ dynare-6.1/meson.build
+@@ -36,19 +36,19 @@ subdir('preprocessor/src')
+ # NB: the following two symlinks my be improved if this wishlist item is done:
+ #  https://github.com/mesonbuild/meson/issues/11519
+ 
+-install_symlink('dynare-preprocessor', install_dir : 'lib/dynare/preprocessor/',
++install_symlink('dynare-preprocessor', install_dir : get_option('libdir') / 'dynare/preprocessor/',
+                 pointing_to : '../../../bin/dynare-preprocessor'
+                               + (host_machine.system() == 'windows' ? '.exe' : ''))
+ 
+ # Compatibility symlink
+ install_symlink('dynare_m' + (host_machine.system() == 'windows' ? '.exe' : ''),
+-                install_dir : 'lib/dynare/matlab/preprocessor64',
++                install_dir : get_option('libdir') / 'dynare/matlab/preprocessor64',
+                 pointing_to : '../../../../bin/dynare-preprocessor'
+                               + (host_machine.system() == 'windows' ? '.exe' : ''))
+ 
+ ### M files
+ 
+-install_subdir('matlab', install_dir : 'lib/dynare',
++install_subdir('matlab', install_dir : get_option('libdir') / 'dynare',
+                exclude_files : [ 'utilities/tests/.git' ,
+                                  'utilities/tests/.gitignore',
+                                  'dseries/.git',
+@@ -63,10 +63,10 @@ custom_target(output : 'dynare_version.m
+               command : [ sed_exe, 's/@PACKAGE_VERSION@/' + meson.project_version() + '/', '@INPUT@' ],
+               capture : true,
+               install : true,
+-              install_dir : 'lib/dynare/matlab')
++              install_dir : get_option('libdir') / 'dynare/matlab')
+ 
+ install_subdir('contrib/ms-sbvar/TZcode/MatlabFiles',
+-               install_dir : 'lib/dynare/contrib/ms-sbvar/TZcode')
++               install_dir : get_option('libdir') / 'dynare/contrib/ms-sbvar/TZcode')
+ 
+ ### MEX files
+ 
+@@ -160,7 +160,7 @@ if get_option('build_for') == 'matlab'
+                  'link_args' : [ export_link_arg, '-L' + (matlab_path / 'bin' / matlab_arch), '-lmx', '-lmex', '-lmat' ],
+                  'link_depends' : export_file,
+                  'install' : true,
+-                 'install_dir' : 'lib/dynare/mex/matlab' }
++                 'install_dir' : get_option('libdir') / 'dynare/mex/matlab' }
+ 
+   # For unit tests
+   exe_rpath = matlab_path / 'bin' / matlab_arch
+@@ -249,7 +249,7 @@ else # Octave build
+                  'c_args' : octave_incflags + octave_defs,
+                  'link_args' : octave_link_args,
+                  'install' : true,
+-                 'install_dir' : 'lib/dynare/mex/octave' }
++                 'install_dir' : get_option('libdir') / 'dynare/mex/octave' }
+ 
+   if octave_version.version_compare('>=' + octave_minimal_version_for_interleaved_api)
+     # Mimic the behaviour of mkoctfile which compiles in a similar source file

dynare-no-return-in-non-void-function.patch

@@ -1,12 +0,0 @@
-Index: dynare-5.0/contrib/ms-sbvar/switch_dw/switching/dw_switch.c
-===================================================================
---- dynare-5.0.orig/contrib/ms-sbvar/switch_dw/switching/dw_switch.c
-+++ dynare-5.0/contrib/ms-sbvar/switch_dw/switching/dw_switch.c
-@@ -2055,6 +2055,7 @@ TVector ProbabilitiesState(TVector p, in
- PRECISION LogProbabilityStates(int *S, TStateModel *model)
- {
-   printf("LogProbabilityStates() not implemented\n");
-+  return 0;
-   dw_exit(0);
- 
- /**

dynare-sphinx-str-concat.patch

@@ -0,0 +1,17 @@
+---
+ doc/manual/utils/dynare_dom.py |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: dynare-6.2/doc/manual/utils/dynare_dom.py
+===================================================================
+--- dynare-6.2.orig/doc/manual/utils/dynare_dom.py
++++ dynare-6.2/doc/manual/utils/dynare_dom.py
+@@ -97,7 +97,7 @@ class DynObject(ObjectDescription):
+                 self.state_machine.reporter.warning(
+                     'duplicate object description of %s, ' % fullname +
+                     'other instance in ' +
+-                    self.env.doc2path(objects[fullname][0]),line=self.lineno)
++                    str(self.env.doc2path(objects[fullname][0])),line=self.lineno)
+             objects[fullname] = (self.env.docname, self.objtype)
+ 
+         indextext = self.get_index_text(fullname,name_obj)

dynare.changes

@@ -1,3 +1,117 @@
+-------------------------------------------------------------------
+Sun Oct 13 15:22:00 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 6.2:
+  * Compatibility: Compatible with octave 9.2.0.
+  * Bugs fixed:
+    - The mixed complementarity problem (MCP) solver could fail or
+      give wrong results in some cases where there were multiple
+      complementarity conditions
+    - The qmc_sequence MEX file from the macOS package would fail
+      to load
+    - OccBin forecasts would crash in case of shocks with zero
+      variance
+    - OccBin smoother would crash if simulation did not converge
+    - Computation of posterior moments could crash in large models
+    - The auxiliary particle filter and the Liu & West online
+      filter (mode_compute=11) required the Statistics Toolbox
+    - The auxiliary particle filter and the Liu & West online
+      filter (mode_compute=11) would not work with the
+      discretionary_policy command
+    - The discretionary_policy command would crash if there were
+      fewer than two exogenous variables
+    - Using the forecast command with a model solved at order>1
+      without varexo_det would return forecasts based on a first
+      order approximation instead of providing an error message
+    - Using the forecast command with a model solved at order=2
+      with varexo_det and pruning would return forecasts without
+      pruning instead of providing an error message
+    - Using the forecast command with a model solved at order=3
+      would crash SMC methods could return wrong posterior results
+      if the Parallel Toolbox was installed
+    - The Herbst-Schorfheide SMC sampler would crash at order>1
+    - Annualized shock decomposition would not output results if
+      desired vintage date did not coincide to an end-of-the-year
+      Q4 period
+    - Using rand_multivariate_student as the proposal density in
+      the tailored_random_block_metropolis_hastings posterior
+      sampler would return wrong results
+    - The onlyclearglobals of the dynare command was not working
+      as intended
+    - The det_cond_forecast command would crash with plans
+      including only expected shocks
+    - Estimation could crash in some rare cases when computing the
+      2nd order moments of prior or posterior distribution
+    - Successive calls of the Herbst-Schorfheide SMC sampler could
+      crash due to some stale files being left on disk
+    - The shock decomposition plot could be wrong in the presence
+      of leads/lags on exogenous variables, or when the steady
+      state is squeezed
+- Add dynare-sphinx-str-concat.patch: Fix path to string
+  concatenation when building sphinx documentation.
+
+-------------------------------------------------------------------
+Wed Aug  7 11:32:38 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 6.1:
+  * Identification: simulated moments were triggered instead of
+    theoretical ones
+  * Variance decompositions would crash with measurement errors
+    when zero variance shocks were present
+  * The handling of Lagrange multipliers in the display of
+    problems with the Jacobian was wrong
+  * The option auxname was missing in the documentation of the
+    pac_model command
+  * PAC equation estimation/simulation was crashing in the case of
+    composite target
+  * The PAC equation estimation would crash if the PAC target was
+    a transformed variable
+  * The perfect_foresight_with_expectation_errors_solver command
+    could return incorrect results when used in conjunction with
+    homotopy_linearization_fallback or
+    homotopy_marginal_linearization_fallback options
+  * For scalar values, the description of the horizon option of
+    the var_expectation_model command was incorrect
+  * The steady state computation with the bytecode option in a
+    Ramsey model was broken
+  * OccBin: the piecewise Kalman filter would crash in case of a
+    periodic solution
+  * The heteroskedastic_filter option of the estimation command
+    would cause a crash if there was only one shock
+  * The method_of_moments command would crash during the J-test
+    for just and underidentified models
+  * User-defined warning settings were internally overwritten with
+    the method_of_moments command or the piecewise Kalman filter
+  * The SMC sampler would crash if any of the bayesian_irf,
+    moments_varendo, or smoother options of the estimation command
+    had been specified
+  * The bvar_irf command would ignore the SquareRoot option and
+    instead employ a Cholesky decomposition
+  * The univariate Kalman filter erroneously treated observations
+    with negative prediction variances due to numerical issues as
+    missing values instead of discarding the parameter draw
+  * A new homotopy_exclude_varexo option to the
+    perfect_foresight_solver command has been added, to exclude
+    some exogenous variables from the homotopy procedure (i.e. to
+    keep them at their value corresponding to 100% of the shock
+    during all homotopy iterations).
+- Add _service file to allow inclusion of submodules in source
+  tarball.
+- Switch to meson based build.
+- Add dynare-libdir.patch: Use meson detected system libdir
+  instead of hard-coded 'lib'.
+- New dependency: slicot-devel-static.
+
+-------------------------------------------------------------------
+Fri Feb  2 20:39:35 UTC 2024 - Atri Bhattacharya <badshah400@gmail.com>
+
+- Update to version 6.0:
+  * Long list of changes, see NEWS.md file in %{_docdir}/dynare/
+    or online at
+    https://git.dynare.org/Dynare/dynare/-/blob/6.0/NEWS.md.
+- Drop dynare-no-return-in-non-void-function.patch: fixed
+  upstream.
+
 -------------------------------------------------------------------
 Wed Nov 22 11:54:45 UTC 2023 - Atri Bhattacharya <badshah400@gmail.com>
 

dynare.obsinfo

@@ -0,0 +1,4 @@
+name: dynare
+version: 6.2
+mtime: 1727272351
+commit: 02ecd0dae70945cc878d955bfa1fd4e14139c1ee

dynare.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package dynare
 #
-# Copyright (c) 2023 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
@@ -17,33 +17,38 @@
 
 
 %if 0%{?suse_version} < 1550
-# GCC 9 or higher required
-%define gccver 9
+# GCC 10 or higher required
+%define gccver 10
 # Sphinx in Leap 15.x is too old
 %bcond_with doc
 %else
 %bcond_without doc
 %endif
 Name:           dynare
-Version:        5.5
+Version:        6.2
 Release:        0
 Summary:        A platform for handling a wide class of economic models
 License:        GPL-3.0-or-later
 URL:            https://www.dynare.org/
-Source:         https://www.dynare.org/release/source/%{name}-%{version}.tar.xz
-# PATCH-FIX-UPSTREAM dynare-no-return-in-non-void-function.patch badshah400@gmail.com -- Return trivial value from a function that is not declared as returning void
-Patch0:         dynare-no-return-in-non-void-function.patch
+Source:         %{name}-%{version}.tar.zst
+# PATCH-FIX-UPSTREAM dynare-libdir.patch badshah400@gmail.com -- Use correct libdir instead of 'lib'
+Patch0:         dynare-libdir.patch
+# PATCH-FIX-UPSTREAM dynare-sphinx-str-concat.patch badshah400@gmail.com -- Fix a path to string concatenation
+Patch1:         dynare-sphinx-str-concat.patch
+BuildRequires:  bison
 BuildRequires:  fdupes
+BuildRequires:  flex
 BuildRequires:  gcc%{?gccver}-c++
 BuildRequires:  gcc%{?gccver}-fortran
 BuildRequires:  lapack-devel
 BuildRequires:  libboost_headers-devel
-BuildRequires:  libtool
+BuildRequires:  meson
 BuildRequires:  pkgconfig
+BuildRequires:  slicot-devel-static
 BuildRequires:  suitesparse-devel
 BuildRequires:  pkgconfig(gsl)
 BuildRequires:  pkgconfig(matio)
-BuildRequires:  pkgconfig(octave)
+BuildRequires:  pkgconfig(octave) >= 7.1.0
 %if %{with doc}
 # SECTION Required for docs
 BuildRequires:  python3-Sphinx-latex
@@ -83,23 +88,21 @@ This package provides documentation for %{name} in HTML format.
 %autosetup -p1
 
 %build
-autoreconf -fvi
 export CXX=g++%{?gccver:-%{gccver}}
-%configure \
-  --docdir=%{_docdir}/%{name} \
-  --disable-matlab \
-  --disable-mex-kalman-steady-state \
-  %{!?with_doc:--disable-doc} \
+%meson \
+  -Dbuild_for=octave \
   %{nil}
-%make_build
+%meson_build
 %if %{with doc}
-%make_build pdf html
+%meson_build dynare-manual.pdf dynare-manual.html
 %endif
 
 %install
-%make_install
+%meson_install
 %fdupes %{buildroot}%{_libdir}/%{name}/
 %if %{with doc}
+mkdir -p %{buildroot}%{_docdir}
+mv %{buildroot}%{_datadir}/doc/%{name} %{buildroot}%{_docdir}/
 %fdupes %{buildroot}%{_docdir}/%{name}/dynare-manual.html/
 rm %{buildroot}%{_docdir}/%{name}/dynare-manual.html/.buildinfo
 %endif
@@ -107,14 +110,12 @@ rm %{buildroot}%{_docdir}/%{name}/dynare-manual.html/.buildinfo
 %files
 %license license.txt
 %doc CONTRIBUTING.md NEWS.md README.md
-%{_bindir}/dynare++
 %{_bindir}/dynare-preprocessor
 %{_libdir}/dynare/
 
 %if %{with doc}
 %files doc-pdf
 %{_docdir}/%{name}/*.pdf
-%{_docdir}/%{name}/dynare++/
 
 %files doc-html
 %{_docdir}/%{name}/dynare-manual.html/