Hello community, here is the log from the commit of package meep for openSUSE:Factory checked in at 2018-11-26 10:29:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meep (Old) and /work/SRC/openSUSE:Factory/.meep.new.19453 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "meep" Mon Nov 26 10:29:18 2018 rev:5 rq:651319 version:1.7.0 Changes: -------- --- /work/SRC/openSUSE:Factory/meep/meep.changes 2017-03-02 19:29:09.301098003 +0100 +++ /work/SRC/openSUSE:Factory/.meep.new.19453/meep.changes 2018-11-26 10:29:33.265080886 +0100 @@ -1,0 +2,14 @@ +Thu Nov 22 11:53:54 UTC 2018 - Jonathan Brielmaier <jbrielma...@suse.de> + +- Update to version 1.7.0: + * See /usr/share/meep/NEWS.md +- update so version to 12 +- add patch: + * namespace-for-complex-literals.patch: fixes build failure +- drop patch: + * meep_change_protos_with_harminv_complex.patch +- add libmeepgeom library +- correct doc file names +- use c++14 for complex_literals + +------------------------------------------------------------------- Old: ---- meep-1.2.1.tar.gz meep_change_protos_with_harminv_complex.patch New: ---- meep-1.7.0.tar.gz namespace-for-complex-literals.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meep.spec ++++++ --- /var/tmp/diff_new_pack.8Kas3M/_old 2018-11-26 10:29:33.717080356 +0100 +++ /var/tmp/diff_new_pack.8Kas3M/_new 2018-11-26 10:29:33.717080356 +0100 @@ -1,7 +1,7 @@ # # spec file for package meep # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,21 +12,21 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define somajor 12 Name: meep -Version: 1.2.1 +Version: 1.7.0 Release: 0 -%define somajor 7 Summary: FDTD finite-difference time-domain solver -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Productivity/Scientific/Electronics Url: http://ab-initio.mit.edu/wiki/index.php/Meep -Source0: http://ab-initio.mit.edu/meep/meep-%{version}.tar.gz -# PATCH-FIX-UPSTREAM meep_change_protos_with_harminv_complex.patch -- https://github.com/stevengj/meep/issues/13 -Patch1: meep_change_protos_with_harminv_complex.patch +Source0: https://github.com/stevengj/meep/releases/download/v%{version}/meep-%{version}.tar.gz +# proposed to upstream: https://github.com/stevengj/meep/pull/618 +Patch0: namespace-for-complex-literals.patch BuildRequires: binutils BuildRequires: blas-devel BuildRequires: fftw3-devel @@ -58,8 +58,8 @@ %package -n lib%{name}%{somajor} Summary: FDTD finite-difference time-domain solver library -Group: System/Libraries # Avoid unresolvable errors from multiple providers +Group: System/Libraries Requires: libhdf5 %description -n lib%{name}%{somajor} @@ -67,10 +67,20 @@ simulation software package developed at MIT to model electromagnetic systems. +%package -n libmeepgeom%{somajor} +Summary: C++ library for meep geometries +Group: System/Libraries + +%description -n libmeepgeom%{somajor} +Libmeepgeom provides a C++ library to specify Meep geometries in terms +of a list of geometric objects (spheres, cylinders, boxes) with +various material properties. + %package devel Summary: Libraries and header files for meep library Group: Development/Libraries/Other Requires: lib%{name}%{somajor} = %{version} +Requires: libmeepgeom%{somajor} = %{version} %description devel Meep (or MEEP) is a free finite-difference time-domain (FDTD) @@ -82,11 +92,11 @@ %prep %setup -q -%patch1 -p1 +%patch0 -p1 %build export CFLAGS="%{optflags} -fPIC" -export CXXFLAGS="%{optflags} -fPIC" +export CXXFLAGS="%{optflags} -fPIC -std=c++14" export FFLAGS="%{optflags} -fPIC" %configure --enable-shared --disable-static --enable-portable-binary make %{?_smp_mflags} @@ -99,12 +109,14 @@ make check %post -n lib%{name}%{somajor} -p /sbin/ldconfig +%post -n libmeepgeom%{somajor} -p /sbin/ldconfig %postun -n lib%{name}%{somajor} -p /sbin/ldconfig +%postun -n libmeepgeom%{somajor} -p /sbin/ldconfig %files %defattr(-,root,root) -%doc AUTHORS COPYING NEWS +%doc AUTHORS COPYRIGHT NEWS.md %{_bindir}/* %{_datadir}/meep/ @@ -112,9 +124,14 @@ %defattr(-,root,root) %{_libdir}/libmeep.so.* +%files -n libmeepgeom%{somajor} +%defattr(-,root,root) +%{_libdir}/libmeepgeom.so.* + %files devel %defattr(-,root,root) %{_libdir}/libmeep.so +%{_libdir}/libmeepgeom.so %{_libdir}/pkgconfig/* %{_includedir}/* ++++++ meep-1.2.1.tar.gz -> meep-1.7.0.tar.gz ++++++ ++++ 309091 lines of diff (skipped) ++++++ namespace-for-complex-literals.patch ++++++ commit 609165a98599b151019157e9e838ae11dfbd6049 (HEAD -> fix-build-failure, master) Author: Jonathan Brielmaier <jbrielma...@suse.de> Date: Thu Nov 22 12:47:42 2018 +0100 libmeepgeom: Fix build failure. Without this namespace statement, building fails on openSUSE Tumbleweed. Signed-off-by: Jonathan Brielmaier <jbrielma...@suse.de> diff --git a/libmeepgeom/ring-ll.cpp b/libmeepgeom/ring-ll.cpp index af4f39a..ea5446a 100644 --- a/libmeepgeom/ring-ll.cpp +++ b/libmeepgeom/ring-ll.cpp @@ -136,6 +136,7 @@ int main(int argc, char *argv[]) int ref_bands=3; double ref_freq_re[3] = { 1.1807e-01, 1.4716e-01, 1.7525e-01 }; double ref_freq_im[3] = { -7.6133e-04, -2.1156e-04, -5.2215e-05 }; + using namespace std::complex_literals; cdouble ref_amp[3] = { -8.28e-04-1.34e-03i, +1.23e-03-1.25e-02i, +2.83e-03-6.52e-04i}; if (bands!=3) abort("harminv found only %i/%i bands\n",bands,ref_bands);
