Accepting request 304767 from home:elvigia:branches:graphics

- Switch to QT5 for Factory builds.

OBS-URL: https://build.opensuse.org/request/show/304767
OBS-URL: https://build.opensuse.org/package/show/graphics/librecad?expand=0&rev=24
This commit is contained in:
2015-04-30 02:54:27 +00:00
committed by Git OBS Bridge
parent 917a1cbd38
commit 73d8af2a8b
2 changed files with 22 additions and 2 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Apr 30 01:00:13 UTC 2015 - crrodriguez@opensuse.org
- Switch to QT5 for Factory builds.
-------------------------------------------------------------------
Sat Jan 31 22:21:05 UTC 2015 - asterios.dramis@gmail.com

View File

@@ -1,7 +1,7 @@
#
# spec file for package librecad
#
# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2015 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
@@ -40,9 +40,19 @@ Patch3: librecad-install.diff
Patch4: librecad-plugindir.diff
BuildRequires: boost-devel
BuildRequires: fdupes
BuildRequires: freetype2-devel
BuildRequires: gcc-c++ >= 4.7
BuildRequires: libdxfrw-devel
%if 0%{?suse_version} > 1320
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Help)
BuildRequires: pkgconfig(Qt5PrintSupport)
BuildRequires: pkgconfig(Qt5Svg)
BuildRequires: pkgconfig(Qt5Widgets)
%else
BuildRequires: libqt4-devel
%endif
BuildRequires: muparser-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
@@ -88,7 +98,12 @@ rm -rf libraries/libdxfrw
sed -i 's/\r$//' LICENSE-MIT.txt license-lc_opengost-fonts.txt
%build
qmake librecad.pro CONFIG+="release" \
%if 0%{?suse_version} > 1320
qmake-qt5 \
%else
qmake \
%endif
librecad.pro CONFIG+="release" \
QMAKE_CFLAGS+="%optflags" QMAKE_CXXFLAGS+="%optflags"
make %{?_smp_mflags}
rm -f unix/resources/fonts/wqy-unicode.lff