[iris] import
Rex Dieter
rdieter at fedoraproject.org
Tue Jan 3 14:02:35 UTC 2012
commit d4daea6ee115e9aada8370fe917cff51d3c535eb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Tue Jan 3 08:01:23 2012 -0600
import
.gitignore | 1 +
iris-1.0.0-install.patch | 99 ++++++++++++++++++++++++++
iris-1.0.0-jdns_install.patch | 78 +++++++++++++++++++++
iris-1.0.0-sharedlib.patch | 24 +++++++
iris-1.0.0-system_libidn.patch | 24 +++++++
iris.spec | 150 ++++++++++++++++++++++++++++++++++++++++
sources | 1 +
7 files changed, 377 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..b05c476 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/iris-1.0.0-r812.tar.gz
diff --git a/iris-1.0.0-install.patch b/iris-1.0.0-install.patch
new file mode 100644
index 0000000..bc29235
--- /dev/null
+++ b/iris-1.0.0-install.patch
@@ -0,0 +1,99 @@
+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
+@@ -9,7 +9,8 @@ iris_bundle:{
+ include(src/xmpp/xmpp.pri)
+ }
+ else {
+- LIBS += -L$$IRIS_BASE/lib -liris
++ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
++ LIBS += -liris
+ }
+
+ # qt < 4.4 doesn't enable link_prl by default. we could just enable it,
+@@ -19,6 +20,7 @@ else {
+ # also, mingw seems to have broken prl support??
+ win32-g++|contains($$list($$[QT_VERSION]), 4.0.*|4.1.*|4.2.*|4.3.*) {
+ DEFINES += IRISNET_STATIC # from irisnet
+- LIBS += -L$$IRIS_BASE/lib -lirisnet # from iris
++ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
++ LIBS += -lirisnet # from iris
+ 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
+ build_src:SUBDIRS += sub_src
+
+ !no_tests:SUBDIRS += sub_tools
++
++headers.path = $$[QT_INSTALL_HEADERS]/iris
++headers.files = include/iris/*.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
+@@ -6,7 +6,8 @@ irisnetcore_bundle:{
+ include(../corelib/corelib.pri)
+ }
+ else {
+- LIBS += -L$$IRIS_BASE/lib -lirisnetcore
++ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
++ LIBS += -lirisnetcore
+ }
+
+ 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
+@@ -13,3 +13,15 @@ include(noncore.pri)
+
+ windows:!staticlib:DEFINES += IRISNET_MAKEDLL
+ staticlib:PRL_EXPORT_DEFINES += IRISNET_STATIC
++
++target.path = $$[QT_INSTALL_LIBS]
++
++CONFIG += create_pc no_install_prl
++QMAKE_PKGCONFIG_NAME = irisnet
++QMAKE_PKGCONFIG_DESCRIPTION = irisnet
++QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
++QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/iris
++QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++
++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
+@@ -9,7 +9,8 @@ iris_bundle:{
+ include(../irisnet/noncore/noncore.pri)
+ }
+ else {
+- LIBS += -L$$IRIS_BASE/lib -lirisnet
++ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
++ LIBS += -lirisnet
+ }
+
+ 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
+@@ -14,4 +14,16 @@ VERSION = 1.0.0
+ # static targets don't pick up prl defines
+ DEFINES += IRISNET_STATIC
+
++target.path = $$[QT_INSTALL_LIBS]
++
++CONFIG += create_pc no_install_prl
++QMAKE_PKGCONFIG_NAME = iris
++QMAKE_PKGCONFIG_DESCRIPTION = A library for working with the XMPP/Jabber protocol
++QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS]
++QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS]/$$TARGET
++QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++
++INSTALLS += target
++
+ include(xmpp.pri)
diff --git a/iris-1.0.0-jdns_install.patch b/iris-1.0.0-jdns_install.patch
new file mode 100644
index 0000000..0fc5da2
--- /dev/null
+++ b/iris-1.0.0-jdns_install.patch
@@ -0,0 +1,78 @@
+diff -up iris-1.0.0/src/irisnet/corelib/corelib.pri.jdns_install iris-1.0.0/src/irisnet/corelib/corelib.pri
+--- iris-1.0.0/src/irisnet/corelib/corelib.pri.jdns_install 2010-03-05 19:48:58.000000000 -0600
++++ iris-1.0.0/src/irisnet/corelib/corelib.pri 2011-11-08 13:59:36.546525284 -0600
+@@ -3,9 +3,16 @@ QT *= network
+ # libidn
+ #LIBS += -lidn
+
+-include(../../jdns/jdns.pri)
+ INCLUDEPATH += $$PWD/../../jdns
+
++iris_bundle:{
++ include(../../jdns/jdns.pri)
++}
++else {
++ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
++ LIBS += -lqjdns
++}
++
+ HEADERS += \
+ $$PWD/jdnsshared.h \
+ $$PWD/objectsession.h \
+diff -up iris-1.0.0/src/jdns/jdns.pro.jdns_install iris-1.0.0/src/jdns/jdns.pro
+--- iris-1.0.0/src/jdns/jdns.pro.jdns_install 2007-09-17 19:50:18.000000000 -0500
++++ iris-1.0.0/src/jdns/jdns.pro 2011-11-08 14:01:50.093855711 -0600
+@@ -1,9 +1,39 @@
++
++include(jdns.pri)
++
++iris_bundle:{
++
+ CONFIG += console
+ CONFIG -= app_bundle
+ QT -= gui
+ QT += network
+
+-include(jdns.pri)
+-
+ SOURCES += \
+ main.cpp
++}
++else {
++
++IRIS_BASE = ../..
++
++TEMPLATE = lib
++TARGET = qjdns
++DESTDIR = $$IRIS_BASE/lib
++CONFIG += dll create_prl
++
++headers.path = $$[QT_INSTALL_HEADERS]/qjdns
++headers.files = *.h
++
++INSTALLS += headers
++
++target.path = $$[QT_INSTALL_LIBS]
++
++CONFIG += create_pc no_install_prl
++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_CFLAGS = -I$$[QT_INSTALL_HEADERS]
++QMAKE_PKGCONFIG_DESTDIR = pkgconfig
++
++INSTALLS += target
++}
+diff -up iris-1.0.0/src/src.pro.jdns_install iris-1.0.0/src/src.pro
+--- iris-1.0.0/src/src.pro.jdns_install 2009-07-03 13:45:50.000000000 -0500
++++ iris-1.0.0/src/src.pro 2011-11-08 13:59:36.547525271 -0600
+@@ -5,6 +5,7 @@ include(libbase.pri)
+ sub_irisnet.subdir = irisnet
+ sub_xmpp.subdir = xmpp
+ sub_xmpp.depends = sub_irisnet
++sub_jdns.subdir = jdns
+
+ SUBDIRS += sub_irisnet
+-!iris_bundle:SUBDIRS += sub_xmpp
++!iris_bundle:SUBDIRS += sub_xmpp sub_jdns
diff --git a/iris-1.0.0-sharedlib.patch b/iris-1.0.0-sharedlib.patch
new file mode 100644
index 0000000..473b04a
--- /dev/null
+++ b/iris-1.0.0-sharedlib.patch
@@ -0,0 +1,24 @@
+diff -up iris-1.0.0/src/irisnet/noncore/noncore.pro.shared iris-1.0.0/src/irisnet/noncore/noncore.pro
+--- iris-1.0.0/src/irisnet/noncore/noncore.pro.shared 2011-10-26 13:04:48.736136621 -0400
++++ iris-1.0.0/src/irisnet/noncore/noncore.pro 2011-10-26 13:04:55.803047830 -0400
+@@ -4,7 +4,7 @@ TEMPLATE = lib
+ QT -= gui
+ TARGET = irisnet
+ DESTDIR = $$IRIS_BASE/lib
+-CONFIG += staticlib create_prl
++CONFIG += dll create_prl
+
+ VERSION = 1.0.0
+
+diff -up iris-1.0.0/src/xmpp/xmpp.pro.shared iris-1.0.0/src/xmpp/xmpp.pro
+--- iris-1.0.0/src/xmpp/xmpp.pro.shared 2011-10-26 13:04:18.902511432 -0400
++++ iris-1.0.0/src/xmpp/xmpp.pro 2011-10-26 13:04:18.906511380 -0400
+@@ -4,7 +4,7 @@ TEMPLATE = lib
+ #QT -= gui
+ TARGET = iris
+ DESTDIR = $$IRIS_BASE/lib
+-CONFIG += staticlib create_prl
++CONFIG += dll create_prl
+ OBJECTS_DIR = .obj
+ MOC_DIR = .moc
+ UI_DIR = .ui
diff --git a/iris-1.0.0-system_libidn.patch b/iris-1.0.0-system_libidn.patch
new file mode 100644
index 0000000..afa504d
--- /dev/null
+++ b/iris-1.0.0-system_libidn.patch
@@ -0,0 +1,24 @@
+diff -up iris-1.0.0/src/xmpp/jid/jid.cpp.system_libidn iris-1.0.0/src/xmpp/jid/jid.cpp
+--- iris-1.0.0/src/xmpp/jid/jid.cpp.system_libidn 2011-03-02 03:37:32.000000000 -0600
++++ iris-1.0.0/src/xmpp/jid/jid.cpp 2011-11-07 15:09:04.580552981 -0600
+@@ -24,7 +24,7 @@
+ #include <QCoreApplication>
+ #include <QByteArray>
+ #include <QHash>
+-#include <libidn/stringprep.h>
++#include <stringprep.h>
+
+ #ifndef NO_IRISNET
+ #include "irisnetglobal_p.h"
+diff -up iris-1.0.0/src/xmpp/xmpp-core/connector.cpp.system_libidn iris-1.0.0/src/xmpp/xmpp-core/connector.cpp
+--- iris-1.0.0/src/xmpp/xmpp-core/connector.cpp.system_libidn 2010-03-05 19:49:47.000000000 -0600
++++ iris-1.0.0/src/xmpp/xmpp-core/connector.cpp 2011-11-07 15:11:52.108458594 -0600
+@@ -36,7 +36,7 @@
+ #include <QList>
+ #include <QUrl>
+ #include <QTimer>
+-#include <libidn/idna.h>
++#include <idna.h>
+ #include "safedelete.h"
+ #include "bsocket.h"
+ #include "httpconnect.h"
diff --git a/iris.spec b/iris.spec
new file mode 100644
index 0000000..adef4e2
--- /dev/null
+++ b/iris.spec
@@ -0,0 +1,150 @@
+
+%define snap 20110904
+%define svn 812
+
+Name: iris
+Summary: A library for working with the XMPP/Jabber protocol
+Version: 1.0.0
+Release: 0.8.%{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
+# tar czf iris-1.0.0-%%{snap}.tar.gz iris-1.0.0/
+Source0: iris-1.0.0-r%{svn}.tar.gz
+
+BuildRequires: pkgconfig(libidn)
+BuildRequires: pkgconfig(qca2)
+BuildRequires: pkgconfig(QtNetwork)
+BuildRequires: zlib-devel
+
+Requires: qjdns%{?_isa} = %{version}-%{release}
+# some default qca plugin(s)
+Requires: qca-ossl%{?_isa}
+
+## upstreamable patches
+# add pkgconfig support
+# add 'make install' target
+Patch0: iris-1.0.0-install.patch
+# Build shared library
+Patch1: iris-1.0.0-sharedlib.patch
+# unbundle libidn, use system copy
+Patch2: iris-1.0.0-system_libidn.patch
+# install jdns
+Patch3: iris-1.0.0-jdns_install.patch
+
+## TODO/FIXME
+# * verfiy author/license of src/xmmp/base64
+
+%description
+%{summary}.
+
+%package devel
+Summary: Development file for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description devel
+%{summary}.
+
+%package -n qjdns
+Summary: a simple DNS implementation that can perform normal as well as Multicast DNS queries
+License: MIT
+%description -n qjdns
+JDNS is a simple DNS implementation that can perform normal DNS queries
+of any record type (notably SRV), as well as Multicast DNS queries and
+advertising. Multicast support is based on Jeremie Miller's "mdnsd"
+implementation.
+
+For Qt users there is a wrapper available called QJDns.
+
+%package -n qjdns-devel
+Summary: Development files for qjdns
+License: MIT
+Requires: qjdns%{?_isa} = %{version}-%{release}
+%description -n qjdns-devel
+%{summary}.
+
+
+
+%prep
+%setup -q
+%patch0 -p1 -b .install
+%patch1 -p1 -b .shared
+%patch2 -p1 -b .system_libidn
+rm -rf src/libidn
+%patch3 -p1 -b .jdns_install
+
+
+%build
+./configure \
+ --verbose \
+ --release \
+ --no-separate-debug-info \
+ --disable-tests
+
+make %{?_smp_mflags}
+
+
+%install
+make install INSTALL_ROOT=%{buildroot}
+
+
+%check
+export PKG_CONFIG_PATH=%{buildroot}%{_qt4_libdir}/pkgconfig:
+test "$(pkg-config --modversion iris)" = "%{version}"
+test "$(pkg-config --modversion irisnet)" = "%{version}"
+test "$(pkg-config --modversion qjdns)" = "%{version}"
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%doc COPYING README TODO
+%{_qt4_libdir}/libiris.so.1*
+%{_qt4_libdir}/libirisnet.so.1*
+
+%files devel
+%{_qt4_headerdir}/iris/
+%{_qt4_libdir}/libiris.so
+%{_qt4_libdir}/libirisnet.so
+%{_qt4_libdir}/pkgconfig/iris.pc
+%{_qt4_libdir}/pkgconfig/irisnet.pc
+
+%post -n qjdns -p /sbin/ldconfig
+%postun -n qjdns -p /sbin/ldconfig
+
+%files -n qjdns
+%doc src/jdns/README src/jdns/TODO
+%{_qt4_libdir}/libqjdns.so.1*
+
+%files -n qjdns-devel
+%{_qt4_headerdir}/qjdns/
+%{_qt4_libdir}/libqjdns.so
+%{_qt4_libdir}/pkgconfig/qjdns.pc
+
+
+%changelog
+* Wed Nov 16 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.8.20110904svn812
+- fix Release
+
+* Tue Nov 15 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.7.r812
+- use svn revision instead of snapshot date
+
+* Tue Nov 15 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.6.20110904
+- qjdns-devel: Requires: qjdns
+
+* Tue Nov 08 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.5.20110904
+- install/package qjdns
+
+* Mon Nov 07 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.4.20110904
+- unbundle libidn
+
+* Fri Oct 28 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.3.20110904
+- pkgconfig-style deps
+- Requires: qca-ossl
+
+* Wed Oct 26 2011 Tom Callaway <spot at fedoraproject.org> 1.0.0-0.2.20110904
+- finish install patch
+- generate sharedlibs
+
+* Sun Sep 04 2011 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.1.20110904
+- first try
diff --git a/sources b/sources
index e69de29..cb084f6 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+8fc8986f57c0bba5ff6f473cc3f7a2c3 iris-1.0.0-r812.tar.gz
More information about the scm-commits
mailing list