- updated to 2.1 (note: new sonames)

- updated link,qt patches

diff --git a/dnssec-tools-link.patch b/dnssec-tools-link.patch
index 5d0d4148f65cda79b2cd81713b3d901818deb36f..66727f477f406d831817f1e8cdde32435d82f6e3 100644 (file)
--- a/dnssec-tools-link.patch
+++ b/dnssec-tools-link.patch
@@ -9,14 +9,14 @@
  
  install:
        $(MKPATH) $(DESTDIR)/$(libdir)
---- dnssec-tools-1.9/validator/libval/Makefile.in.orig 2009-04-17 17:38:24.000000000 +0200
-+++ dnssec-tools-1.9/validator/libval/Makefile.in      2011-05-20 22:23:03.510306736 +0200
-@@ -60,7 +60,7 @@ clean:
+--- dnssec-tools-2.1/validator/libval/Makefile.in.orig 2015-06-28 16:43:43.279673824 +0200
++++ dnssec-tools-2.1/validator/libval/Makefile.in      2015-06-28 17:25:10.899569429 +0200
+@@ -65,7 +65,7 @@
        $(RM) -rf $(LT_DIR)
  
  $(LIBVAL): $(LOBJ)
--      $(LIBTOOLLD) -o $@ $(LOBJ)
-+      $(LIBTOOLLD) -o $@ $(LOBJ) ../libsres/libsres.la -lssl -lcrypto -pthread
+-      $(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES)
++      $(LIBTOOLLD) -o $@ $(LOBJ) $(LSRES) -lssl -lcrypto -lpthread
  
  install:
-       $(MKPATH) $(DESTDIR)/$(libdir)
+       $(MKPATH) $(DESTDIR)$(libdir)

diff --git a/dnssec-tools-qt.patch b/dnssec-tools-qt.patch
index dbfa1f7c091b80a6b87e60f38d6267902924c3d5..17d796f7e99796f9100abe9f8ac00876dfbef311 100644 (file)
--- a/dnssec-tools-qt.patch
+++ b/dnssec-tools-qt.patch
@@ -1,31 +1,31 @@
---- 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 @@
-             QMAKE_EXTRA_TARGETS += first copydeploymentfolders
-         }
+--- dnssec-tools-2.1/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri.orig    2015-06-28 17:29:18.722892362 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-check/qmlapplicationviewer/qmlapplicationviewer.pri 2015-06-28 18:09:04.399458910 +0200
+@@ -155,7 +155,7 @@
+     !isEmpty(target.path) {
+         installPrefix = $${target.path}
+     } else {
+-        installPrefix = /opt/$${TARGET}
++        installPrefix = /usr
      }
