Adrian Schröter 2016-07-07 14:59:07 +00:00 committed by Git OBS Bridge
parent 9e32911f6d
commit 316c82dc6c

View File

@ -61,7 +61,6 @@ BuildRequires: swig
%if 0%{?suse_version}
BuildRequires: update-desktop-files
%endif
BuildRequires: zipios-devel
BuildRequires: zlib-devel
# Used because of "no-return-in-nonvoid-function" and "stringcompare" rpm post build check errors
#BuildRequires: -post-build-checks
@ -112,20 +111,9 @@ sed -i 's/\r$//' src/Mod/PartDesign/Scripts/Spring.py
sed -i 's/\r$//' src/Mod/Robot/MovieTool.py
# Remove 3rd party libs
rm src/zipios++ -fr
rm src/3rdparty/Pivy -fr
rm src/3rdparty/Pivy-0.5 -fr
# zipios lost the +
sed -i -e 's,zipios++,zipios,' src/Base/CMakeLists.txt
sed -i -e 's,#include <zipios++/,#include <zipios/,' src/*/*.{cpp,h} \
src/Mod/Mesh/Gui/ViewProvider.cpp \
src/Mod/Mesh/App/Core/MeshIO.cpp \
src/Tools/thumbs/FCStdExtractor.cpp \
src/Tools/thumbs/ThumbnailProvider/ThumbnailProvider.cpp
sed -i -e 's,zipios/zipios-config.h,zipios/zipios-config.hpp,' \
src/Base/CMakeLists.txt
%build
mkdir build && cd build
# cmake macro would set standard libdir