From 63b933909b94945caadf5c710ecf9b14325776fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B7=D0=B8=D0=BC?= Date: Tue, 22 May 2018 04:08:47 +0300 Subject: [PATCH] Updated to 0.17 --- .abf.yml | 2 +- freecad.spec | 53 ++++++++++++++++++++++++++++++---------------------- 2 files changed, 32 insertions(+), 23 deletions(-) diff --git a/.abf.yml b/.abf.yml index 124c27c..51c8144 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - FreeCAD-0.16.tar.gz: 5e8956588e87b18c8c4140cbdcaa1229c04907bb + FreeCAD-0.17.tar.gz: 394025ef2fea9897c6e26e7045f03cef4fc3032f diff --git a/freecad.spec b/freecad.spec index 2998b59..25714f0 100644 --- a/freecad.spec +++ b/freecad.spec @@ -1,36 +1,44 @@ -%define oname FreeCAD +%define oname FreeCAD Summary: FreeCAD is a general purpose 3D CAD modeler Name: freecad -Version: 0.16 -Release: 4 +Version: 0.17 +Release: 1 License: GPLv2+ and LGPLv2+ Group: Graphics Url: http://www.freecadweb.org/ -Source0: https://github.com/FreeCAD/FreeCAD/archive/%{oname}-%{version}.tar.gz +Source0: https://github.com/FreeCAD/FreeCAD/archive/%{version}.tar.gz?/%{oname}-%{version}.tar.gz Source1: %{name}.desktop Source2: %{name}.1 Source3: %{name}.rpmlintrc +BuildRequires: boost-devel >= 1.33.1 BuildRequires: cmake BuildRequires: eigen3 >= 3.0.1 BuildRequires: gcc-gfortran -BuildRequires: python-matplotlib -BuildRequires: pyside-tools -BuildRequires: boost-devel >= 1.33.1 BuildRequires: libspnav-devel +BuildRequires: med-devel BuildRequires: opencascade-devel >= 5.2 -BuildRequires: qt4-devel -BuildRequires: pkgconfig(glu) -BuildRequires: pkgconfig(SoQt) >= 1.2.0 +BuildRequires: openmpi-devel BuildRequires: pkgconfig(Coin) >= 2.4.0 +BuildRequires: pkgconfig(SoQt) >= 1.2.0 BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(glu) BuildRequires: pkgconfig(gstreamer-0.10) +BuildRequires: pkgconfig(jsoncpp) BuildRequires: pkgconfig(ode) BuildRequires: pkgconfig(opencv) +BuildRequires: pkgconfig(pyside) BuildRequires: pkgconfig(python) >= 2.5 BuildRequires: pkgconfig(shiboken) -BuildRequires: pkgconfig(pyside) BuildRequires: pkgconfig(xerces-c) >= 2.6 +BuildRequires: pyside-tools +BuildRequires: python-matplotlib +BuildRequires: python-vtk +BuildRequires: qt4-devel +BuildRequires: tcl-vtk +BuildRequires: tcl-vtk-qt +BuildRequires: vtk-devel +BuildRequires: vtk-test-suite Requires: pyside %description @@ -44,28 +52,29 @@ AutoCAD LT) is not the focus, neither are animation and organic shapes (e.g. Maya, 3D StudioMAX, Blender and Cinema 4D). %files -%doc ChangeLog.txt copying.lib data/License.txt build/doc/* +%doc ChangeLog.txt COPYING data/License.txt build/doc/* %{_bindir}/* -%{_libdir}/%{name}/bin/ -%{_libdir}/%{name}/Mod/ -%{_libdir}/%{name}/*.so +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg -%{_datadir}/%{name}/ +%{_libdir}/%{name}/*.so +%{_libdir}/%{name}/Mod/ +%{_libdir}/%{name}/bin/ +%{_libdir}/%{name}/Ext/freecad/__init__.py %{_mandir}/man1/*.1* #---------------------------------------------------------------------------- %package devel Summary: Devel package for %{name} -Requires: %{name} = %{version} +Requires: %{name} = %{EVRD} Group: Development/C++ %description devel Development files for FreeCAD. %files devel -%doc ChangeLog.txt copying.lib +%doc ChangeLog.txt COPYING %{_libdir}/%{name}/include/ #---------------------------------------------------------------------------- @@ -80,7 +89,7 @@ find ./src -name "*.h*" |xargs chmod 644 find ./src -name "*.cpp*" |xargs chmod 644 %build -#define Werror_cflags %%nil +#%%define Werror_cflags %%{nil} %cmake_qt4 -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \ -DCMAKE_INSTALL_INCLUDEDIR=%{_libdir}/%{name}/include \ @@ -109,14 +118,14 @@ sed -i 's,@lib@,%{_lib},g' %{buildroot}%{_datadir}/applications/%{name}.desktop # Install desktop icon install -pD -m 0644 src/Gui/Icons/%{name}.svg \ - %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg + %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg # Install man page install -pD -m 0644 %{SOURCE2} %{buildroot}%{_mandir}/man1/%{name}.1 # Symlink manpage to other binary names pushd %{buildroot}%{_mandir}/man1 - ln -sf %{name}.1.gz FreeCAD.1.gz. - ln -sf %{name}.1.gz FreeCADCmd.1.gz + ln -sf %{name}.1.gz FreeCAD.1.gz. + ln -sf %{name}.1.gz FreeCADCmd.1.gz popd # FIXME: Apparently there are no more include files to install.