[packages/dnssec-tools] - updated to 2.0 - updated link,qt patches

[qboosh]

commit cafb035b3180c359dbbc21f662d823083530ff6e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Mar 2 09:28:52 2013 +0100

    - updated to 2.0
    - updated link,qt patches

 dnssec-tools-link.patch |  2 +-
 dnssec-tools-qt.patch   | 16 +++-------------
 dnssec-tools.spec       | 10 +++++-----
 3 files changed, 9 insertions(+), 19 deletions(-)
---
diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index 6113bae..4647784 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.14
+Version:	2.0
 Release:	1
 License:	BSD
 Group:		Applications/Networking
 Source0:	http://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
-# Source0-md5:	ae5b854ecc586f61eba890e3b430de08
+# Source0-md5:	b738664499c150cf81a1c4307ff07e0f
 Patch0:		%{name}-link.patch
 Patch1:		%{name}-qt.patch
 URL:		http://www.dnssec-tools.org/
@@ -298,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.13
+%attr(755,root,root) %ghost %{_libdir}/libsres.so.14
 %attr(755,root,root) %{_libdir}/libval-threads.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.13
+%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.14
 %attr(755,root,root) %{_libdir}/libval_shim.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.13
+%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.14
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/dnssec-tools-link.patch b/dnssec-tools-link.patch
index b20e234..5d0d414 100644
--- a/dnssec-tools-link.patch
+++ b/dnssec-tools-link.patch
@@ -16,7 +16,7 @@
  
  $(LIBVAL): $(LOBJ)
 -	$(LIBTOOLLD) -o $@ $(LOBJ)
-+	$(LIBTOOLLD) -o $@ $(LOBJ) ../libsres/libsres.la -lcrypto -pthread
++	$(LIBTOOLLD) -o $@ $(LOBJ) ../libsres/libsres.la -lssl -lcrypto -pthread
  
  install:
  	$(MKPATH) $(DESTDIR)/$(libdir)
diff --git a/dnssec-tools-qt.patch b/dnssec-tools-qt.patch
index b1ab87d..dbfa1f7 100644
--- a/dnssec-tools-qt.patch
+++ b/dnssec-tools-qt.patch
@@ -1,13 +1,3 @@
---- 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("1.14");
- 
-     if (!m_manager) {
-         m_manager = new QNetworkAccessManager();
 --- dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri.orig	2012-02-04 01:50:50.000000000 +0100
 +++ dnssec-tools-1.13/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri	2012-06-27 19:03:22.065139970 +0200
 @@ -113,7 +113,7 @@
@@ -51,13 +41,13 @@
  TARGET=dnssec-system-tray
  
  HEADERS       = dnssec-system-tray.h \
---- dnssec-tools-1.13/validator/apps/lookup/src/src.pro.orig	2012-06-21 22:02:39.000000000 +0200
-+++ dnssec-tools-1.13/validator/apps/lookup/src/src.pro	2012-06-26 18:43:52.315481592 +0200
+--- dnssec-tools-2.0/validator/apps/lookup/src/src.pro.orig	2013-02-20 23:33:14.000000000 +0100
++++ dnssec-tools-2.0/validator/apps/lookup/src/src.pro	2013-03-01 22:10:35.688684940 +0100
 @@ -11,7 +11,7 @@
  INCLUDEPATH += /home/hardaker/src/dnssec/dnssec-tools.git/dnssec-tools/validator/include
  
  isEmpty(ANDROID_PLATFORM) {
--    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lpthread
+-    LIBS        += -lval-threads -lsres -lnsl -lssl -lcrypto -lpthread
 +    LIBS        += -L../../../libval/.libs -L../../../libsres/.libs -lval-threads -lsres -lcrypto -lpthread
  } else {
      LIBS        += -L/opt/android-external-openssl/lib/
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/dnssec-tools.git/commitdiff/cafb035b3180c359dbbc21f662d823083530ff6e