- release 2 (by relup.sh)

[packages/openscad.git] / openscad.spec

diff --git a/openscad.spec b/openscad.spec
index 1e8029cd1915387baccb882e6731e9f84e02fa3e..fd5fbd44b12fcbc5f67e0d66e74a527ee052e7d4 100644 (file)
--- a/openscad.spec
+++ b/openscad.spec
@@ -1,19 +1,22 @@
 #
 # Conditional build:
 %bcond_with    tests           # build with tests
+%bcond_with    qt5
 
-%define        upversion 2015.03-1
+%define        qtver   %{?with_qt5:5}%{!?with_qt5:4}
+
+%define        upversion 2015.03-3
 Summary:       The Programmers Solid 3D CAD Modeller
 Name:          openscad
-Version:       2015.03.1
-Release:       0.1
+Version:       2015.03.3
+Release:       2
 # COPYING contains a linking exception for CGAL
 # Appdata file is CC0
 # Examples are CC0
 License:       GPLv2 with exceptions and CC0
 Group:         Applications/Engineering
 Source0:       http://files.openscad.org/%{name}-%{upversion}.src.tar.gz
-# Source0-md5: c5994220078f5f5c13984da304e4a2fe
+# Source0-md5: a498a218a247468eee140ccc44c73afa
 Patch0:                %{name}-polyclipping.patch
 URL:           http://www.openscad.org/
 BuildRequires: CGAL-devel >= 3.6
@@ -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}