[iris] fix iris headers (#772410)
Rex Dieter
rdieter at fedoraproject.org
Sat Jan 7 21:31:30 UTC 2012
commit edda959aec338d5042bbbb035a2c54f1bccc8a1c
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sat Jan 7 15:31:30 2012 -0600
fix iris headers (#772410)
iris-1.0.0-install.patch | 214 +++++++++++++++++++++++++++++++++++++++++++---
iris.spec | 11 ++-
2 files changed, 210 insertions(+), 15 deletions(-)
---
diff --git a/iris-1.0.0-install.patch b/iris-1.0.0-install.patch
index bc29235..cdc225e 100644
--- a/iris-1.0.0-install.patch
+++ b/iris-1.0.0-install.patch
@@ -1,6 +1,6 @@
diff -up iris-1.0.0/iris.pri.install iris-1.0.0/iris.pri
---- iris-1.0.0/iris.pri.install 2008-08-27 22:07:23.000000000 -0400
-+++ iris-1.0.0/iris.pri 2011-10-26 13:38:45.809547838 -0400
+--- iris-1.0.0/iris.pri.install 2008-08-27 21:07:23.000000000 -0500
++++ iris-1.0.0/iris.pri 2012-01-07 14:54:43.861308839 -0600
@@ -9,7 +9,8 @@ iris_bundle:{
include(src/xmpp/xmpp.pri)
}
@@ -21,20 +21,206 @@ diff -up iris-1.0.0/iris.pri.install iris-1.0.0/iris.pri
windows:LIBS += -lWs2_32 -lAdvapi32 # from jdns
}
diff -up iris-1.0.0/iris.pro.install iris-1.0.0/iris.pro
---- iris-1.0.0/iris.pro.install 2009-07-03 14:45:50.000000000 -0400
-+++ iris-1.0.0/iris.pro 2011-10-26 13:36:01.203604332 -0400
-@@ -19,3 +19,8 @@ sub_tools.depends = sub_src
+--- iris-1.0.0/iris.pro.install 2009-07-03 13:45:50.000000000 -0500
++++ iris-1.0.0/iris.pro 2012-01-07 15:07:52.833445330 -0600
+@@ -19,3 +19,194 @@ sub_tools.depends = sub_src
build_src:SUBDIRS += sub_src
!no_tests:SUBDIRS += sub_tools
+
+headers.path = $$[QT_INSTALL_HEADERS]/iris
-+headers.files = include/iris/*.h
++headers.files += \
++src/irisnet/corelib/addressresolver.h \
++src/irisnet/noncore/cutestuff/bsocket.h \
++src/irisnet/noncore/cutestuff/bytestream.h \
++src/xmpp/xmpp-im/filetransfer.h \
++src/irisnet/noncore/cutestuff/httpconnect.h \
++src/irisnet/noncore/cutestuff/httppoll.h \
++src/irisnet/noncore/ice176.h \
++src/xmpp/xmpp-im/im.h \
++src/irisnet/corelib/irisnetexport.h \
++src/irisnet/corelib/irisnetglobal.h \
++src/irisnet/corelib/irisnetplugin.h \
++src/irisnet/corelib/jdnsshared.h \
++src/irisnet/noncore/legacy/ndns.h \
++src/irisnet/corelib/netavailability.h \
++src/irisnet/corelib/netinterface.h \
++src/irisnet/corelib/netnames.h \
++src/irisnet/corelib/objectsession.h \
++src/irisnet/noncore/processquit.h \
++src/jdns/qjdns.h \
++src/xmpp/xmpp-im/s5b.h \
++src/irisnet/noncore/legacy/safedelete.h \
++src/irisnet/noncore/legacy/servsock.h \
++src/irisnet/noncore/cutestuff/socks.h \
++src/irisnet/noncore/legacy/srvresolver.h \
++src/irisnet/noncore/stunallocate.h \
++src/irisnet/noncore/stunbinding.h \
++src/irisnet/noncore/stunmessage.h \
++src/irisnet/noncore/stuntransaction.h \
++src/irisnet/noncore/turnclient.h \
++src/irisnet/noncore/udpportreserver.h \
++src/xmpp/xmpp-im/xmpp_address.h \
++src/xmpp/xmpp-im/xmpp_agentitem.h \
++src/xmpp/xmpp-im/xmpp_chatstate.h \
++src/xmpp/xmpp-im/xmpp_client.h \
++src/xmpp/xmpp-core/xmpp_clientstream.h \
++src/xmpp/xmpp-im/xmpp_discoinfotask.h \
++src/xmpp/xmpp-im/xmpp_discoitem.h \
++src/xmpp/xmpp-im/xmpp_features.h \
++src/xmpp/xmpp-core/xmpp.h \
++src/xmpp/xmpp-im/xmpp_htmlelement.h \
++src/xmpp/xmpp-im/xmpp_httpauthrequest.h \
++src/xmpp/jid/jid.h \
++src/xmpp/xmpp-im/xmpp_liveroster.h \
++src/xmpp/xmpp-im/xmpp_liverosteritem.h \
++src/xmpp/xmpp-im/xmpp_message.h \
++src/xmpp/xmpp-im/xmpp_muc.h \
++src/xmpp/xmpp-im/xmpp_pubsubitem.h \
++src/xmpp/xmpp-im/xmpp_pubsubretraction.h \
++src/xmpp/xmpp-im/xmpp_resource.h \
++src/xmpp/xmpp-im/xmpp_resourcelist.h \
++src/xmpp/xmpp-im/xmpp_roster.h \
++src/xmpp/xmpp-im/xmpp_rosteritem.h \
++src/xmpp/xmpp-im/xmpp_rosterx.h \
++src/xmpp/xmpp-core/xmpp_stanza.h \
++src/xmpp/xmpp-im/xmpp_status.h \
++src/xmpp/xmpp-core/xmpp_stream.h \
++src/xmpp/xmpp-im/xmpp_task.h \
++src/xmpp/xmpp-im/xmpp_tasks.h \
++src/xmpp/xmpp-im/xmpp_url.h \
++src/xmpp/xmpp-im/xmpp_vcard.h \
++src/xmpp/xmpp-im/xmpp_xdata.h \
++src/xmpp/xmpp-im/xmpp_xmlcommon.h \
++src/irisnet/corelib/addressresolver.h \
++src/irisnet/noncore/cutestuff/bsocket.h \
++src/irisnet/noncore/cutestuff/bytestream.h \
++src/xmpp/xmpp-im/filetransfer.h \
++src/irisnet/noncore/cutestuff/httpconnect.h \
++src/irisnet/noncore/cutestuff/httppoll.h \
++src/irisnet/noncore/ice176.h \
++src/xmpp/xmpp-im/im.h \
++src/irisnet/corelib/irisnetexport.h \
++src/irisnet/corelib/irisnetglobal.h \
++src/irisnet/corelib/irisnetplugin.h \
++src/irisnet/corelib/jdnsshared.h \
++src/irisnet/noncore/legacy/ndns.h \
++src/irisnet/corelib/netavailability.h \
++src/irisnet/corelib/netinterface.h \
++src/irisnet/corelib/netnames.h \
++src/irisnet/corelib/objectsession.h \
++src/irisnet/noncore/processquit.h \
++src/jdns/qjdns.h \
++src/xmpp/xmpp-im/s5b.h \
++src/irisnet/noncore/legacy/safedelete.h \
++src/irisnet/noncore/legacy/servsock.h \
++src/irisnet/noncore/cutestuff/socks.h \
++src/irisnet/noncore/legacy/srvresolver.h \
++src/irisnet/noncore/stunallocate.h \
++src/irisnet/noncore/stunbinding.h \
++src/irisnet/noncore/stunmessage.h \
++src/irisnet/noncore/stuntransaction.h \
++src/irisnet/noncore/turnclient.h \
++src/irisnet/noncore/udpportreserver.h \
++src/xmpp/xmpp-im/xmpp_address.h \
++src/xmpp/xmpp-im/xmpp_agentitem.h \
++src/xmpp/xmpp-im/xmpp_chatstate.h \
++src/xmpp/xmpp-im/xmpp_client.h \
++src/xmpp/xmpp-core/xmpp_clientstream.h \
++src/xmpp/xmpp-im/xmpp_discoinfotask.h \
++src/xmpp/xmpp-im/xmpp_discoitem.h \
++src/xmpp/xmpp-im/xmpp_features.h \
++src/xmpp/xmpp-core/xmpp.h \
++src/xmpp/xmpp-im/xmpp_htmlelement.h \
++src/xmpp/xmpp-im/xmpp_httpauthrequest.h \
++src/xmpp/jid/jid.h \
++src/xmpp/xmpp-im/xmpp_liveroster.h \
++src/xmpp/xmpp-im/xmpp_liverosteritem.h \
++src/xmpp/xmpp-im/xmpp_message.h \
++src/xmpp/xmpp-im/xmpp_muc.h \
++src/xmpp/xmpp-im/xmpp_pubsubitem.h \
++src/xmpp/xmpp-im/xmpp_pubsubretraction.h \
++src/xmpp/xmpp-im/xmpp_resource.h \
++src/xmpp/xmpp-im/xmpp_resourcelist.h \
++src/xmpp/xmpp-im/xmpp_roster.h \
++src/xmpp/xmpp-im/xmpp_rosteritem.h \
++src/xmpp/xmpp-im/xmpp_rosterx.h \
++src/xmpp/xmpp-core/xmpp_stanza.h \
++src/xmpp/xmpp-im/xmpp_status.h \
++src/xmpp/xmpp-core/xmpp_stream.h \
++src/xmpp/xmpp-im/xmpp_task.h \
++src/xmpp/xmpp-im/xmpp_tasks.h \
++src/xmpp/xmpp-im/xmpp_url.h \
++src/xmpp/xmpp-im/xmpp_vcard.h \
++src/xmpp/xmpp-im/xmpp_xdata.h \
++src/xmpp/xmpp-im/xmpp_xmlcommon.h \
++src/irisnet/corelib/addressresolver.h \
++src/irisnet/noncore/cutestuff/bsocket.h \
++src/irisnet/noncore/cutestuff/bytestream.h \
++src/xmpp/xmpp-im/filetransfer.h \
++src/irisnet/noncore/cutestuff/httpconnect.h \
++src/irisnet/noncore/cutestuff/httppoll.h \
++src/irisnet/noncore/ice176.h \
++src/xmpp/xmpp-im/im.h \
++src/irisnet/corelib/irisnetexport.h \
++src/irisnet/corelib/irisnetglobal.h \
++src/irisnet/corelib/irisnetplugin.h \
++src/irisnet/corelib/jdnsshared.h \
++src/irisnet/noncore/legacy/ndns.h \
++src/irisnet/corelib/netavailability.h \
++src/irisnet/corelib/netinterface.h \
++src/irisnet/corelib/netnames.h \
++src/irisnet/corelib/objectsession.h \
++src/irisnet/noncore/processquit.h \
++src/jdns/qjdns.h \
++src/xmpp/xmpp-im/s5b.h \
++src/irisnet/noncore/legacy/safedelete.h \
++src/irisnet/noncore/legacy/servsock.h \
++src/irisnet/noncore/cutestuff/socks.h \
++src/irisnet/noncore/legacy/srvresolver.h \
++src/irisnet/noncore/stunallocate.h \
++src/irisnet/noncore/stunbinding.h \
++src/irisnet/noncore/stunmessage.h \
++src/irisnet/noncore/stuntransaction.h \
++src/irisnet/noncore/turnclient.h \
++src/irisnet/noncore/udpportreserver.h \
++src/xmpp/xmpp-im/xmpp_address.h \
++src/xmpp/xmpp-im/xmpp_agentitem.h \
++src/xmpp/xmpp-im/xmpp_chatstate.h \
++src/xmpp/xmpp-im/xmpp_client.h \
++src/xmpp/xmpp-core/xmpp_clientstream.h \
++src/xmpp/xmpp-im/xmpp_discoinfotask.h \
++src/xmpp/xmpp-im/xmpp_discoitem.h \
++src/xmpp/xmpp-im/xmpp_features.h \
++src/xmpp/xmpp-core/xmpp.h \
++src/xmpp/xmpp-im/xmpp_htmlelement.h \
++src/xmpp/xmpp-im/xmpp_httpauthrequest.h \
++src/xmpp/jid/jid.h \
++src/xmpp/xmpp-im/xmpp_liveroster.h \
++src/xmpp/xmpp-im/xmpp_liverosteritem.h \
++src/xmpp/xmpp-im/xmpp_message.h \
++src/xmpp/xmpp-im/xmpp_muc.h \
++src/xmpp/xmpp-im/xmpp_pubsubitem.h \
++src/xmpp/xmpp-im/xmpp_pubsubretraction.h \
++src/xmpp/xmpp-im/xmpp_resource.h \
++src/xmpp/xmpp-im/xmpp_resourcelist.h \
++src/xmpp/xmpp-im/xmpp_roster.h \
++src/xmpp/xmpp-im/xmpp_rosteritem.h \
++src/xmpp/xmpp-im/xmpp_rosterx.h \
++src/xmpp/xmpp-core/xmpp_stanza.h \
++src/xmpp/xmpp-im/xmpp_status.h \
++src/xmpp/xmpp-core/xmpp_stream.h \
++src/xmpp/xmpp-im/xmpp_task.h \
++src/xmpp/xmpp-im/xmpp_tasks.h \
++src/xmpp/xmpp-im/xmpp_url.h \
++src/xmpp/xmpp-im/xmpp_vcard.h \
++src/xmpp/xmpp-im/xmpp_xdata.h \
++src/xmpp/xmpp-im/xmpp_xmlcommon.h
+
+INSTALLS += headers
diff -up iris-1.0.0/src/irisnet/noncore/noncore.pri.install iris-1.0.0/src/irisnet/noncore/noncore.pri
---- iris-1.0.0/src/irisnet/noncore/noncore.pri.install 2010-01-25 03:56:50.000000000 -0500
-+++ iris-1.0.0/src/irisnet/noncore/noncore.pri 2011-10-26 13:36:01.204604319 -0400
+--- iris-1.0.0/src/irisnet/noncore/noncore.pri.install 2010-01-25 02:56:50.000000000 -0600
++++ iris-1.0.0/src/irisnet/noncore/noncore.pri 2012-01-07 14:54:43.861308839 -0600
@@ -6,7 +6,8 @@ irisnetcore_bundle:{
include(../corelib/corelib.pri)
}
@@ -46,8 +232,8 @@ diff -up iris-1.0.0/src/irisnet/noncore/noncore.pri.install iris-1.0.0/src/irisn
INCLUDEPATH += $$PWD/../corelib
diff -up iris-1.0.0/src/irisnet/noncore/noncore.pro.install iris-1.0.0/src/irisnet/noncore/noncore.pro
---- iris-1.0.0/src/irisnet/noncore/noncore.pro.install 2008-08-22 19:33:10.000000000 -0400
-+++ iris-1.0.0/src/irisnet/noncore/noncore.pro 2011-10-26 13:36:01.204604319 -0400
+--- iris-1.0.0/src/irisnet/noncore/noncore.pro.install 2008-08-22 18:33:10.000000000 -0500
++++ iris-1.0.0/src/irisnet/noncore/noncore.pro 2012-01-07 14:54:43.865308789 -0600
@@ -13,3 +13,15 @@ include(noncore.pri)
windows:!staticlib:DEFINES += IRISNET_MAKEDLL
@@ -65,8 +251,8 @@ diff -up iris-1.0.0/src/irisnet/noncore/noncore.pro.install iris-1.0.0/src/irisn
+
+INSTALLS += target
diff -up iris-1.0.0/src/xmpp/xmpp.pri.install iris-1.0.0/src/xmpp/xmpp.pri
---- iris-1.0.0/src/xmpp/xmpp.pri.install 2011-10-26 13:39:26.379039697 -0400
-+++ iris-1.0.0/src/xmpp/xmpp.pri 2011-10-26 13:39:46.397788941 -0400
+--- iris-1.0.0/src/xmpp/xmpp.pri.install 2011-02-23 15:42:16.000000000 -0600
++++ iris-1.0.0/src/xmpp/xmpp.pri 2012-01-07 14:54:43.862308827 -0600
@@ -9,7 +9,8 @@ iris_bundle:{
include(../irisnet/noncore/noncore.pri)
}
@@ -78,8 +264,8 @@ diff -up iris-1.0.0/src/xmpp/xmpp.pri.install iris-1.0.0/src/xmpp/xmpp.pri
include($$IRIS_XMPP_BASE_MODULE)
diff -up iris-1.0.0/src/xmpp/xmpp.pro.install iris-1.0.0/src/xmpp/xmpp.pro
---- iris-1.0.0/src/xmpp/xmpp.pro.install 2008-10-02 14:48:19.000000000 -0400
-+++ iris-1.0.0/src/xmpp/xmpp.pro 2011-10-26 13:36:01.205604306 -0400
+--- iris-1.0.0/src/xmpp/xmpp.pro.install 2008-10-02 13:48:19.000000000 -0500
++++ iris-1.0.0/src/xmpp/xmpp.pro 2012-01-07 14:54:43.865308789 -0600
@@ -14,4 +14,16 @@ VERSION = 1.0.0
# static targets don't pick up prl defines
DEFINES += IRISNET_STATIC
diff --git a/iris.spec b/iris.spec
index 22f373f..f28dc61 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.9.%{snap}svn%{svn}%{?dist}
+Release: 0.10.%{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
@@ -86,6 +86,12 @@ make %{?_smp_mflags}
%install
make install INSTALL_ROOT=%{buildroot}
+# post processing to fix iris-related headers
+mv %{buildroot}%{_qt4_headerdir}/iris/jid.h \
+ %{buildroot}%{_qt4_headerdir}/iris/xmpp_jid.h
+sed -i -e 's|#include "xmpp/jid/jid.h"|#include "xmpp_jid.h"|g' \
+ %{buildroot}%{_qt4_headerdir}/iris/*.h
+
%check
export PKG_CONFIG_PATH=%{buildroot}%{_qt4_libdir}/pkgconfig:
@@ -123,6 +129,9 @@ test "$(pkg-config --modversion qjdns)" = "%{version}"
%changelog
+* Sat Jan 07 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.10.20110904svn812
+- fix iris headers (#772410)
+
* 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
More information about the scm-commits
mailing list