From 7c2c9caa2d8fc711ed72368c8c46091cb1190bda Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 19 Oct 2012 15:24:45 +0200 Subject: [PATCH] - updated to 1.14 (note: new sonames) - updated qt patch --- dnssec-tools-qt.patch | 20 ++++++++++---------- dnssec-tools.spec | 11 ++++++----- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dnssec-tools-qt.patch b/dnssec-tools-qt.patch index 16be251..b1ab87d 100644 --- a/dnssec-tools-qt.patch +++ b/dnssec-tools-qt.patch @@ -1,10 +1,10 @@ ---- dnssec-tools-1.13/validator/apps/dnssec-check/mainwindow.cpp.orig 2012-06-21 22:10:13.000000000 +0200 -+++ dnssec-tools-1.13/validator/apps/dnssec-check/mainwindow.cpp 2012-06-25 21:15:43.352058436 +0200 +--- dnssec-tools-1.14/validator/apps/dnssec-check/mainwindow.cpp.orig 2012-06-21 22:10:13.000000000 +0200 ++++ dnssec-tools-1.14/validator/apps/dnssec-check/mainwindow.cpp 2012-06-25 21:15:43.352058436 +0200 @@ -372,7 +372,6 @@ } accessURL.addQueryItem("locationDescription", locationDescription); -- accessURL.addQueryItem(".13"); +- accessURL.addQueryItem("1.14"); if (!m_manager) { m_manager = new QNetworkAccessManager(); @@ -19,23 +19,23 @@ for(deploymentfolder, DEPLOYMENTFOLDERS) { item = item$${deploymentfolder} itemfiles = $${item}.files ---- dnssec-tools-1.13/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig 2012-01-23 22:43:27.000000000 +0100 -+++ dnssec-tools-1.13/validator/apps/dnssec-nodes/dnssec-nodes.pro 2012-06-26 17:44:21.238964788 +0200 +--- dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig 2012-10-11 22:53:36.000000000 +0200 ++++ dnssec-tools-1.14/validator/apps/dnssec-nodes/dnssec-nodes.pro 2012-10-18 20:46:17.519926918 +0200 @@ -1,3 +1,4 @@ +PREFIX=/usr HEADERS += \ edge.h \ node.h \ -@@ -48,7 +49,7 @@ - DATADIR =$$PREFIX/share - INCLUDEPATH += ../../include +@@ -61,7 +62,7 @@ isEmpty(ANDROID_PLATFORM) { + QMAKE_LIBDIR += ../../libval/.libs + QMAKE_LIBDIR += ../../libsres/.libs - LIBS += -lval-threads -lsres -lnsl -lcrypto -lpthread -+ LIBS += -L../../libval/.libs -L../../libsres/.libs -lval-threads -lsres -lcrypto -lpthread ++ LIBS += -lval-threads -lsres -lcrypto -lpthread maemo5 { INCLUDEPATH += /opt/maemo/usr/include/ } -@@ -62,8 +63,6 @@ +@@ -75,8 +76,6 @@ # path to the harmattan libraries contains(MEEGO_EDITION,harmattan): { LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib diff --git a/dnssec-tools.spec b/dnssec-tools.spec index ce227e9..6113bae 100644 --- a/dnssec-tools.spec +++ b/dnssec-tools.spec @@ -6,12 +6,12 @@ Summary: DNSSEC tools Summary(pl.UTF-8): Narzędzia DNSSEC Name: dnssec-tools -Version: 1.13 +Version: 1.14 Release: 1 License: BSD Group: Applications/Networking Source0: http://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz -# Source0-md5: beb4d59c49a00799ec1dfbbd5c97a8a0 +# Source0-md5: ae5b854ecc586f61eba890e3b430de08 Patch0: %{name}-link.patch Patch1: %{name}-qt.patch URL: http://www.dnssec-tools.org/ @@ -173,6 +173,7 @@ rm -rf $RPM_BUILD_ROOT %attr(755,root,root) %{_bindir}/donuts %attr(755,root,root) %{_bindir}/donutsd %attr(755,root,root) %{_bindir}/drawvalmap +%attr(755,root,root) %{_bindir}/dt-danechk %attr(755,root,root) %{_bindir}/dt-getaddr %attr(755,root,root) %{_bindir}/dt-gethost %attr(755,root,root) %{_bindir}/dt-getname @@ -297,11 +298,11 @@ rm -rf $RPM_BUILD_ROOT %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libsres.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libsres.so.12 +%attr(755,root,root) %ghost %{_libdir}/libsres.so.13 %attr(755,root,root) %{_libdir}/libval-threads.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.12 +%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.13 %attr(755,root,root) %{_libdir}/libval_shim.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.12 +%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.13 %files devel %defattr(644,root,root,755) -- 2.44.0