Hello community, here is the log from the commit of package ASL for openSUSE:Factory checked in at 2016-02-16 09:19:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ASL (Old) and /work/SRC/openSUSE:Factory/.ASL.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ASL" Changes: -------- --- /work/SRC/openSUSE:Factory/ASL/ASL.changes 2015-10-20 00:05:09.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.ASL.new/ASL.changes 2016-02-16 09:19:05.000000000 +0100 @@ -1,0 +2,10 @@ +Wed Feb 10 21:44:15 UTC 2016 - mplus...@suse.com + +- Update to 0.1.6 + * Important bug fixes +- Use cmake macro +- Cleanup spec file with spec-cleaner +- Add patch to fix build with latest gcc and boost + * ASL-Explicitly-define-namespace.patch + +------------------------------------------------------------------- Old: ---- ASL-0.1.4.tar.gz New: ---- ASL-0.1.6.tar.gz ASL-Explicitly-define-namespace.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ASL.spec ++++++ --- /var/tmp/diff_new_pack.HQvZyW/_old 2016-02-16 09:19:06.000000000 +0100 +++ /var/tmp/diff_new_pack.HQvZyW/_new 2016-02-16 09:19:06.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ASL # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 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 @@ -16,25 +16,23 @@ # +%define so_ver 0 Name: ASL -Version: 0.1.4 +Version: 0.1.6 Release: 0 -%define so_ver 0 Summary: Advanced Simulation Library is a free and open source multiphysics simulation License: AGPL-3.0 Group: Productivity/Scientific/Physics Url: http://asl.org.il/features/ Source: https://github.com/AvtechScientific/ASL/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz +# Fix build with GCC 5.3.0 and Boost 1.60.0 +# upstream commit 3bb6d19ffda77242a73c2ab2e1eece9459d1ec47 +Patch0: ASL-Explicitly-define-namespace.patch BuildRequires: cmake >= 3.0.2 -BuildRequires: gcc-c++ -%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 -BuildRequires: boost_1_58_0-devel -%else -BuildRequires: boost-devel >= 1.58.0 -%endif BuildRequires: doxygen BuildRequires: fdupes BuildRequires: freetype2-devel +BuildRequires: gcc-c++ BuildRequires: libmatio-devel BuildRequires: libnetcdf_c++-devel BuildRequires: netcdf-devel @@ -44,36 +42,46 @@ Recommends: beignet Recommends: freeocl BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 +BuildRequires: boost_1_58_0-devel +%else +BuildRequires: boost-devel >= 1.58.0 +%endif %description -Advanced Simulation Library is a free and open source multiphysics simulation software package and a -tool for solving Partial Differential Equations. It has significant user base across many areas of -engineering and science, from both industrial and academic organizations. ASL utilizes only the -methods that allow efficient parallelization: Lattice Boltzmann Methods, Explicit Finite Difference, -Matrix Free Finite Elements, etc. and exploits all available hardware resources, such as SIMD, local -cache, etc.. Once written, an ASL-based application can be deployed on a variety of architectures, -such as CPU, GPU, FPGA, DSP, clusters and supercomputers, sometimes even without recompilation. +Advanced Simulation Library is a free and open source multiphysics +simulation software package and a tool for solving Partial Differential +Equations. It has significant user base across many areas of engineering +and science, from both industrial and academic organizations. ASL utilizes +only the methods that allow efficient parallelization: Lattice Boltzmann +Methods, Explicit Finite Difference, Matrix Free Finite Elements, etc. and +exploits all available hardware resources, such as SIMD, local cache, etc.. +Once written, an ASL-based application can be deployed on a variety of +architectures, such as CPU, GPU, FPGA, DSP, clusters and supercomputers, +sometimes even without recompilation. -%package -n %{name}-devel +%package devel Summary: Development files for the Advanced Simulation Library Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: libaslcommon%{so_ver} = %{version} -%description -n %{name}-devel +%description devel Header files for %{name}. - Once written, an ASL-based application can be deployed on a variety of architectures, - such as CPU, GPU, FPGA, DSP, clusters and supercomputers, sometimes even without recompilation. +Once written, an ASL-based application can be deployed on a variety of +architectures, such as CPU, GPU, FPGA, DSP, clusters and supercomputers, +sometimes even without recompilation. -%package -n %{name}-doc +%package doc Summary: API documentation for the Advanced Simulation Library Group: Documentation/Man Requires: %{name} = %{version} -%description -n %{name}-doc +%description doc API documentation for %{name}. - Once written, an ASL-based application can be deployed on a variety of architectures, - such as CPU, GPU, FPGA, DSP, clusters and supercomputers, sometimes even without recompilation. +Once written, an ASL-based application can be deployed on a variety of +architectures, such as CPU, GPU, FPGA, DSP, clusters and supercomputers, +sometimes even without recompilation. %package -n libaslcommon%{so_ver} Summary: C++ Library for asl @@ -81,65 +89,84 @@ %description -n libaslcommon%{so_ver} API documentation for %{name}. - Once written, an ASL-based application can be deployed on a variety of architectures, - such as CPU, GPU, FPGA, DSP, clusters and supercomputers, sometimes even without recompilation. +Once written, an ASL-based application can be deployed on a variety of +architectures, such as CPU, GPU, FPGA, DSP, clusters and supercomputers, +sometimes even without recompilation. %prep %setup -q -sed -i 's/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/' doc/Developer-Guide/Doxyfile.cmake.in +%patch0 -p1 +sed -i 's/HTML_TIMESTAMP = YES/HTML_TIMESTAMP = NO/' doc/Developer-Guide/Doxyfile.in %build -export SUSE_ASNEEDED=0 - mkdir -p build - pushd build - cmake .. \ - -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \ - -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \ - -DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \ - -DLIB_INSTALL_DIR:PATH=%{_libdir} \ - -DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \ - -DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_C_FLAGS="${CFLAGS:-%optflags} -DNDEBUG" \ - -DCMAKE_CXX_FLAGS="${CXXFLAGS:-%optflags} -DNDEBUG" \ - -DCMAKE_Fortran_FLAGS="${FFLAGS:-%optflags%{?_fmoddir: -I%_fmoddir}} -DNDEBUG" \ - -DCMAKE_SKIP_RPATH:BOOL=ON \ - -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON \ - -DBUILD_SHARED_LIBS:BOOL=ON \ - -DBUILD_STATIC_LIBS:BOOL=OFF \ - -DCMAKE_COLOR_MAKEFILE:BOOL=OFF \ - -DCMAKE_INSTALL_DO_STRIP:BOOL=OFF \ - -DCMAKE_MODULES_INSTALL_DIR=%{_datadir}/cmake/Modules \ - -DCMAKE_USER_MAKE_RULES_OVERRIDE="%{_datadir}/cmake/Modules/opensuse_rules.cmake" \ - -DWITH_MATIO=yes -DWITH_API_DOC=yes +%cmake \ + -DWITH_MATIO=yes \ + -DWITH_API_DOC=yes %make_jobs -popd %install %cmake_install %fdupes %{buildroot} %post -n libaslcommon%{so_ver} -p /sbin/ldconfig - %postun -n libaslcommon%{so_ver} -p /sbin/ldconfig %files %defattr(-,root,root) %doc LICENSE README.md %{_bindir}/asl-hardware +%{_bindir}/asl-acousticWaves +%{_bindir}/asl-bus_wind +%{_bindir}/asl-compressor +%{_bindir}/asl-cubeGravity +%{_bindir}/asl-cubeIncompressibleGravity +%{_bindir}/asl-cubePoroelasticGravity +%{_bindir}/asl-flow +%{_bindir}/asl-flow2 +%{_bindir}/asl-flow3 +%{_bindir}/asl-flowKDPGrowth +%{_bindir}/asl-flowRotatingCylinders +%{_bindir}/asl-jumpingBox +%{_bindir}/asl-levelSetBasic +%{_bindir}/asl-levelSetFacetedGrowth +%{_bindir}/asl-levelSetNormalGrowth +%{_bindir}/asl-locomotive +%{_bindir}/asl-locomotive_laminar +%{_bindir}/asl-locomotive_stability +%{_bindir}/asl-multicomponent_flow +%{_bindir}/asl-multiphase_flow +%{_bindir}/asl-pitot_tube_ice +%{_bindir}/asl-poroelastic +%{_bindir}/asl-surfaceFlux +%{_bindir}/asl-testSMDiff +%{_bindir}/asl-testSMDiff3C +%{_bindir}/asl-testSMPhi +%{_bindir}/asl-testSMPhiBV %files -n libaslcommon%{so_ver} %defattr(-,root,root) -%{_libdir}/*.so.* +%{_libdir}/libasl.so.* +%{_libdir}/libaslacl.so.* +%{_libdir}/libaslcommon.so.* +%{_libdir}/libaslmatio.so.* +%{_libdir}/libaslnum.so.* +%{_libdir}/libaslnumext.so.* +%{_libdir}/libaslvtk.so.* -%files -n %{name}-devel +%files devel %defattr(-,root,root) -%{_libdir}/*.so -%{_includedir}/asl/ +%{_libdir}/libasl.so +%{_libdir}/libaslacl.so +%{_libdir}/libaslcommon.so +%{_libdir}/libaslmatio.so +%{_libdir}/libaslnum.so +%{_libdir}/libaslnumext.so +%{_libdir}/libaslvtk.so +%{_includedir}/ASL/ %{_libdir}/cmake/ASL/ %{_libdir}/pkgconfig/*.pc -%files -n %{name}-doc +%files doc %defattr(-,root,root) %{_datadir}/doc/ASL/ ++++++ ASL-0.1.4.tar.gz -> ASL-0.1.6.tar.gz ++++++ /work/SRC/openSUSE:Factory/ASL/ASL-0.1.4.tar.gz /work/SRC/openSUSE:Factory/.ASL.new/ASL-0.1.6.tar.gz differ: char 13, line 1 ++++++ ASL-Explicitly-define-namespace.patch ++++++ >From 179516b0b7b3b4a0920444288cf8acca872e8846 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <b...@bpiotrowski.pl> Date: Mon, 21 Dec 2015 19:49:51 +0100 Subject: [PATCH] Explicitly define namespace of ifstream and ofstream With GCC 5.3.0 and Boost 1.60.0, the build fails with following error: /build/libasl/src/ASL-0.1.6/src/utilities/aslParametersManager.cxx:466:6: error: reference to 'ifstream' is ambiguous ifstream ifs(p.string()); ^ /usr/include/boost/filesystem/fstream.hpp:169:32: note: candidates are: typedef class boost::filesystem::basic_ifstream<char> boost::filesystem::ifstream typedef basic_ifstream<char> ifstream; ^ --- src/utilities/aslParametersManager.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/utilities/aslParametersManager.cxx b/src/utilities/aslParametersManager.cxx index 98a0192..d6ef3c7 100644 --- a/src/utilities/aslParametersManager.cxx +++ b/src/utilities/aslParametersManager.cxx @@ -332,7 +332,7 @@ namespace asl try { - ifstream ifs(paramFile); + std::ifstream ifs(paramFile); if (!ifs.good()) errorMessage("Can not open parameters file: " + paramFile); @@ -357,7 +357,7 @@ namespace asl void ParametersManager::writeParametersFile(const std::string fileName) { - ofstream fo(fileName); + std::ofstream fo(fileName); if (!fo.good()) errorMessage("ParametersManager::writeParametersFile() - can not open file: " + fileName); @@ -463,7 +463,7 @@ namespace asl } else { - ifstream ifs(p.string()); + std::ifstream ifs(p.string()); if (ifs.good()) { parsed_options parsed = parse_config_file(ifs, allOptions, true); @@ -514,4 +514,4 @@ namespace asl } } -} //namespace asl \ No newline at end of file +} //namespace asl
