[jreen] import
Rex Dieter
rdieter at fedoraproject.org
Sun Jan 8 22:50:11 UTC 2012
commit 6f420ca8fdfcf37693cba06cc0c0160f2c535ceb
Author: Rex Dieter <rdieter at fedoraproject.org>
Date: Sun Jan 8 16:50:03 2012 -0600
import
.gitignore | 1 +
jreen-1.0.1-gcc47.patch | 50 +++++++++++++++++++++
jreen.spec | 109 +++++++++++++++++++++++++++++++++++++++++++++++
sources | 1 +
4 files changed, 161 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..8a24c10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/libjreen-1.0.1.tar.bz2
diff --git a/jreen-1.0.1-gcc47.patch b/jreen-1.0.1-gcc47.patch
new file mode 100644
index 0000000..93ca284
--- /dev/null
+++ b/jreen-1.0.1-gcc47.patch
@@ -0,0 +1,50 @@
+diff --git a/src/stanzaextension.h b/src/stanzaextension.h
+index 65d88f2..424ed7c 100644
+--- a/src/stanzaextension.h
++++ b/src/stanzaextension.h
+@@ -83,20 +83,6 @@ public:
+ virtual int payloadType() const;
+ };
+
+-template <typename Extension>
+-class SimplePayloadFactory : public PayloadFactory<Extension>
+-{
+- Q_DISABLE_COPY(SimplePayloadFactory)
+-public:
+- SimplePayloadFactory(const QString &name, const QString &uri, Client *client);
+- virtual ~SimplePayloadFactory();
+-
+- virtual bool canParse(const QStringRef &name, const QStringRef &uri, const QXmlStreamAttributes &attributes);
+-private:
+- QString m_elementName;
+- QString m_elementUri;
+-};
+-
+ //template <typename T>
+ //Q_INLINE_TEMPLATE T se_cast(Payload *se)
+ //{
+@@ -121,24 +107,6 @@ Q_INLINE_TEMPLATE int PayloadFactory<Extension>::payloadType() const
+ return Extension::staticPayloadType();
+ }
+
+-template <typename Extension>
+-Q_INLINE_TEMPLATE SimplePayloadFactory<Extension>::SimplePayloadFactory(const QString &name, const QString &uri, Client *client)
+- : SimplePayloadFactory(client), m_elementName(name), m_elementUri(uri)
+-{
+-}
+-
+-template <typename Extension>
+-Q_INLINE_TEMPLATE SimplePayloadFactory<Extension>::~SimplePayloadFactory()
+-{
+-}
+-
+-template <typename Extension>
+-Q_INLINE_TEMPLATE bool SimplePayloadFactory<Extension>::canParse(const QStringRef &name, const QStringRef &uri,
+- const QXmlStreamAttributes &)
+-{
+- return name == m_elementName && uri == m_elementUri;
+-}
+-
+ template <typename T>
+ Q_INLINE_TEMPLATE T se_cast(Payload *se)
+ {
diff --git a/jreen.spec b/jreen.spec
new file mode 100644
index 0000000..bec9fa0
--- /dev/null
+++ b/jreen.spec
@@ -0,0 +1,109 @@
+
+Name: jreen
+Summary: Qt XMPP Library
+Version: 1.0.1
+Release: 4%{?dist}
+
+License: GPLv2+
+URL: http://qutim.org/jreen
+#URL: https://github.com/euroelessar/jreen
+%if 0%{?snap}
+# git clone git://github.com/euroelessar/jreen.git ; cd jreen
+# git archive --prefix=jreen-1.0.1/ v1.0.1 | xz > ../jreen-1.0.1.tar.xz
+#Source0: jreen-%{version}.tar.xz
+%else
+Source0: http://qutim.org/dwnl/18/libjreen-%{version}.tar.bz2
+%endif
+
+## upstream patches
+Patch100: jreen-1.0.1-gcc47.patch
+
+BuildRequires: cmake
+BuildRequires: pkgconfig(libidn)
+BuildRequires: pkgconfig(qca2)
+BuildRequires: pkgconfig(qjdns)
+BuildRequires: pkgconfig(QtNetwork)
+BuildRequires: zlib-devel
+
+Requires: qca-ossl%{?_isa}
+
+%description
+%{summary}.
+
+%package devel
+Summary: Development files for %{name}
+Requires: %{name}%{?_isa} = %{version}-%{release}
+%description devel
+%{summary}.
+
+
+%prep
+%setup -q -n libjreen-%{version}
+
+%patch100 -p1 -b .gcc47
+
+# nuke bundled libs out of paranoia -- rex
+rm -rfv 3rdparty/*
+
+
+%build
+mkdir -p %{_target_platform}
+pushd %{_target_platform}
+%{cmake} \
+ -DJREEN_USE_SYSTEM_JDNS:BOOL=ON \
+ ..
+popd
+
+make %{?_smp_mflags} -C %{_target_platform} -k
+
+
+%install
+make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+
+
+%check
+export PKG_CONFIG_PATH=%{buildroot}%{_datadir}/pkgconfig:%{buildroot}%{_libdir}/pkgconfig
+test "$(pkg-config --modversion libjreen)" = "%{version}"
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+%files
+%doc AUTHORS ChangeLog COPYING README
+%{_libdir}/libjreen.so.1*
+
+%files devel
+%{_includedir}/jreen/
+%{_libdir}/libjreen.so
+%{_libdir}/pkgconfig/libjreen.pc
+
+
+%changelog
+* Sat Jan 07 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-4
+- upstream gcc47 patch
+
+* Sat Jan 07 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-3
+- update URL, Source0
+
+* Fri Jan 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-2
+- fix URL
+- Requires: qca-ossl
+- delete bundled libs
+
+* Fri Jan 06 2012 Rex Dieter <rdieter at fedoraproject.org> 1.0.1-1
+- 1.0.1
+- -DJREEN_USE_SYSTEM_JDNS:BOOL=ON
+
+* Mon Nov 14 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-0.4.20110901
+- pkgconfig-style deps
+
+* Thu Sep 01 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-0.3.20110901
+- 20110901 snapshot
+
+* Tue Aug 16 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-0.2.20110816
+- 20110816 snapshot
+
+* Thu Jun 02 2011 Rex Dieter <rdieter at fedoraproject.org> 0.1.0-0.1.20010602
+- first try, 0.1.0 20010602 git snapshot
+
diff --git a/sources b/sources
index e69de29..fd6623e 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+76ca9cbe14870b6125a649d3e2782827 libjreen-1.0.1.tar.bz2
More information about the scm-commits
mailing list