From ce70cba5a8bc03546b8cb2e9915b8d14390ba551 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Thu, 29 May 2014 23:48:54 +0200 Subject: [PATCH] restore system-clucene patch, rm the bundled copy * Thu May 29 2014 Kevin Kofler 5.3.0-2 - restore system-clucene patch, rm the bundled copy If the patch does not work, FIX it! Just building using the bundled library is NOT acceptable, such a package is not allowed to go anywhere in Fedora (not even Rawhide). --- qt5-qttools.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/qt5-qttools.spec b/qt5-qttools.spec index 832664e..2d2d8be 100644 --- a/qt5-qttools.spec +++ b/qt5-qttools.spec @@ -12,7 +12,7 @@ Summary: Qt5 - QtTool components Name: qt5-qttools Version: 5.3.0 -Release: 1%{?dist} +Release: 2%{?dist} # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPLv2 with exceptions or GPLv3 with exceptions @@ -116,10 +116,9 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %setup -q -n qttools-opensource-src-%{version}%{?pre:-%{pre}} %if 0%{?system_clucene} -# %patch1 -p1 -b .system_clucene +%patch1 -p1 -b .system_clucene # bundled libs -#mv src/assistant/3rdparty/clucene \ -# src/assistant/3rdparty/clucene.BAK +rm -rf src/assistant/3rdparty/clucene %endif %patch2 -p1 -b .qmake-qt5 @@ -356,6 +355,9 @@ fi %changelog +* Thu May 29 2014 Kevin Kofler 5.3.0-2 +- restore system-clucene patch, rm the bundled copy + * Wed May 21 2014 Jan Grulich 5.3.0-1 - 5.3.0