From d9238c20a1f9b733a9216d5ca5c819e1d75e0bb1 Mon Sep 17 00:00:00 2001 From: Christian Dersch Date: Jan 23 2016 13:13:29 +0000 Subject: Rebuild for boost 1.60 --- diff --git a/libASL-fix-namespace-ifstream-ofstream.patch b/libASL-fix-namespace-ifstream-ofstream.patch new file mode 100644 index 0000000..7185b89 --- /dev/null +++ b/libASL-fix-namespace-ifstream-ofstream.patch @@ -0,0 +1,38 @@ +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 diff --git a/libASL.spec b/libASL.spec index 742817f..7be4338 100644 --- a/libASL.spec +++ b/libASL.spec @@ -29,6 +29,9 @@ License: AGPLv3 and BSD and MIT URL: http://asl.org.il/ Source0: https://github.com/AvtechScientific/%{upstream}/archive/v%{version}.tar.gz +# Added patch to fix compilation on rawhide: https://github.com/AvtechScientific/ASL/pull/18 +Patch0: libASL-fix-namespace-ifstream-ofstream.patch + BuildRequires: boost-devel BuildRequires: cmake BuildRequires: doxygen @@ -95,6 +98,7 @@ The %{name}-examples package contains examples for %{name} %prep %setup -q -n %{upstream}-%{version} +%patch0 -p1 %{__mkdir_p} %{_cmake_build_subdir} %build