Update to 0.18.4

This commit is contained in:
Sergey Zhemoitel 2020-01-19 21:40:04 +03:00
parent 3ba845310f
commit baefb021e9
3 changed files with 47 additions and 7 deletions

View file

@ -1,2 +1,2 @@
sources: sources:
FreeCAD-0.17.tar.gz: 394025ef2fea9897c6e26e7045f03cef4fc3032f FreeCAD-0.18.4.tar.gz: c2d136550414f38360c94528fd4e99ae4801a0a4

View file

@ -4,3 +4,5 @@ addFilter("E: library-not-linked-against-libc")
addFilter("E: incoherent-version-in-name") addFilter("E: incoherent-version-in-name")
addFilter("E: invalid-soname.*") addFilter("E: invalid-soname.*")
addFilter("E: wrong-script-interpreter")
addFilter("E: zero-length")

View file

@ -2,7 +2,7 @@
Summary: FreeCAD is a general purpose 3D CAD modeler Summary: FreeCAD is a general purpose 3D CAD modeler
Name: freecad Name: freecad
Version: 0.17 Version: 0.18.4
Release: 1 Release: 1
License: GPLv2+ and LGPLv2+ License: GPLv2+ and LGPLv2+
Group: Graphics Group: Graphics
@ -13,7 +13,7 @@ Source2: %{name}.1
Source3: %{name}.rpmlintrc Source3: %{name}.rpmlintrc
BuildRequires: boost-devel >= 1.33.1 BuildRequires: boost-devel >= 1.33.1
BuildRequires: cmake BuildRequires: cmake
BuildRequires: eigen3 >= 3.0.1 BuildRequires: eigen3 >= 3.3.1
BuildRequires: gcc-gfortran BuildRequires: gcc-gfortran
BuildRequires: libspnav-devel BuildRequires: libspnav-devel
BuildRequires: med-devel BuildRequires: med-devel
@ -29,6 +29,7 @@ BuildRequires: pkgconfig(ode)
BuildRequires: pkgconfig(opencv) BuildRequires: pkgconfig(opencv)
BuildRequires: pkgconfig(pyside) BuildRequires: pkgconfig(pyside)
BuildRequires: pkgconfig(python) >= 2.5 BuildRequires: pkgconfig(python) >= 2.5
BuildRequires: pkgconfig(python3)
BuildRequires: pkgconfig(shiboken) BuildRequires: pkgconfig(shiboken)
BuildRequires: pkgconfig(xerces-c) >= 2.6 BuildRequires: pkgconfig(xerces-c) >= 2.6
BuildRequires: pyside-tools BuildRequires: pyside-tools
@ -39,6 +40,37 @@ BuildRequires: tcl-vtk
BuildRequires: tcl-vtk-qt BuildRequires: tcl-vtk-qt
BuildRequires: vtk-devel BuildRequires: vtk-devel
BuildRequires: vtk-test-suite BuildRequires: vtk-test-suite
BuildRequires: swig
BuildRequires: boost-devel
# Qt5 + Python3
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5WebEngine)
BuildRequires: pkgconfig(Qt5XmlPatterns)
BuildRequires: pkgconfig(Qt5X11Extras)
BuildRequires: pkgconfig(Qt5Xml)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5UiTools)
BuildRequires: pkgconfig(Qt5Concurrent)
BuildRequires: pkgconfig(Qt5WebKitWidgets)
BuildRequires: python3-matplotlib
#BuildRequires: python3-pivy
BuildRequires: python3-ply
BuildRequires: python3-qt5-core
#python3-pyside2.qtcore
BuildRequires: python3-qt5-gui
#python3-pyside2.qtgui
BuildRequires: python3-qt5-svg
#python3-pyside2.qtsvg
BuildRequires: python3-qt5-widgets
#python3-pyside2.qtwidgets
#BuildRequires: python3-pyside2uic
# shiboken2
# PySide2
# PySide2Tools
Requires: pyside Requires: pyside
%description %description
@ -52,7 +84,7 @@ AutoCAD LT) is not the focus, neither are animation and organic shapes (e.g.
Maya, 3D StudioMAX, Blender and Cinema 4D). Maya, 3D StudioMAX, Blender and Cinema 4D).
%files %files
%doc ChangeLog.txt COPYING data/License.txt build/doc/* %doc ChangeLog.txt LICENSE data/License.txt build/doc/*
%{_bindir}/* %{_bindir}/*
%{_datadir}/%{name}/ %{_datadir}/%{name}/
%{_datadir}/applications/%{name}.desktop %{_datadir}/applications/%{name}.desktop
@ -61,6 +93,7 @@ Maya, 3D StudioMAX, Blender and Cinema 4D).
%{_libdir}/%{name}/Mod/ %{_libdir}/%{name}/Mod/
%{_libdir}/%{name}/bin/ %{_libdir}/%{name}/bin/
%{_libdir}/%{name}/Ext/ %{_libdir}/%{name}/Ext/
%{_libdir}/%{name}/share/
%{_mandir}/man1/*.1* %{_mandir}/man1/*.1*
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -74,7 +107,7 @@ Group: Development/C++
Development files for FreeCAD. Development files for FreeCAD.
%files devel %files devel
%doc ChangeLog.txt COPYING %doc ChangeLog.txt LICENSE
%{_libdir}/%{name}/include/ %{_libdir}/%{name}/include/
#---------------------------------------------------------------------------- #----------------------------------------------------------------------------
@ -90,13 +123,18 @@ find ./src -name "*.cpp*" |xargs chmod 644
%build %build
#%%define Werror_cflags %%{nil} #%%define Werror_cflags %%{nil}
%cmake_qt4 -DCMAKE_BUILD_TYPE=Release \ #cmake_qt4 \
#cmake_qt5 \
# -DBUILD_QT5=ON \
# -DPYTHON_EXECUTABLE=/usr/bin/python3 \
%cmake_qt4 \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \ -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
-DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/%{name}/include \ -DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/%{name}/include \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
-DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \ -DCMAKE_INSTALL_DOCDIR=%{_docdir}/%{name} \
-DCMAKE_INSTALL_LIBDIR=%{_libdir}/%{name} \ -DCMAKE_INSTALL_LIBDIR=%{_libdir}/%{name} \
-DRESOURCEDIR=%{_libdir}/freecad -DRESOURCEDIR=%{_datadir}/%{name}
%make %make
%install %install