From 2790cfe94bd77b02ecb0c19c5504e0e75e7fa44cbff9f25354caf5f72db064e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Mon, 15 Aug 2016 07:02:57 +0000 Subject: [PATCH 1/2] drop obsolete comment OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=9 --- FreeCAD.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/FreeCAD.spec b/FreeCAD.spec index 5564f92..49e0f7b 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -62,8 +62,6 @@ BuildRequires: swig BuildRequires: update-desktop-files %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 From ae562882183d674f3f4b72e84e1720aa35e9f85f90e176856887b662c0be1998 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Sun, 10 Sep 2017 08:43:40 +0000 Subject: [PATCH 2/2] Accepting request 522868 from home:RBrownSUSE:branches:science Please forward to Factory - Correct python-CXX requires - add python-pyside requires, needed for welcome splash OBS-URL: https://build.opensuse.org/request/show/522868 OBS-URL: https://build.opensuse.org/package/show/science/FreeCAD?expand=0&rev=11 --- FreeCAD.changes | 6 ++++++ FreeCAD.spec | 34 ++++++++++++++++++---------------- 2 files changed, 24 insertions(+), 16 deletions(-) diff --git a/FreeCAD.changes b/FreeCAD.changes index d9734b3..8024f57 100644 --- a/FreeCAD.changes +++ b/FreeCAD.changes @@ -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 diff --git a/FreeCAD.spec b/FreeCAD.spec index 49e0f7b..6d695c3 100644 --- a/FreeCAD.spec +++ b/FreeCAD.spec @@ -1,7 +1,7 @@ # # 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 # remain the property of their copyright owners, unless otherwise agreed @@ -15,20 +15,21 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define x_prefix %{_libdir}/%{name} Name: FreeCAD Version: 0.16 Release: 0 -License: LGPL-2.0+ and GPL-2.0+ Summary: General Purpose 3D CAD Modeler -Url: http://www.freecadweb.org/ +License: LGPL-2.0+ and GPL-2.0+ Group: Productivity/Graphics/CAD +Url: http://www.freecadweb.org/ Source0: %{name}-%version.tar.xz Source2: FreeCAD_shared_mimeinfo BuildRequires: Coin-devel -BuildRequires: oce-devel BuildRequires: SoQt-devel +BuildRequires: oce-devel %if 0%{?suse_version} == 1315 && 0%{?is_opensuse} == 1 # Leap has it's own special boost-devel BuildRequires: boost_1_58_0-devel @@ -41,9 +42,9 @@ BuildRequires: f2c BuildRequires: fdupes BuildRequires: freeglut-devel BuildRequires: gcc-fortran +BuildRequires: libXerces-c-devel BuildRequires: pkg-config BuildRequires: pkgconfig(QtWebKit) -BuildRequires: libXerces-c-devel %if 0%{?suse_version} > 0 BuildRequires: libeigen3-devel BuildRequires: python-xml @@ -61,17 +62,18 @@ BuildRequires: swig %if 0%{?suse_version} BuildRequires: update-desktop-files %endif -BuildRequires: zlib-devel -BuildRequires: unzip -BuildRequires: libshiboken-devel -BuildRequires: python-pyside -BuildRequires: python-pyside-devel -BuildRequires: python-pyside-tools -BuildRequires: git -BuildRequires: make BuildRequires: dos2unix +BuildRequires: git 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(postun): shared-mime-info Recommends: python-pivy @@ -113,7 +115,7 @@ rm src/3rdparty/Pivy-0.5 -fr %build mkdir build && cd build # 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 \ -DCMAKE_INSTALL_PREFIX=%{_libdir}/%{name} \ -DCMAKE_INSTALL_DATADIR=%{_datadir}/%{name} \ @@ -148,7 +150,7 @@ make VERBOSE=1 %{?_smp_mflags} all # ../ # # Needs an updated opencascade # #-DOCE_DIR=/opt/OpenCASCADE/%{_lib} -# +# # nice make VERBOSE=1 DevDoc # popd