Update Linux package

jschueller · Oct 22, 2024 · fa0e8aa · fa0e8aa
1 parent 4021f4d
commit fa0e8aa
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 19 deletions.
diff --git a/distro/debian/changelog b/distro/debian/changelog
@@ -1,8 +1,14 @@
-openturns (1.23~rc1-1) experimental; urgency=medium
+openturns (1.24~rc1-1) experimental; urgency=medium
 
   * New upstream pre-release
 
- -- Julien Schueller <[email protected]>  Thu, 02 May 2024 10:19:33 +0100
+ -- Julien Schueller <[email protected]>  Wed, 23 Oct 2024 10:19:33 +0200
+
+openturns (1.23-1) experimental; urgency=medium
+
+  * New upstream release
+
+ -- Julien Schueller <[email protected]>  Thu, 05 Jun 2024 10:19:33 +0100
 
 openturns (1.22-1) experimental; urgency=medium
 

diff --git a/distro/debian/control b/distro/debian/control
@@ -39,7 +39,7 @@ Vcs-Browser: https://salsa.debian.org/science-team/openturns
 Vcs-Git: https://salsa.debian.org/science-team/openturns.git
 Rules-Requires-Root: no
 
-Package: libopenturns0.24
+Package: libopenturns0.25
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends},
@@ -65,7 +65,7 @@ Section: libdevel
 Architecture: any
 Depends: ${misc:Depends},
          libceres-dev,
-         libopenturns0.24 (= ${binary:Version})
+         libopenturns0.25 (= ${binary:Version})
 Description: headers and development libraries for OpenTURNS
  OpenTURNS is a powerful and generic tool to treat and quantify
  uncertainties in numerical simulations in design, optimization and
@@ -104,7 +104,7 @@ Section: python
 Architecture: any
 Depends: ${shlibs:Depends},
          ${misc:Depends},
-         libopenturns0.24 (= ${binary:Version}),
+         libopenturns0.25 (= ${binary:Version}),
          ${python3:Depends}
 Provides: ${python3:Provides}
 Suggests: python3-matplotlib,

diff --git a/distro/debian/libopenturns0.24.install → distro/debian/libopenturns0.25.install b/distro/debian/libopenturns0.24.install → distro/debian/libopenturns0.25.install
diff --git a/...debian/libopenturns0.24.lintian-overrides → ...debian/libopenturns0.25.lintian-overrides b/...debian/libopenturns0.24.lintian-overrides → ...debian/libopenturns0.25.lintian-overrides
@@ -1,7 +1,7 @@
 # We use a longer package name so that it is more descriptive. Also avoiding
 # possible troubles in the namespace of packages.
-libopenturns0.24: package-name-doesnt-match-sonames libOT0.24
+libopenturns0.25: package-name-doesnt-match-sonames libOT0.25
 
 # Not providing symbols for the C++ library, using shlibs file instead
-libopenturns0.24: no-symbols-control-file
+libopenturns0.25: no-symbols-control-file
 
diff --git a/distro/debian/not-installed b/distro/debian/not-installed
@@ -1,4 +1,4 @@
-usr/lib/python*/*-packages/openturns/*/*.pyc
-usr/lib/python*/*-packages/openturns/usecases/*/*.pyc
+usr/lib/python3/dist-packages/openturns/*/*.pyc
+usr/lib/python3/dist-packages/openturns/usecases/*/*.pyc
 usr/share/gdb/auto-load/usr/lib/*/libOT.so*gdb.py
 usr/share/doc/openturns/COPYING*
diff --git a/distro/debian/python3-openturns.install b/distro/debian/python3-openturns.install
@@ -1,5 +1,5 @@
-usr/lib/python3*/*-packages/openturns/*.py
-usr/lib/python3*/*-packages/openturns/*.so
-usr/lib/python3*/*-packages/openturns-*.dist-info/*
-usr/lib/python3*/*-packages/openturns/usecases/*.py
-usr/lib/python3*/*-packages/openturns/usecases/*.csv
+usr/lib/python3/dist-packages/openturns/*.py
+usr/lib/python3/dist-packages/openturns/*.so
+usr/lib/python3/dist-packages/openturns-*.dist-info/*
+usr/lib/python3/dist-packages/openturns/usecases/*.py
+usr/lib/python3/dist-packages/openturns/usecases/*.csv
diff --git a/distro/debian/rules b/distro/debian/rules
@@ -38,7 +38,8 @@ override_dh_auto_configure:
             -Dot_configure_date:STRING='$(BUILD_DATE)' \
             -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
             -DCMAKE_INSTALL_PREFIX:PATH=/usr \
-            -DCMAKE_INSTALL_LIBDIR:PATH="/usr/lib/$(DEB_HOST_MULTIARCH)" \
+            -DCMAKE_INSTALL_LIBDIR:PATH=lib/$(DEB_HOST_MULTIARCH) \
+            -DOPENTURNS_PYTHON_MODULE_PATH=lib/python3/dist-packages \
             -DINSTALL_DESTDIR:PATH=$(CURDIR)/debian/tmp \
 	        -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
             -DSWIG_COMPILE_FLAGS:STRING='-O1'

diff --git a/distro/rpm/openturns.spec b/distro/rpm/openturns.spec
@@ -16,7 +16,7 @@ FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
 -DBUILD_SHARED_LIBS:BOOL=ON
 
 Name:           openturns
-Version:        1.23rc1
+Version:        1.24rc1
 Release:        1%{?dist}
 Summary:        Uncertainty treatment library
 Group:          System Environment/Libraries
@@ -31,6 +31,7 @@ BuildRequires:  hdf5-devel
 %endif
 BuildRequires:  boost-devel
 %if 0%{?suse_version}
+BuildRequires:  gcc11-c++
 BuildRequires:  mpc-devel
 BuildRequires:  cblas-devel
 %else
@@ -95,13 +96,13 @@ Python textual interface to OpenTURNS uncertainty library
 %setup -q
 
 %build
+%if 0%{?suse_version}
+export CXX=/usr/bin/g++-11
+%endif
 %cmake -DINSTALL_DESTDIR:PATH=%{buildroot} \
        -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON \
        -DCMAKE_UNITY_BUILD=ON -DCMAKE_UNITY_BUILD_BATCH_SIZE=32 \
        -DSWIG_COMPILE_FLAGS="-O1" \
-%if 0%{?suse_version}
-       -DUSE_CXX17=OFF \
-%endif
        -DOPENTURNS_SYSCONFIG_PATH=/etc .
 make %{?_smp_mflags} OT
 make
@@ -138,6 +139,9 @@ LD_LIBRARY_PATH=%{buildroot}%{_libdir} OMP_NUM_THREADS=1 OPENTURNS_NUM_THREADS=1
 %{python_sitearch}/%{name}-*.dist-info/
 
 %changelog
+* Wed Oct 23 2024 Julien Schueller <schueller at phimeca dot com> 1.24-1
+- New upstream release
+
 * Thu May 02 2024 Julien Schueller <schueller at phimeca dot com> 1.23-1
 - New upstream release