--    installPrefix = /opt/$${TARGET}
-+    installPrefix = /usr
      for(deploymentfolder, DEPLOYMENTFOLDERS) {
          item = item$${deploymentfolder}
-         itemfiles = $${item}.files
---- 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
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/dnssec-nodes.pro.orig 2014-08-15 22:20:16.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/dnssec-nodes.pro      2015-06-28 18:13:19.206114883 +0200
 @@ -1,3 +1,4 @@
 +PREFIX=/usr
  HEADERS += \
          edge.h \
          node.h \
-@@ -61,7 +62,7 @@
+@@ -70,7 +71,7 @@
  isEmpty(ANDROID_PLATFORM) {
      QMAKE_LIBDIR     += ../../libval/.libs
      QMAKE_LIBDIR     += ../../libsres/.libs
--    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lpthread
+-    LIBS        += -lval-threads -lsres -lnsl -lcrypto -lssl -lpthread
 +    LIBS        += -lval-threads -lsres -lcrypto -lpthread
-     maemo5 {
-         INCLUDEPATH += /opt/maemo/usr/include/
-     }
-@@ -75,8 +76,6 @@
+     contains(MEEGO_EDITION,harmattan): {
+         QMAKE_LIBDIR += /scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
+     } else:osx {
+@@ -93,8 +94,6 @@
  # path to the harmattan libraries
  contains(MEEGO_EDITION,harmattan): {
      LIBS += -L/scratchbox/users/hardaker/targets/HARMATTAN_ARMEL/usr/lib
@@ -33,7 +33,7 @@
 -    LIBS += -L/usr/local/lib
  }
  
- QT += network
+ QT += network widgets core
 --- dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro.orig    2011-10-25 22:45:08.000000000 +0200
 +++ dnssec-tools-1.13/validator/apps/dnssec-system-tray/dnssec-system-tray.pro 2012-06-30 12:17:05.175285379 +0200
 @@ -1,3 +1,4 @@
@@ -77,3 +77,439 @@
    iconxpm.files += ../data/maemo/$${TARGET}.xpm
  
    icon26.path = $$DATADIR/icons/hicolor/26x26/apps
+--- dnssec-tools-2.1/validator/apps/dnssec-check/DnssecCheckVersion.h.orig     2014-09-05 19:19:50.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-check/DnssecCheckVersion.h  2015-06-28 18:52:38.019349227 +0200
+@@ -1,6 +1,6 @@
+ #ifndef DNSSECCHECKVERSION_H
+ #define DNSSECCHECKVERSION_H
+ 
+-#define .1"
++#define DNSSEC_CHECK_VERSION "2.1"
+ 
+ #endif // DNSSECCHECKVERSION_H
+--- dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.h.orig   2011-10-10 23:14:45.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.h        2015-06-28 20:54:41.575708553 +0200
+@@ -2,7 +2,7 @@
+ #define SUBMITDIALOG_H
+ 
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QLineEdit>
+ 
+ class SubmitDialog : public QDialog
+--- dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.cpp.orig 2011-10-10 23:14:45.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-check/SubmitDialog.cpp      2015-06-28 21:05:45.832347343 +0200
+@@ -1,7 +1,7 @@
+ #include "SubmitDialog.h"
+ 
+-#include <QtGui/QLabel>
+-#include <QtGui/QDialogButtonBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QDialogButtonBox>
+ 
+ SubmitDialog::SubmitDialog(QWidget *parent) :
+     QDialog(parent)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/node.h.orig   2013-02-15 02:22:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/node.h        2015-06-28 21:12:46.145663038 +0200
+@@ -41,7 +41,7 @@
+ #ifndef NODE_H
+ #define NODE_H
+ 
+-#include <QtGui/QGraphicsItem>
++#include <QtWidgets/QGraphicsItem>
+ #include <QtCore/QList>
+ #include <QtCore/QSet>
+ 
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h.orig       2011-10-06 07:54:18.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/TypeMenu.h    2015-06-28 21:29:20.215621321 +0200
+@@ -2,9 +2,9 @@
+ #define TYPEMENU_H
+ 
+ #include <QObject>
+-#include <QtGui/QMenu>
++#include <QtWidgets/QMenu>
+ #include <QtCore/QSignalMapper>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+ 
+ class TypeMenu : public QObject
+ {
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h.orig     2013-02-14 15:41:49.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.h  2015-06-29 16:45:19.232710599 +0200
+@@ -2,10 +2,10 @@
+ #define MAINWINDOW_H
+ 
+ #include <QMainWindow>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QMenuBar>
+-#include <QtGui/QTabWidget>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QMenuBar>
++#include <QtWidgets/QTabWidget>
+ 
+ #include "graphwidget.h"
+ #include "TypeMenu.h"
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h.orig  2012-10-11 23:01:57.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.h       2015-06-29 16:56:22.182682775 +0200
+@@ -3,11 +3,11 @@
+ 
+ #include <QDialog>
+ #include <QObject>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QDialogButtonBox>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QDialogButtonBox>
+ #include <QtCore/QSignalMapper>
+-#include <QtGui/QTabWidget>
+-#include <QtGui/QTableWidgetItem>
++#include <QtWidgets/QTabWidget>
++#include <QtWidgets/QTableWidgetItem>
+ #include "node.h"
+ #include <QLabel>
+ 
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h.orig 2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/Filter.h      2015-06-29 17:03:45.735997496 +0200
+@@ -2,7 +2,7 @@
+ #define FILTER_H
+ 
+ #include <QObject>
+-#include <QtGui/QHBoxLayout>
++#include <QtWidgets/QHBoxLayout>
+ 
+ #include "node.h"
+ #include <qdebug.h>
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h.orig     2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.h  2015-06-29 17:12:13.345976194 +0200
+@@ -5,7 +5,7 @@
+ #include "node.h"
+ 
+ #include <QtCore/QSignalMapper>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+ 
+ class DNSSECStatusFilter : public Filter
+ {
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h.orig     2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.h  2015-06-29 17:53:46.785871554 +0200
+@@ -4,7 +4,7 @@
+ #include "Filter.h"
+ #include "TypeMenu.h"
+ 
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+ #include <QtCore/QSignalMapper>
+ 
+ class TypeFilter : public Filter
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h.orig       2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodeList.h    2015-06-29 18:07:30.795836973 +0200
+@@ -10,7 +10,7 @@
+ #include "Filters/Filter.h"
+ #include "FilterEditorWindow.h"
+ 
+-#include <QtGui/QHBoxLayout>
++#include <QtWidgets/QHBoxLayout>
+ 
+ class GraphWidget;
+ class DNSData;
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h.orig       2011-09-23 19:54:13.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.h    2015-06-29 18:42:27.702415642 +0200
+@@ -2,11 +2,11 @@
+ #define NODESPREFERENCES_H
+ 
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QFormLayout>
+-#include <QtGui/QSpinBox>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QFormLayout>
++#include <QtWidgets/QSpinBox>
+ #include <QtCore/QSettings>
+-#include <QtGui/QCheckBox>
++#include <QtWidgets/QCheckBox>
+ 
+ class NodesPreferences : public QDialog
+ {
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h.orig  2011-10-07 16:23:49.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.h       2015-06-29 19:20:40.992319401 +0200
+@@ -2,11 +2,11 @@
+ #define LOGFILEPICKER_H
+ 
+ #include <QDialog>
+-#include <QtGui/QHBoxLayout>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QHBoxLayout>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QLineEdit>
+ #include <QtCore/QString>
+-#include <QtGui/QCheckBox>
++#include <QtWidgets/QCheckBox>
+ 
+ class LogFilePicker : public QDialog
+ {
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp.orig     2011-09-23 19:54:13.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/NodesPreferences.cpp  2015-06-29 19:30:12.122295433 +0200
+@@ -1,6 +1,6 @@
+ #include "NodesPreferences.h"
+ 
+-#include <QtGui/QDialogButtonBox>
++#include <QtWidgets/QDialogButtonBox>
+ 
+ NodesPreferences::NodesPreferences(QSettings *settings, QWidget *parent) :
+     QDialog(parent), m_settings(settings)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp.orig        2014-08-15 22:20:16.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/DetailsViewer.cpp     2015-06-29 20:04:58.995541190 +0200
+@@ -1,17 +1,17 @@
+ #include "DetailsViewer.h"
+ 
+ #define QT_NO_PRINTER
+-#include <QtGui/QLabel>
+-#include <QtGui/QTextEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QTextEdit>
+ #include <QtGui/QFont>
+-#include <QtGui/QFormLayout>
++#include <QtWidgets/QFormLayout>
+ #include <QtGui/QStandardItemModel>
+-#include <QtGui/QTableView>
+-#include <QtGui/QTableWidget>
+-#include <QtGui/QHeaderView>
++#include <QtWidgets/QTableView>
++#include <QtWidgets/QTableWidget>
++#include <QtWidgets/QHeaderView>
+ #include <QtGui/QIcon>
+ #include <QtGui/QPainter>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QPushButton>
+ 
+ #include "ValidateViewWidgetHolder.h"
+ 
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp.orig   2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/DNSSECStatusFilter.cpp        2015-06-29 20:55:45.965413320 +0200
+@@ -1,7 +1,7 @@
+ #include "DNSSECStatusFilter.h"
+ 
+-#include <QtGui/QMenu>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QMenu>
++#include <QtWidgets/QLabel>
+ 
+ DNSSECStatusFilter::DNSSECStatusFilter(int dnssecValitiy, bool requireAll)
+     : Filter(), m_dnssecValidity(dnssecValitiy), m_requireAll(requireAll), m_mapper(), m_menuButton(0)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp.orig   2013-02-14 19:01:09.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/NameFilter.cpp        2015-06-29 21:30:57.028658061 +0200
+@@ -1,7 +1,7 @@
+ #include "NameFilter.h"
+ 
+-#include <QtGui/QLabel>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QLineEdit>
+ #include <qdebug.h>
+ 
+ NameFilter::NameFilter(const QString &searchName, QObject *parent)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp.orig   2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Filters/TypeFilter.cpp        2015-06-29 21:36:20.908644468 +0200
+@@ -1,7 +1,7 @@
+ #include "TypeFilter.h"
+ 
+-#include <QtGui/QLabel>
+-#include <QtGui/QMenu>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QMenu>
+ 
+ #include <qdebug.h>
+ 
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp.orig        2011-10-07 16:23:49.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/LogFilePicker.cpp     2015-06-29 21:43:27.271959910 +0200
+@@ -1,10 +1,10 @@
+ #include "LogFilePicker.h"
+ 
+-#include <QtGui/QLabel>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QDialogButtonBox>
+-#include <QtGui/QFileDialog>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QDialogButtonBox>
++#include <QtWidgets/QFileDialog>
+ 
+ LogFilePicker::LogFilePicker(QString defaultFile, QWidget *parent) :
+     QDialog(parent)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp.orig       2012-10-25 06:36:17.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/Legend.cpp    2015-06-29 21:52:30.241937125 +0200
+@@ -1,14 +1,14 @@
+ #include "Legend.h"
+ 
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QLabel>
+-#include <QtGui/QDialogButtonBox>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QDialogButtonBox>
+ #include <QTableWidget>
+ #include <QtGui/QPainter>
+ #include <QtGui/QPixmap>
+ #include <QtGui/QIcon>
+-#include <QtGui/QTableWidgetItem>
+-#include <QtGui/QHeaderView>
++#include <QtWidgets/QTableWidgetItem>
++#include <QtWidgets/QHeaderView>
+ 
+ #include <qdebug.h>
+ 
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp.orig   2013-02-15 22:41:19.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/MainWindow.cpp        2015-06-29 21:53:47.315267221 +0200
+@@ -1,6 +1,6 @@
+ #include "MainWindow.h"
+ 
+-#include <QtGui/QMessageBox>
++#include <QtWidgets/QMessageBox>
+ 
+ #include "NodeList.h"
+ #include "LogWatcher.h"
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp.orig   2013-02-14 15:43:03.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/FilterEditorWindow.cpp        2015-06-29 21:54:30.511932075 +0200
+@@ -1,8 +1,8 @@
+ #include "FilterEditorWindow.h"
+ 
+-#include <QtGui/QLabel>
+-#include <QtGui/QDialogButtonBox>
+-#include <QtGui/QGroupBox>
++#include <QtWidgets/QLabel>
++#include <QtWidgets/QDialogButtonBox>
++#include <QtWidgets/QGroupBox>
+ 
+ FilterEditorWindow::FilterEditorWindow(NodeList *nodeList, QWidget *parent) :
+     QDialog(parent), m_nodeList(nodeList)
+--- dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp.orig  2014-08-15 22:20:16.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-nodes/PcapWatcher.cpp       2015-06-30 18:03:22.995554842 +0200
+@@ -10,7 +10,7 @@
+ #ifndef __MINGW_GCC
+ #include <arpa/inet.h>
+ #endif /* ! __MINGW_GCC */
+-#include <QtGui/QAction>
++#include <QtWidgets/QAction>
+ #include <QFileDialog>
+ 
+ typedef u_int32_t tcp_seq;
+--- dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h.orig       2014-08-28 20:26:59.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/dnssec-system-tray.h    2015-06-30 21:06:15.311761043 +0200
+@@ -45,10 +45,10 @@
+ 
+ #include <QSystemTrayIcon>
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QLabel>
+ #include <QtGui/QIcon>
+-#include <QtGui/QTableWidget>
++#include <QtWidgets/QTableWidget>
+ #include <QtCore/QFile>
+ #include <QtCore/QTextStream>
+ #include <QtCore/QRegExp>
+@@ -56,7 +56,7 @@
+ #include <QtGui/QIcon>
+ #include <QtCore/QMap>
+ #include <QtCore/QDateTime>
+-#include <QtGui/QMainWindow>
++#include <QtWidgets/QMainWindow>
+ 
+ class DNSTrayData {
+ public:
+--- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h.orig    2014-08-28 20:26:59.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.h 2015-07-01 16:07:25.758887612 +0200
+@@ -4,12 +4,12 @@
+ #define QT_NO_PRINTER
+ 
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QFormLayout>
+-#include <QtGui/QLineEdit>
+-#include <QtGui/QSpinBox>
+-#include <QtGui/QCheckBox>
+-#include <QtGui/QTextEdit>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QFormLayout>
++#include <QtWidgets/QLineEdit>
++#include <QtWidgets/QSpinBox>
++#include <QtWidgets/QCheckBox>
++#include <QtWidgets/QTextEdit>
+ 
+ class DnssecSystemTrayPrefs : public QDialog
+ {
+--- dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp.orig  2012-01-20 19:53:52.000000000 +0100
++++ dnssec-tools-2.1/validator/apps/dnssec-system-tray/DnssecSystemTrayPrefs.cpp       2015-07-01 16:08:09.728885767 +0200
+@@ -1,10 +1,10 @@
+ #include "DnssecSystemTrayPrefs.h"
+ 
+ #include <QtCore/QSettings>
+-#include <QtGui/QDialogButtonBox>
+-#include <QtGui/QPushButton>
+-#include <QtGui/QFileDialog>
+-#include <QtGui/QLabel>
++#include <QtWidgets/QDialogButtonBox>
++#include <QtWidgets/QPushButton>
++#include <QtWidgets/QFileDialog>
++#include <QtWidgets/QLabel>
+ #include <QtGui/QFont>
+ 
+ DnssecSystemTrayPrefs::DnssecSystemTrayPrefs(QWidget *parent) :
+--- dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp.orig 2014-08-26 19:09:59.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/lookup/src/qtmain.cpp      2015-07-01 16:42:27.378799415 +0200
+@@ -3,8 +3,8 @@
+  * Author: hardaker
+  */
+ #include <QWidget>
+-#include <QtGui/QApplication>
+-#include <QtGui/QPushButton>
++#include <QtWidgets/QApplication>
++#include <QtWidgets/QPushButton>
+ 
+ #include "lookup.h"
+ 
+--- dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h.orig    2011-05-18 22:15:55.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/lookup/src/QDNSItemModel.h 2015-07-01 16:43:11.965464211 +0200
+@@ -1,7 +1,7 @@
+ #ifndef QDNSITEMMODEL_H
+ #define QDNSITEMMODEL_H
+ 
+-#include <QtGui/QWidget>
++#include <QtWidgets/QWidget>
+ #include <QtGui/QStandardItemModel>
+ 
+ #if (defined(Q_WS_MAEMO_5) || defined(MAEMO_CHANGES))
+--- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h.orig      2014-08-26 19:09:59.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.h   2015-07-01 16:43:40.142129695 +0200
+@@ -2,9 +2,9 @@
+ #define LOOKUPPREFS_H
+ 
+ #include <QDialog>
+-#include <QtGui/QVBoxLayout>
+-#include <QtGui/QFormLayout>
+-#include <QtGui/QLineEdit>
++#include <QtWidgets/QVBoxLayout>
++#include <QtWidgets/QFormLayout>
++#include <QtWidgets/QLineEdit>
+ #include <QWidget>
+ 
+ class LookupPrefs : public QDialog
+--- dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp.orig    2014-08-26 19:09:59.000000000 +0200
++++ dnssec-tools-2.1/validator/apps/lookup/src/LookupPrefs.cpp 2015-07-01 16:47:07.335454333 +0200
+@@ -1,7 +1,7 @@
+ #include <QWidget>
+ #include "LookupPrefs.h"
+-#include <QtGui/QWidget>
+-#include <QtGui/QDialogButtonBox>
++#include <QtWidgets/QWidget>
++#include <QtWidgets/QDialogButtonBox>
+ #include <QtCore/QSettings>
+ LookupPrefs::LookupPrefs(QWidget *parent) :
+     QDialog(parent)

diff --git a/dnssec-tools.spec b/dnssec-tools.spec
index d7bd5721bb23b80815c4c70544c3b4c220a58c18..8e59ca222379f0358f325a69fb020dda59dbada6 100644 (file)
--- a/dnssec-tools.spec
+++ b/dnssec-tools.spec
@@ -8,12 +8,12 @@
 Summary:       DNSSEC tools
 Summary(pl.UTF-8):     Narzędzia DNSSEC
 Name:          dnssec-tools
-Version:       2.0
-Release:       4
+Version:       2.1
+Release:       1
 License:       BSD
 Group:         Applications/Networking
 Source0:       http://www.dnssec-tools.org/download/%{name}-%{version}.tar.gz
-# Source0-md5: b738664499c150cf81a1c4307ff07e0f
+# Source0-md5: b4c76b325c380780682a548730d3e09a
 Patch0:                %{name}-link.patch
 Patch1:                %{name}-qt.patch
 URL:           http://www.dnssec-tools.org/
@@ -26,13 +26,16 @@ BuildRequires:      perl-base
 BuildRequires: perl-devel >= 1:5.8.0
 BuildRequires: rpm-perlprov >= 4.1-13
 %if %{with qt}
-BuildRequires: QtCore-devel >= 4
-BuildRequires: QtDeclarative-devel >= 4
-BuildRequires: QtGui-devel >= 4
-BuildRequires: QtNetwork-devel >= 4
-BuildRequires: QtSvg-devel >= 4
-BuildRequires: QtXml-devel >= 4
-BuildRequires: qt4-qmake >= 4
+BuildRequires: Qt5Core-devel >= 5
+BuildRequires: Qt5Declarative-devel >= 5
+BuildRequires: Qt5Gui-devel >= 5
+BuildRequires: Qt5Network-devel >= 5
+BuildRequires: Qt5Qml-devel >= 5
+BuildRequires: Qt5Quick-devel >= 5
+BuildRequires: Qt5Svg-devel >= 5
+BuildRequires: Qt5Widgets-devel >= 5
+BuildRequires: Qt5Xml-devel >= 5
+BuildRequires: qt5-qmake >= 5
 %endif
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      perl-%{name} = %{version}-%{release}
@@ -119,6 +122,7 @@ Moduły Perla wspierające DNSSEC.
 
 %build
 %configure \
+       ac_cv_lib_nsl_inet_ntop=no \
        --disable-bind-checks \
        --with-dlv \
        --with-ipv6 \
@@ -130,7 +134,8 @@ Moduły Perla wspierające DNSSEC.
 cd validator/apps
 for d in dnssec-check dnssec-nodes dnssec-system-tray lookup ; do
        cd $d
-       qmake-qt4 \
+       qmake-qt5 \
+               PREFIX=%{_prefix} \
                QMAKE_CXX="%{__cxx}" \
                QMAKE_CXXFLAGS_RELEASE="%{rpmcxxflags}" \
                QMAKE_LFLAGS_RELEASE="%{rpmldflags}"
@@ -147,13 +152,22 @@ rm -rf $RPM_BUILD_ROOT
 %if %{with qt}
 for d in dnssec-check dnssec-nodes dnssec-system-tray lookup ; do
        %{__make} install -C validator/apps/$d \
+               DESTDIR=$RPM_BUILD_ROOT \
                INSTALL_ROOT=$RPM_BUILD_ROOT
 done
+
+# omitted from make install
+install -Dp validator/apps/dnssec-check/images/dnssec-check-32x32.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/32x32/apps/dnssec-check.png
+install -Dp validator/apps/dnssec-check/images/dnssec-check-48x48.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/48x48/apps/dnssec-check.png
+install -Dp validator/apps/dnssec-check/images/dnssec-check-64x64.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/64x64/apps/dnssec-check.png
+install -Dp validator/apps/dnssec-check/images/dnssec-check-512.png $RPM_BUILD_ROOT%{_iconsdir}/hicolor/512x512/apps/dnssec-check.png
+install -Dp validator/apps/dnssec-check/images/dnssec-check.svg $RPM_BUILD_ROOT%{_iconsdir}/hicolor/scalable/apps/dnssec-check.svg
+sed -e 's,^Exec=.*,Exec=%{_bindir}/dnssec-check,' validator/apps/dnssec-check/dnssec-check.desktop >$RPM_BUILD_ROOT%{_desktopdir}/dnssec-check.desktop
 %endif
 
+%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/Net/DNS/SEC/examples.pl \
+       $RPM_BUILD_ROOT%{_mandir}/man3/Net::DNS::SEC::examples.3pm
 find $RPM_BUILD_ROOT%{perl_vendorarch}/auto -name .packlist | xargs -r %{__rm}
-# bugfix
-%{__mv} $RPM_BUILD_ROOT%{_mandir}/man1/{dt-,}libval_check_conf.1
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -181,6 +195,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dt-getname
 %attr(755,root,root) %{_bindir}/dt-getquery
 %attr(755,root,root) %{_bindir}/dt-getrrset
+%attr(755,root,root) %{_bindir}/dt-libval_check_conf
 %attr(755,root,root) %{_bindir}/dt-validate
 %attr(755,root,root) %{_bindir}/dtck
 %attr(755,root,root) %{_bindir}/dtconf
@@ -197,7 +212,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/keyarch
 %attr(755,root,root) %{_bindir}/keymod
 %attr(755,root,root) %{_bindir}/krfcheck
-%attr(755,root,root) %{_bindir}/libval_check_conf
 %attr(755,root,root) %{_bindir}/lights
 %attr(755,root,root) %{_bindir}/lsdnssec
 %attr(755,root,root) %{_bindir}/lskrf
@@ -237,6 +251,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/donuts.1p*
 %{_mandir}/man1/donutsd.1p*
 %{_mandir}/man1/drawvalmap.1p*
+%{_mandir}/man1/dt-danechk.1*
+%{_mandir}/man1/dt-libval_check_conf.1*
 %{_mandir}/man1/dt-getaddr.1*
 %{_mandir}/man1/dt-gethost.1*
 %{_mandir}/man1/dt-getname.1*
@@ -258,7 +274,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/keyarch.1p*
 %{_mandir}/man1/keymod.1p*
 %{_mandir}/man1/krfcheck.1p*
-%{_mandir}/man1/libval_check_conf.1*
 %{_mandir}/man1/lights.1p*
 %{_mandir}/man1/lsdnssec.1p*
 %{_mandir}/man1/lskrf.1p*
@@ -291,20 +306,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/dnssec-system-tray
 %attr(755,root,root) %{_bindir}/lookup
 %{_desktopdir}/dnssec-check.desktop
+%{_desktopdir}/dnssec-nodes.desktop
 %{_desktopdir}/lookup.desktop
 %{_iconsdir}/hicolor/48x48/apps/lookup.png
-%{_iconsdir}/hicolor/64x64/apps/dnssec-check.png
+%{_iconsdir}/hicolor/*x*/apps/dnssec-check.png
+%{_iconsdir}/hicolor/scalable/apps/dnssec-check.svg
 %{_pixmapsdir}/lookup.xpm
 %endif
 
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libsres.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libsres.so.14
+%attr(755,root,root) %ghost %{_libdir}/libsres.so.15
 %attr(755,root,root) %{_libdir}/libval-threads.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.14
+%attr(755,root,root) %ghost %{_libdir}/libval-threads.so.15
 %attr(755,root,root) %{_libdir}/libval_shim.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.14
+%attr(755,root,root) %ghost %{_libdir}/libval_shim.so.15
 
 %files devel
 %defattr(644,root,root,755)
@@ -320,8 +337,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man3/dnsval_conf*.3*
 %{_mandir}/man3/libsres.3*
 %{_mandir}/man3/libval.3*
+%{_mandir}/man3/libval_async.3*
 %{_mandir}/man3/libval_shim.3*
 %{_mandir}/man3/p_ac_status.3*
+%{_mandir}/man3/p_dane_error.3*
 %{_mandir}/man3/p_val_status.3*
 %{_mandir}/man3/resolv_conf_*.3*
 %{_mandir}/man3/root_hints_*.3*