From 880c7dccbe0a3ede874ef4428da1f8a93334fc98 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 15 May 2015 11:23:10 +0300 Subject: [PATCH] cleanups --- CuraEngine.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/CuraEngine.spec b/CuraEngine.spec index 15dfa9c..0082a2b 100644 --- a/CuraEngine.spec +++ b/CuraEngine.spec @@ -1,15 +1,20 @@ -%bcond_without tests +# +# Conditional build: +%bcond_with tests # build with tests + Summary: Engine for processing 3D models into G-code instructions for 3D printers Name: CuraEngine Version: 15.04 Release: 1 License: AGPLv3 Group: Applications/Engineering -URL: https://github.com/Ultimaker/CuraEngine Source0: https://github.com/Ultimaker/CuraEngine/archive/%{version}.tar.gz # Source0-md5: 75d34492ca18358aa554a56afb2de440 +URL: https://github.com/Ultimaker/CuraEngine +BuildRequires: libstdc++-devel BuildRequires: polyclipping-devel >= 6.1.2 %{?with_tests:BuildRequires: python} +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description %{name} is a C++ console application for 3D printing G-code @@ -24,7 +29,7 @@ graphical application look at cura with is the graphical frontend for %setup -q # bundled clipper -rm -rf clipper +rm -r clipper sed -i 's|#include |#include |' src/utils/*.h sed -i 's|-lclipper|-lpolyclipping|g' Makefile sed -i 's| $(BUILD_DIR)/libclipper.a||g' Makefile @@ -42,8 +47,8 @@ CFLAGS="-I. -Ilibs -c %{rpmcflags} %{rpmcppflags} -std=c++11 -fomit-frame-pointe %install rm -rf $RPM_BUILD_ROOT - -install -Dpm 0755 build/%{name} $RPM_BUILD_ROOT/%{_bindir}/%{name} +install -d $RPM_BUILD_ROOT%{_bindir}/%{name} +install -p build/%{name} $RPM_BUILD_ROOT%{_bindir} %clean rm -rf $RPM_BUILD_ROOT -- 2.44.0