Accepting request 533180 from science

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/533180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/FreeCAD?expand=0&rev=2
This commit is contained in:
Dominique Leuenberger 2017-10-18 08:50:42 +00:00 committed by Git OBS Bridge
commit a8adf8ba89
2 changed files with 24 additions and 18 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Sep 10 08:23:34 UTC 2017 - rbrown@suse.com
- Correct python-CXX requires
- add python-pyside requires, needed for welcome splash
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Jun 13 06:46:23 UTC 2016 - adrian@suse.de Mon Jun 13 06:46:23 UTC 2016 - adrian@suse.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package FreeCAD # spec file for package FreeCAD
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -15,20 +15,21 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #
%define x_prefix %{_libdir}/%{name} %define x_prefix %{_libdir}/%{name}
Name: FreeCAD Name: FreeCAD
Version: 0.16 Version: 0.16
Release: 0 Release: 0
License: LGPL-2.0+ and GPL-2.0+
Summary: General Purpose 3D CAD Modeler Summary: General Purpose 3D CAD Modeler
Url: http://www.freecadweb.org/ License: LGPL-2.0+ and GPL-2.0+
Group: Productivity/Graphics/CAD Group: Productivity/Graphics/CAD
Url: http://www.freecadweb.org/
Source0: %{name}-%version.tar.xz Source0: %{name}-%version.tar.xz
Source2: FreeCAD_shared_mimeinfo Source2: FreeCAD_shared_mimeinfo
BuildRequires: Coin-devel BuildRequires: Coin-devel
BuildRequires: oce-devel
BuildRequires: SoQt-devel BuildRequires: SoQt-devel
BuildRequires: oce-devel
%if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1
# Leap has it's own special boost-devel # Leap has it's own special boost-devel
BuildRequires: boost_1_58_0-devel BuildRequires: boost_1_58_0-devel
@ -41,9 +42,9 @@ BuildRequires: f2c
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: freeglut-devel BuildRequires: freeglut-devel
BuildRequires: gcc-fortran BuildRequires: gcc-fortran
BuildRequires: libXerces-c-devel
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(QtWebKit) BuildRequires: pkgconfig(QtWebKit)
BuildRequires: libXerces-c-devel
%if 0%{?suse_version} > 0 %if 0%{?suse_version} > 0
BuildRequires: libeigen3-devel BuildRequires: libeigen3-devel
BuildRequires: python-xml BuildRequires: python-xml
@ -61,19 +62,18 @@ BuildRequires: swig
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
%endif %endif
BuildRequires: zlib-devel
# Used because of "no-return-in-nonvoid-function" and "stringcompare" rpm post build check errors
#BuildRequires: -post-build-checks
BuildRequires: unzip
BuildRequires: libshiboken-devel
BuildRequires: python-pyside
BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools
BuildRequires: git
BuildRequires: make
BuildRequires: dos2unix BuildRequires: dos2unix
BuildRequires: git
BuildRequires: hdf5-devel BuildRequires: hdf5-devel
Requires: python-cxx BuildRequires: libshiboken-devel
BuildRequires: make
BuildRequires: python-pyside
BuildRequires: python-pyside-devel
BuildRequires: python-pyside-tools
BuildRequires: unzip
BuildRequires: zlib-devel
Requires: python-CXX
Requires: python-pyside
Requires(post): shared-mime-info Requires(post): shared-mime-info
Requires(postun): shared-mime-info Requires(postun): shared-mime-info
Recommends: python-pivy Recommends: python-pivy
@ -115,7 +115,7 @@ rm src/3rdparty/Pivy-0.5 -fr
%build %build
mkdir build && cd build mkdir build && cd build
# cmake macro would set standard libdir # cmake macro would set standard libdir
# it needs an older specific zipios version -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE # it needs an older specific zipios version -DFREECAD_USE_EXTERNAL_ZIPIOS=TRUE
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \ -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \
-DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \
@ -150,7 +150,7 @@ make VERBOSE=1 %{?_smp_mflags} all
# ../ # ../
# # Needs an updated opencascade # # Needs an updated opencascade
# #-DOCE_DIR=/opt/OpenCASCADE/%{_lib} # #-DOCE_DIR=/opt/OpenCASCADE/%{_lib}
# #
# nice make VERBOSE=1 DevDoc # nice make VERBOSE=1 DevDoc
# popd # popd