commit 9d3a487cce5d123674d556dcef6ee26b86fb49ef
Author: Arkadiusz Miśkiewicz <[email protected]>
Date: Sun Jun 14 23:44:25 2015 +0200
- rel 1; good enough
openscad.spec | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/openscad.spec b/openscad.spec
index 1e8029c..0797bc1 100644
--- a/openscad.spec
+++ b/openscad.spec
@@ -1,12 +1,15 @@
#
# Conditional build:
%bcond_with tests # build with tests
+%bcond_with qt5
+
+%define qtver %{?with_qt5:5}%{!?with_qt5:4}
%define upversion 2015.03-1
Summary: The Programmers Solid 3D CAD Modeller
Name: openscad
Version: 2015.03.1
-Release: 0.1
+Release: 1
# COPYING contains a linking exception for CGAL
# Appdata file is CC0
# Examples are CC0
@@ -36,8 +39,8 @@ BuildRequires: opencsg-devel >= 1.3.2
BuildRequires: polyclipping-devel >= 6.1.3
BuildRequires: procps
BuildRequires: python
-BuildRequires: qscintilla2-devel
-BuildRequires: qt4-build >= 4.4
+BuildRequires: qscintilla2-qt%{qtver}-devel
+BuildRequires: qt%{qtver}-build >= 4.4
BuildRequires: xorg-xserver-Xvfb
Requires: font(liberationmono)
Requires: font(liberationsans)
@@ -139,7 +142,7 @@ expect some API changes, however many things are already
working.
rm -r src/polyclipping
%build
-qmake-qt4 \
+qmake-qt%{qtver} \
PREFIX=%{_prefix}
%{__make}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/openscad.git/commitdiff/9d3a487cce5d123674d556dcef6ee26b86fb49ef
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
