[iris] use include/jdns instead of include/qjdns, that's what most consumers expect

[Rex Dieter]

commit 2c5c5ff8e9f6dd1710c12d99d4a9851155964ab8
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Jan 6 13:15:13 2012 -0600

    use include/jdns instead of include/qjdns, that's what most consumers expect

 iris-1.0.0-jdns_install.patch |    4 ++--
 iris.spec                     |    7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/iris-1.0.0-jdns_install.patch b/iris-1.0.0-jdns_install.patch
index 0fc5da2..2d03afb 100644
--- a/iris-1.0.0-jdns_install.patch
+++ b/iris-1.0.0-jdns_install.patch
@@ -47,7 +47,7 @@ diff -up iris-1.0.0/src/jdns/jdns.pro.jdns_install iris-1.0.0/src/jdns/jdns.pro
 +DESTDIR  = $$IRIS_BASE/lib
 +CONFIG  += dll create_prl
 +
-+headers.path = $$[QT_INSTALL_HEADERS]/qjdns
++headers.path = $$[QT_INSTALL_HEADERS]/jdns
 +headers.files = *.h
 +
 +INSTALLS += headers
@@ -58,7 +58,7 @@ diff -up iris-1.0.0/src/jdns/jdns.pro.jdns_install iris-1.0.0/src/jdns/jdns.pro
 +QMAKE_PKGCONFIG_NAME = qjdns
 +QMAKE_PKGCONFIG_DESCRIPTION = Qt bindings for JDNS
 +QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
-+QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
++QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/jdns
 +QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
 +QMAKE_PKGCONFIG_DESTDIR = pkgconfig
 +
diff --git a/iris.spec b/iris.spec
index 237cffb..22f373f 100644
--- a/iris.spec
+++ b/iris.spec
@@ -5,7 +5,7 @@
 Name:    iris
 Summary: A library for working with the XMPP/Jabber protocol 
 Version: 1.0.0
-Release: 0.8.%{snap}svn%{svn}%{?dist}
+Release: 0.9.%{snap}svn%{svn}%{?dist}
 License: LGPLv2+
 URL:     http://delta.affinix.com/iris/
 # svn export https://delta.affinix.com/svn/trunk/iris iris-1.0.0
@@ -117,12 +117,15 @@ test "$(pkg-config --modversion qjdns)" = "%{version}"
 %{_qt4_libdir}/libqjdns.so.1*
 
 %files -n qjdns-devel
-%{_qt4_headerdir}/qjdns/
+%{_qt4_headerdir}/jdns/
 %{_qt4_libdir}/libqjdns.so
 %{_qt4_libdir}/pkgconfig/qjdns.pc
 
 
 %changelog
+* Fri Jan 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.9.20110904svn812
+- use include/jdns instead of include/qjdns, that's what most consumers expect
+
 * Wed Nov 16 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.8.20110904svn812
 - fix Release