Attachment 1049922 Details for Bug 1234209 – set QT_MULTI=OFF for Qt4 build, maintain api/abi

[patch] set QT_MULTI=OFF for Qt4 build, maintain api/abi

jdns.diff (text/plain), 1.24 KB, created by Rex Dieter on 2015-07-08 16:39:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Rex Dieter

Created: 2015-07-08 16:39:09 UTC

Size: 1.24 KB

patch

obsolete

>diff --git a/jdns.spec b/jdns.spec
>index d34945a..9626469 100644
>--- a/jdns.spec
>+++ b/jdns.spec
>@@ -1,6 +1,6 @@
> Name:           jdns
>-Version:        2.0.2
>-Release:        4%{?dist}
>+Version:        2.0.3
>+Release:        1%{?dist}
> Summary:        A simple DNS queries library
> 
> License:        MIT
>@@ -10,8 +10,6 @@ Source0:        http://delta.affinix.com/download/%{name}-%{version}.tar.bz2
> ## upstream patches
> 
> ## upstreamable patches
>-# support qt4/qt5 parallel-installability
>-Patch1: jdns-2.0.2-qt5.patch
> 
> BuildRequires:  cmake
> BuildRequires:  pkgconfig(QtCore) pkgconfig(QtNetwork)
>@@ -77,8 +75,6 @@ developing applications that use qjdns-qt5.
> %prep
> %setup -q
> 
>-%patch1 -p1 -b .qt5
>-
> 
> %build
> mkdir %{_target_platform}-qt5
>@@ -95,7 +91,8 @@ mkdir %{_target_platform}
> pushd %{_target_platform}
> %{cmake} .. \
>   -DCMAKE_BUILD_TYPE:STRING="Release" \
>-  -DQT4_BUILD:BOOL=ON
>+  -DMULTI_QT:BOOL=OFF \
>+  -DQT4_BUILD:BOOL=ON \
> 
> make %{?_smp_mflags}
> popd
>@@ -158,6 +155,9 @@ test "$(pkg-config --modversion qjdns-qt5)" = "%{version}"
> 
> 
> %changelog
>+* Wed Jul 08 2015 Rex Dieter <rdieter@fedoraproject.org> 2.0.3-1
>+- 2.0.3
>+
> * Mon Jun 22 2015 Rex Dieter <rdieter@fedoraproject.org> 2.0.2-4
> - parallel-installable -qt5 support (#1234209)
>

Actions: View | Diff

Attachments on bug 1234209: 1049704 | 1049922