[iris] 20131107 snapshot
Rex Dieter
rdieter at fedoraproject.org
Sat Nov 23 06:53:56 UTC 2013
commit de6f96ba77ded35c932c3176e429755a6d969140
Author: Rex Dieter <rdieter at math.unl.edu>
Date: Sat Nov 23 00:53:44 2013 -0600
20131107 snapshot
.gitignore | 1 +
iris-1.0.0-003_case_insensitive_jid.patch | 13 -
iris-1.0.0-009_filetransferpreview.patch | 134 -
iris-1.0.0-014_fix_semicolons.patch | 22 -
iris-1.0.0-023_jingle-1.patch | 3356 ---------------------
iris-1.0.0-023_jingle.patch | 3393 ----------------------
iris-1.0.0-024_fix_semicolons_and_iterator.patch | 299 --
iris-1.0.0-027_add_socket_access_function.patch | 121 -
iris-1.0.0-030_xep_0115_hash_attribute.patch | 138 -
iris-1.0.0-install.patch | 33 +-
iris-1.0.0-install_jingle.patch | 14 -
iris-1.0.0-jdns_install.patch | 19 +-
iris-1.0.0-no_undefined.patch | 21 +
iris-1.0.0-system_libidn.patch | 36 -
iris.spec | 42 +-
sources | 2 +-
16 files changed, 55 insertions(+), 7589 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b05c476..32f79a9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/iris-1.0.0-r812.tar.gz
+/iris-1.0.0-20131107git.tar.gz
diff --git a/iris-1.0.0-install.patch b/iris-1.0.0-install.patch
index 30029ca..c7a70de 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 21:07:23.000000000 -0500
-+++ iris-1.0.0/iris.pri 2013-02-11 08:11:49.759356309 -0600
+--- iris-1.0.0/iris.pri.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/iris.pri 2013-11-22 23:03:47.066857277 -0600
@@ -9,7 +9,8 @@ iris_bundle:{
include(src/xmpp/xmpp.pri)
}
@@ -11,18 +11,9 @@ diff -up iris-1.0.0/iris.pri.install iris-1.0.0/iris.pri
}
# 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 13:45:50.000000000 -0500
-+++ iris-1.0.0/iris.pro 2013-02-11 08:13:35.690031994 -0600
+--- iris-1.0.0/iris.pro.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/iris.pro 2013-11-22 23:03:47.066857277 -0600
@@ -19,3 +19,197 @@ sub_tools.depends = sub_src
build_src:SUBDIRS += sub_src
@@ -222,8 +213,8 @@ diff -up iris-1.0.0/iris.pro.install iris-1.0.0/iris.pro
+
+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 02:56:50.000000000 -0600
-+++ iris-1.0.0/src/irisnet/noncore/noncore.pri 2013-02-11 08:11:49.759356309 -0600
+--- iris-1.0.0/src/irisnet/noncore/noncore.pri.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/irisnet/noncore/noncore.pri 2013-11-22 23:03:47.066857277 -0600
@@ -6,7 +6,8 @@ irisnetcore_bundle:{
include(../corelib/corelib.pri)
}
@@ -235,8 +226,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 18:33:10.000000000 -0500
-+++ iris-1.0.0/src/irisnet/noncore/noncore.pro 2013-02-11 08:11:49.759356309 -0600
+--- iris-1.0.0/src/irisnet/noncore/noncore.pro.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/irisnet/noncore/noncore.pro 2013-11-22 23:03:47.067857258 -0600
@@ -13,3 +13,15 @@ include(noncore.pri)
windows:!staticlib:DEFINES += IRISNET_MAKEDLL
@@ -254,8 +245,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-02-23 15:42:16.000000000 -0600
-+++ iris-1.0.0/src/xmpp/xmpp.pri 2013-02-11 08:11:49.760356297 -0600
+--- iris-1.0.0/src/xmpp/xmpp.pri.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/xmpp/xmpp.pri 2013-11-22 23:03:47.067857258 -0600
@@ -9,7 +9,8 @@ iris_bundle:{
include(../irisnet/noncore/noncore.pri)
}
@@ -267,8 +258,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 13:48:19.000000000 -0500
-+++ iris-1.0.0/src/xmpp/xmpp.pro 2013-02-11 08:11:49.760356297 -0600
+--- iris-1.0.0/src/xmpp/xmpp.pro.install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/xmpp/xmpp.pro 2013-11-22 23:03:47.067857258 -0600
@@ -14,4 +14,18 @@ VERSION = 1.0.0
# static targets don't pick up prl defines
DEFINES += IRISNET_STATIC
diff --git a/iris-1.0.0-jdns_install.patch b/iris-1.0.0-jdns_install.patch
index 2d03afb..9d3cae7 100644
--- a/iris-1.0.0-jdns_install.patch
+++ b/iris-1.0.0-jdns_install.patch
@@ -1,15 +1,14 @@
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
+--- iris-1.0.0/src/irisnet/corelib/corelib.pri.jdns_install 2013-11-23 00:34:12.657395904 -0600
++++ iris-1.0.0/src/irisnet/corelib/corelib.pri 2013-11-23 00:34:54.999625828 -0600
+@@ -1,8 +1,15 @@
+ QT *= network
-include(../../jdns/jdns.pri)
INCLUDEPATH += $$PWD/../../jdns
+iris_bundle:{
-+ include(../../jdns/jdns.pri)
++ include(../../jdns/jdns.pri)
+}
+else {
+ QMAKE_LFLAGS += -L$$IRIS_BASE/lib
@@ -20,8 +19,8 @@ diff -up iris-1.0.0/src/irisnet/corelib/corelib.pri.jdns_install iris-1.0.0/src/
$$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
+--- iris-1.0.0/src/jdns/jdns.pro.jdns_install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/jdns/jdns.pro 2013-11-23 00:34:12.658395886 -0600
@@ -1,9 +1,39 @@
+
+include(jdns.pri)
@@ -65,8 +64,8 @@ diff -up iris-1.0.0/src/jdns/jdns.pro.jdns_install iris-1.0.0/src/jdns/jdns.pro
+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
+--- iris-1.0.0/src/src.pro.jdns_install 2013-11-07 08:07:15.000000000 -0600
++++ iris-1.0.0/src/src.pro 2013-11-23 00:34:12.658395886 -0600
@@ -5,6 +5,7 @@ include(libbase.pri)
sub_irisnet.subdir = irisnet
sub_xmpp.subdir = xmpp
diff --git a/iris-1.0.0-no_undefined.patch b/iris-1.0.0-no_undefined.patch
new file mode 100644
index 0000000..d79b54c
--- /dev/null
+++ b/iris-1.0.0-no_undefined.patch
@@ -0,0 +1,21 @@
+diff -up iris-1.0.0/src/irisnet/noncore/cutestuff/cutestuff.pri.no_undefined iris-1.0.0/src/irisnet/noncore/cutestuff/cutestuff.pri
+--- iris-1.0.0/src/irisnet/noncore/cutestuff/cutestuff.pri.no_undefined 2013-04-29 22:09:37.000000000 -0500
++++ iris-1.0.0/src/irisnet/noncore/cutestuff/cutestuff.pri 2013-11-22 23:50:05.956402793 -0600
+@@ -6,8 +6,7 @@ HEADERS += \
+ $$PWD/httpconnect.h \
+ $$PWD/httppoll.h \
+ $$PWD/socks.h \
+- $$PWD/networkaccessmanager.h \
+- $$PWD/httpstream.h
++ $$PWD/networkaccessmanager.h
+
+ SOURCES += \
+ $$PWD/bytestream.cpp \
+@@ -15,6 +14,5 @@ SOURCES += \
+ $$PWD/httpconnect.cpp \
+ $$PWD/httppoll.cpp \
+ $$PWD/socks.cpp \
+- $$PWD/networkaccessmanager.cpp \
+- $$PWD/httpstream.cpp
++ $$PWD/networkaccessmanager.cpp
+
diff --git a/iris.spec b/iris.spec
index 3165b4d..40f7f08 100644
--- a/iris.spec
+++ b/iris.spec
@@ -1,16 +1,13 @@
-%define snap 20110904
-%define svn 812
+%define snap 20131107
Name: iris
Summary: A library for working with the XMPP/Jabber protocol
Version: 1.0.0
-Release: 0.15.%{snap}svn%{svn}%{?dist}
+Release: 0.16.%{snap}git%{?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
+URL: https://github.com/psi-im/iris
+Source0: iris-1.0.0-%{snap}git.tar.gz
BuildRequires: pkgconfig(libidn)
BuildRequires: pkgconfig(qca2)
@@ -27,22 +24,10 @@ Requires: qca-ossl%{?_isa}
Patch0: iris-1.0.0-install.patch
# Build shared library, bump VERSION to 2.0.0 for ABI changes from Kopete
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
-
-## rebased patches from kopete
-Patch103: iris-1.0.0-003_case_insensitive_jid.patch
-Patch109: iris-1.0.0-009_filetransferpreview.patch
-Patch114: iris-1.0.0-014_fix_semicolons.patch
-Patch123: iris-1.0.0-023_jingle.patch
-# followup to patch123, to install new headers
-Patch223: iris-1.0.0-install_jingle.patch
-Patch124: iris-1.0.0-024_fix_semicolons_and_iterator.patch
-Patch127: iris-1.0.0-027_add_socket_access_function.patch
-Patch130: iris-1.0.0-030_xep_0115_hash_attribute.patch
-
+# omit source files with undefined references
+Patch4: iris-1.0.0-no_undefined.patch
%description
%{summary}.
@@ -75,20 +60,12 @@ Requires: qjdns%{?_isa} = %{version}-%{release}
%prep
%setup -q
+
%patch0 -p1 -b .install
%patch1 -p1 -b .shared
-%patch2 -p1 -b .system_libidn
-mv src/libidn src/libidn.BAK
%patch3 -p1 -b .jdns_install
+%patch4 -p1 -b .no_undefined
-%patch103 -p1 -b .003
-%patch109 -p1 -b .009
-%patch114 -p1 -b .014
-%patch123 -p1 -b .023
-%patch223 -p1 -b .223
-%patch124 -p1 -b .024
-%patch127 -p1 -b .027
-%patch130 -p1 -b .030
%build
@@ -148,6 +125,9 @@ test "$(pkg-config --modversion qjdns)" = "1.0.0"
%changelog
+* Sat Nov 23 2013 Rex Dieter <rdieter at fedoraproject.org> 1.0.0-0.16.20131107git
+- 20131107 snapshot
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-0.15.20110904svn812
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index cb084f6..aa44c58 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8fc8986f57c0bba5ff6f473cc3f7a2c3 iris-1.0.0-r812.tar.gz
+7b3d4a0b5c0d6f1ef06e1697c9fe5948 iris-1.0.0-20131107git.tar.gz
More information about the scm-commits
mailing list