diff --git a/fix_gcc4.9_ftbfs.patch b/fix_gcc4.9_ftbfs.patch new file mode 100644 index 0000000..798adde --- /dev/null +++ b/fix_gcc4.9_ftbfs.patch @@ -0,0 +1,25 @@ +Fix FTBFS with gcc 4.9. #746857 +--- a/src/jinglesession.cpp ++++ b/src/jinglesession.cpp +@@ -99,6 +99,10 @@ + } + } + ++ Session::Reason::~Reason() ++ { ++ } ++ + const std::string& Session::Reason::filterString() const + { + static const std::string filter = "jingle/reason"; +--- a/src/jinglesession.h ++++ b/src/jinglesession.h +@@ -147,7 +147,7 @@ + /** + * Virtual destructor. + */ +- virtual ~Reason() {} ++ virtual ~Reason(); + + /** + * Returns the reason for the session termination. diff --git a/gloox.spec b/gloox.spec index 096c5bf..efd0f64 100644 --- a/gloox.spec +++ b/gloox.spec @@ -1,24 +1,14 @@ -#% global prerel rc3 -#% global SVN 4204 - Name: gloox Epoch: 1 Version: 1.0.10 -Release: 2%{?prerel:%{prerel}.}%{?SVN:SVNr%{SVN}}%{?dist} +Release: 3%{?dist} Summary: A rock-solid, full-featured Jabber/XMPP client C++ library Group: System Environment/Libraries -License: GPLv2 +License: GPLv3 URL: http://camaya.net/gloox -%if 0%{?prerel} -# svn export svn://svn.camaya.net/gloox/trunk gloox-1.0rc3 \ -# tar -cjf gloox-1.0rc3-SVNr4203.tar.bz2 gloox-1.0rc3 -Source0: %{name}-%{version}%{?prerel}%{?SVN:-SVNr%{SVN}}.tar.bz2 -%else Source0: http://camaya.net/download/%{name}-%{version}.tar.bz2 -%endif -%if 0%{?prerel} -BuildRequires: libtool, autoconf, automake -%endif +Patch0: fix_gcc4.9_ftbfs.patch + BuildRequires: openssl-devel >= 0.9.8 BuildRequires: gnutls-devel >= 1.2 BuildRequires: zlib-devel >= 1.2.3 @@ -26,7 +16,7 @@ BuildRequires: libidn-devel >= 0.5 BuildRequires: libgcrypt-devel Requires(postun): /sbin/ldconfig -Requires(post): /sbin/ldconfig +Requires(post): /sbin/ldconfig %description gloox is a rock-solid, full-featured Jabber/XMPP client library written in @@ -44,14 +34,12 @@ developing applications that use %{name}. %prep %setup -q -n %{name}-%{version}%{?prerel} +%patch0 -p1 -b .ftbfs # recode to UTF mv -f AUTHORS AUTHORS.old iconv -f iso8859-1 -t UTF-8 AUTHORS.old > AUTHORS %build -%if 0%{?SVN} -./autogen.sh -%endif %configure --disable-static make %{?_smp_mflags} @@ -75,6 +63,10 @@ find %{buildroot} -name '*.la' -delete -print %{_libdir}/libgloox.so %changelog +* Mon Jul 21 2014 Peter Robinson 1:1.0.10-3 +- Add patch from Debian for ftbfs with gcc 4.9 +- Update license to GPLv3 + * Sat Jun 07 2014 Fedora Release Engineering - 1:1.0.10-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild