[libjingle] more 0.6 cleanups
Tom Callaway
spot at fedoraproject.org
Tue Sep 27 21:19:44 UTC 2011
commit 2be7acd82197a8275d6ee15f60dafe34c3d84f07
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date: Tue Sep 27 17:19:33 2011 -0400
more 0.6 cleanups
libjingle-0.6.0-build-sanity.patch | 659 ++++++++++++++++++++++++++++++++++++
libjingle.spec | 13 +-
2 files changed, 668 insertions(+), 4 deletions(-)
---
diff --git a/libjingle-0.6.0-build-sanity.patch b/libjingle-0.6.0-build-sanity.patch
new file mode 100644
index 0000000..1d0f21f
--- /dev/null
+++ b/libjingle-0.6.0-build-sanity.patch
@@ -0,0 +1,659 @@
+diff -up libjingle-0.6.0/configure.ac.SANITY libjingle-0.6.0/configure.ac
+--- libjingle-0.6.0/configure.ac.SANITY 2011-09-27 16:25:02.575566945 -0400
++++ libjingle-0.6.0/configure.ac 2011-09-27 16:37:31.896056423 -0400
+@@ -0,0 +1,95 @@
++AC_INIT([libjingle], [0.6.0], [google-talk-open at googlegroups.com])
++AC_CANONICAL_SYSTEM
++AM_CONFIG_HEADER(config.h)
++AM_INIT_AUTOMAKE([dist-zip])
++AC_PROG_CC
++AC_PROG_CXX
++AM_PROG_LIBTOOL
++LIBTOOL="$LIBTOOL --silent"
++AC_PROG_INSTALL
++AC_DEFINE(PRODUCTION_BUILD, 1, [Build as a production build])
++AC_DEFINE(PRODUCTION, 1, [Build as a production build])
++AC_DEFINE(POSIX, 1, [If we're using configure, we're on POSIX])
++AC_DEFINE(FEATURE_ENABLE_VOICEMAIL, 1, [voice mail])
++AC_DEFINE(LOGGING, 1, [Logging])
++
++LIBJINGLE_MAJORMINOR=0.6
++AC_SUBST(LIBJINGLE_MAJORMINOR)
++
++LIBJINGLE_LIBRARY_VERSION=1:0:0
++AC_SUBST(LIBJINGLE_LIBRARY_VERSION)
++
++HAVE_EXPAT=no
++AC_CHECK_LIB(expat, XML_ParserCreate, HAVE_EXPAT="yes")
++if test "x$HAVE_EXPAT" = xyes ; then
++ EXPAT_LIBS="-lexpat"
++ AC_SUBST(EXPAT_LIBS)
++else
++ AC_ERROR([Expat is required to build libjingle. You can get it from http://expat.sourceforge.net/])
++fi
++
++if test `uname -s` = Linux ; then
++ AC_DEFINE(LINUX, 1, [Building on Linux])
++ HAVE_ALSA=no
++ AC_CHECK_LIB(asound, snd_pcm_open, HAVE_ALSA="yes")
++ if test "x$HAVE_ALSA" = xyes ; then
++ ALSA_LIBS="-lasound"
++ AC_SUBST(ALSA_LIBS)
++ AC_DEFINE(HAVE_ALSA, 1, [Using ALSA])
++ else
++ AC_ERROR([libasound is required to build libjingle. You can get it from http://www.alsa-project.org/])
++ fi
++
++ AC_CHECK_HEADER(openssl/ssl.h, HAVE_OPENSSL_SSL_H=yes, HAVE_OPENSSL_SSL_H=no)
++ if test x$HAVE_OPENSSL_SSL_H = xyes; then
++ AC_DEFINE(HAVE_OPENSSL_SSL_H, 1, [Found openssl/ssl.h])
++ PKG_CHECK_MODULES(OPENSSL, openssl >= 0.9.7g, HAVE_OPENSSL=yes, HAVE_OPENSSL=no)
++ AC_SUBST(OPENSSL_CFLAGS)
++ AC_SUBST(OPENSSL_LIBS)
++ AC_DEFINE(SSL_USE_OPENSSL, 1, [Using OpenSSL])
++ AC_DEFINE(FEATURE_ENABLE_SSL, 1, [SSL Enabled])
++ CPPFLAGS+="$OPENSSL_CFLAGS"
++ LDFLAGS+=" $OPENSSL_LIBS"
++ else
++ AC_DEFINE(HAVE_OPENSSL_SSL_H, 0, [Did not find openssl/ssl.h])
++ fi
++
++ PKG_CHECK_MODULES(GTK2, gtk+-2.0, enable_gtk=yes, enable_gtk=no)
++ if test x$enable_gtk = xno ; then
++ AC_ERROR([GTK2 is required to build libjingle.])
++ else
++ AC_SUBST(GTK2_CFLAGS)
++ AC_SUBST(GTK2_LIBS)
++ AC_DEFINE(HAVE_GTK2, 1, [GTK2 present])
++ fi
++fi
++
++PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no)
++if test x$enable_srtp = xno ; then
++ HAVE_SRTP=no
++else
++ AC_SUBST(LIBSRTP_CFLAGS)
++ AC_SUBST(LIBSRTP_LIBS)
++ AC_DEFINE(HAVE_SRTP, 1, [libSRTP provides SRTP supprt])
++fi
++
++AC_OUTPUT([Makefile
++ talk/Makefile
++ talk/base/Makefile
++ talk/examples/Makefile
++ talk/examples/login/Makefile
++ talk/examples/call/Makefile
++ talk/p2p/Makefile
++ talk/p2p/base/Makefile
++ talk/p2p/client/Makefile
++ talk/session/Makefile
++ talk/session/tunnel/Makefile
++ talk/session/phone/Makefile
++ talk/xmllite/Makefile
++ talk/xmpp/Makefile
++ pkgconfig/Makefile
++ pkgconfig/jinglebase.pc
++ pkgconfig/jinglep2p.pc
++ pkgconfig/jinglesessiontunnel.pc
++ pkgconfig/jinglesessionphone.pc
++ ])
+diff -up libjingle-0.6.0/Makefile.am.SANITY libjingle-0.6.0/Makefile.am
+--- libjingle-0.6.0/Makefile.am.SANITY 2011-09-27 16:25:02.575566945 -0400
++++ libjingle-0.6.0/Makefile.am 2011-09-27 16:25:02.575566945 -0400
+@@ -0,0 +1,4 @@
++SUBDIRS=talk pkgconfig
++
++configdir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk
++config_HEADERS = config.h
+diff -up libjingle-0.6.0/pkgconfig/jinglebase.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglebase.pc.in
+--- libjingle-0.6.0/pkgconfig/jinglebase.pc.in.SANITY 2011-09-27 16:25:02.579566893 -0400
++++ libjingle-0.6.0/pkgconfig/jinglebase.pc.in 2011-09-27 16:25:02.575566945 -0400
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglebase
++Description: Jingle Base Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglebase
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.6.0/pkgconfig/jinglep2p.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglep2p.pc.in
+--- libjingle-0.6.0/pkgconfig/jinglep2p.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400
++++ libjingle-0.6.0/pkgconfig/jinglep2p.pc.in 2011-09-27 16:25:02.580566881 -0400
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglep2p
++Description: Jingle P2P Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -ljinglep2pbase -ljinglep2pclient -ljinglexmllite -ljinglexmpp -lexpat
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in
+--- libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400
++++ libjingle-0.6.0/pkgconfig/jinglesessionphone.pc.in 2011-09-27 16:25:02.580566881 -0400
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglesessionphone
++Description: Jingle Session Phone Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in.SANITY libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in
+--- libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in.SANITY 2011-09-27 16:25:02.580566881 -0400
++++ libjingle-0.6.0/pkgconfig/jinglesessiontunnel.pc.in 2011-09-27 16:25:02.580566881 -0400
+@@ -0,0 +1,12 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++
++Name: jinglesessiontunnel
++Description: Jingle Session Tunnel Library
++Requires:
++Version: @VERSION@
++Libs: -L${libdir} -lpthread -ljinglesessiontunnel
++Cflags: -I${includedir}/libjingle- at LIBJINGLE_MAJORMINOR@ -DPOSIX
++
+diff -up libjingle-0.6.0/pkgconfig/Makefile.am.SANITY libjingle-0.6.0/pkgconfig/Makefile.am
+--- libjingle-0.6.0/pkgconfig/Makefile.am.SANITY 2011-09-27 16:25:02.580566881 -0400
++++ libjingle-0.6.0/pkgconfig/Makefile.am 2011-09-27 16:25:02.580566881 -0400
+@@ -0,0 +1,20 @@
++### all of the standard pc files we need to generate
++pcfiles = jinglebase- at LIBJINGLE_MAJORMINOR@.pc jinglep2p- at LIBJINGLE_MAJORMINOR@.pc jinglesessiontunnel- at LIBJINGLE_MAJORMINOR@.pc jinglesessionphone- at LIBJINGLE_MAJORMINOR@.pc
++
++all-local: $(pcfiles)
++
++### how to generate pc files
++%- at LIBJINGLE_MAJORMINOR@.pc: %.pc
++ cp $< $@
++
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = $(pcfiles)
++
++EXTRA_DIST = \
++ jinglebase.pc.in \
++ jinglep2p.pc.in \
++ jinglesessionphone.pc.in \
++ jinglesessiontunnel.pc.in
++
++CLEANFILES = $(pcfiles)
++
+diff -up libjingle-0.6.0/talk/base/Makefile.am.SANITY libjingle-0.6.0/talk/base/Makefile.am
+--- libjingle-0.6.0/talk/base/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400
++++ libjingle-0.6.0/talk/base/Makefile.am 2011-09-27 16:25:02.581566869 -0400
+@@ -0,0 +1,142 @@
++lib_LTLIBRARIES = libjinglebase.la
++
++libjinglebase_la_SOURCES = asyncfile.cc \
++ asynchttprequest.cc \
++ asyncsocket.cc \
++ asynctcpsocket.cc \
++ asyncudpsocket.cc \
++ autodetectproxy.cc \
++ base64.cc \
++ basicpacketsocketfactory.cc \
++ bytebuffer.cc \
++ checks.cc \
++ common.cc \
++ diskcache.cc \
++ event.cc \
++ fileutils.cc \
++ firewallsocketserver.cc \
++ flags.cc \
++ helpers.cc \
++ host.cc \
++ httpbase.cc \
++ httpclient.cc \
++ httpcommon.cc \
++ httprequest.cc \
++ linux.cc \
++ logging.cc \
++ md5c.c \
++ messagehandler.cc \
++ messagequeue.cc \
++ nethelpers.cc \
++ network.cc \
++ openssladapter.cc \
++ opensslidentity.cc \
++ opensslstreamadapter.cc \
++ pathutils.cc \
++ physicalsocketserver.cc \
++ proxydetect.cc \
++ proxyinfo.cc \
++ ratetracker.cc \
++ signalthread.cc \
++ socketadapters.cc \
++ socketaddress.cc \
++ socketaddresspair.cc \
++ socketpool.cc \
++ socketstream.cc \
++ ssladapter.cc \
++ sslsocketfactory.cc \
++ sslstreamadapter.cc \
++ stream.cc \
++ stringdigest.cc \
++ stringencode.cc \
++ stringutils.cc \
++ task.cc \
++ taskparent.cc \
++ taskrunner.cc \
++ thread.cc \
++ time.cc \
++ unixfilesystem.cc \
++ urlencode.cc
++
++libjinglebase_la_LIBADD = -lrt
++
++libjinglebase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++libjinglebase_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/base
++
++libjinglebase_include_HEADERS = asyncfile.h \
++ asynchttprequest.h \
++ asyncpacketsocket.h \
++ asyncsocket.h \
++ asynctcpsocket.h \
++ asyncudpsocket.h \
++ autodetectproxy.h \
++ base64.h \
++ basicdefs.h \
++ basicpacketsocketfactory.h \
++ basictypes.h \
++ bytebuffer.h \
++ byteorder.h \
++ checks.h \
++ common.h \
++ constructormagic.h \
++ criticalsection.h \
++ cryptstring.h \
++ diskcache.h \
++ event.h \
++ fileutils.h \
++ firewallsocketserver.h \
++ flags.h \
++ helpers.h \
++ host.h \
++ httpbase.h \
++ httpclient.h \
++ httpcommon-inl.h \
++ httpcommon.h \
++ httprequest.h \
++ linked_ptr.h \
++ linux.h \
++ logging.h \
++ md5.h \
++ messagehandler.h \
++ messagequeue.h \
++ nethelpers.h \
++ network.h \
++ openssladapter.h \
++ opensslidentity.h \
++ opensslstreamadapter.h \
++ packetsocketfactory.h \
++ pathutils.h \
++ physicalsocketserver.h \
++ proxydetect.h \
++ proxyinfo.h \
++ ratetracker.h \
++ scoped_ptr.h \
++ sec_buffer.h \
++ signalthread.h \
++ sigslot.h \
++ sigslotrepeater.h \
++ socket.h \
++ socketadapters.h \
++ socketaddress.h \
++ socketaddresspair.h \
++ socketfactory.h \
++ socketpool.h \
++ socketserver.h \
++ socketstream.h \
++ ssladapter.h \
++ sslsocketfactory.h \
++ sslstreamadapter.h \
++ stream.h \
++ stringdigest.h \
++ stringencode.h \
++ stringutils.h \
++ task.h \
++ taskparent.h \
++ taskrunner.h \
++ thread.h \
++ time.h \
++ unixfilesystem.h \
++ urlencode.h
++
++AM_CXXFLAGS = -DPOSIX
+diff -up libjingle-0.6.0/talk/examples/call/Makefile.am.SANITY libjingle-0.6.0/talk/examples/call/Makefile.am
+--- libjingle-0.6.0/talk/examples/call/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400
++++ libjingle-0.6.0/talk/examples/call/Makefile.am 2011-09-27 16:25:02.581566869 -0400
+@@ -0,0 +1,23 @@
++bin_PROGRAMS = call
++call_CXXFLAGS = $(AM_CXXFLAGS)
++call_SOURCES = call_main.cc \
++ callclient.cc \
++ console.cc \
++ discoitemsquerytask.cc \
++ friendinvitesendtask.cc \
++ mucinviterecvtask.cc \
++ mucinvitesendtask.cc \
++ presenceouttask.cc \
++ presencepushtask.cc \
++ voicemailjidrequester.cc
++noinst_HEADERS = callclient.h console.h
++call_LDADD = $(top_srcdir)/talk/examples/login/libxmpphelp.la \
++ $(top_srcdir)/talk/session/phone/libjinglesessionphone.la \
++ $(top_srcdir)/talk/p2p/client/libjinglep2pclient.la \
++ $(top_srcdir)/talk/p2p/base/libjinglep2pbase.la \
++ $(top_srcdir)/talk/xmpp/libjinglexmpp.la \
++ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/base/libjinglebase.la \
++ $(EXPAT_LIBS) $(OPENSSL_LIBS) $(ALSA_LIBS) $(LIBSRTP_LIBS) -lpthread
++AM_CPPFLAGS = -DPOSIX
++
+diff -up libjingle-0.6.0/talk/examples/login/Makefile.am.SANITY libjingle-0.6.0/talk/examples/login/Makefile.am
+--- libjingle-0.6.0/talk/examples/login/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400
++++ libjingle-0.6.0/talk/examples/login/Makefile.am 2011-09-27 16:25:02.581566869 -0400
+@@ -0,0 +1,24 @@
++noinst_LTLIBRARIES= libxmpphelp.la
++libxmpphelp_la_SOURCES = xmppsocket.cc \
++ xmppauth.cc \
++ xmpppump.cc
++
++noinst_HEADERS = xmppauth.h \
++ xmpppump.h \
++ xmppsocket.h \
++ xmppthread.h \
++ jingleinfotask.h \
++ presenceouttask.h \
++ presencepushtask.h \
++ status.h
++
++bin_PROGRAMS = login
++login_CXXFLAGS = $(AM_CXXFLAGS)
++login_SOURCES = login_main.cc xmppthread.cc
++login_LDADD = $(top_srcdir)/talk/xmpp/libjinglexmpp.la \
++ $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/base/libjinglebase.la \
++ $(top_srcdir)/talk/examples/login/libxmpphelp.la \
++ $(EXPAT_LIBS) $(OPENSSL_LIBS) -lpthread
++AM_CPPFLAGS = -DPOSIX
++
+diff -up libjingle-0.6.0/talk/examples/Makefile.am.SANITY libjingle-0.6.0/talk/examples/Makefile.am
+--- libjingle-0.6.0/talk/examples/Makefile.am.SANITY 2011-09-27 16:25:02.581566869 -0400
++++ libjingle-0.6.0/talk/examples/Makefile.am 2011-09-27 16:25:02.581566869 -0400
+@@ -0,0 +1 @@
++SUBDIRS=login call
+diff -up libjingle-0.6.0/talk/Makefile.am.SANITY libjingle-0.6.0/talk/Makefile.am
+--- libjingle-0.6.0/talk/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400
++++ libjingle-0.6.0/talk/Makefile.am 2011-09-27 16:25:02.582566857 -0400
+@@ -0,0 +1 @@
++SUBDIRS=base xmllite xmpp p2p session
+diff -up libjingle-0.6.0/talk/p2p/base/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/base/Makefile.am
+--- libjingle-0.6.0/talk/p2p/base/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400
++++ libjingle-0.6.0/talk/p2p/base/Makefile.am 2011-09-27 16:25:02.582566857 -0400
+@@ -0,0 +1,74 @@
++lib_LTLIBRARIES = libjinglep2pbase.la
++
++libjinglep2pbase_la_SOURCES = stun.cc \
++ port.cc \
++ udpport.cc \
++ tcpport.cc \
++ stunport.cc \
++ relayport.cc \
++ relayserver.cc \
++ stunrequest.cc \
++ stunserver.cc \
++ sessionmanager.cc \
++ sessionmessages.cc \
++ session.cc \
++ sessiondescription.cc \
++ transport.cc \
++ transportchannel.cc \
++ transportchannelproxy.cc \
++ p2ptransport.cc \
++ p2ptransportchannel.cc \
++ rawtransport.cc \
++ rawtransportchannel.cc \
++ constants.cc \
++ pseudotcp.cc \
++ parsing.cc
++
++libjinglep2pbase_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/base
++libjinglep2pbase_include_HEADERS = candidate.h \
++ portallocator.h \
++ relayport.h \
++ session.h \
++ stunport.h \
++ tcpport.h \
++ port.h \
++ sessionid.h \
++ stunrequest.h \
++ udpport.h \
++ pseudotcp.h \
++ sessiondescription.h \
++ sessionmanager.h \
++ stun.h \
++ relayserver.h \
++ stunserver.h \
++ sessionclient.h \
++ transport.h \
++ transportchannel.h \
++ transportchannelproxy.h \
++ transportchannelimpl.h \
++ p2ptransport.h \
++ p2ptransportchannel.h \
++ rawtransport.h \
++ rawtransportchannel.h \
++ constants.h \
++ common.h \
++ parsing.h \
++ sessionmessages.h
++
++libjinglep2pbase_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++libjinglep2pbase_la_LIBADD = $(top_srcdir)/talk/xmllite/libjinglexmllite.la \
++ $(top_srcdir)/talk/xmpp/libjinglexmpp.la
++
++AM_CPPFLAGS = -DPOSIX -DENABLE_DEBUG -D_DEBUG -g
++
++P2PLIBS = libjinglep2pbase.la ../../base/libjinglebase.la -lpthread
++XMLLIBS = ../../xmllite/libjinglexmllite.la ../../xmpp/libjinglexmpp.la $(EXPAT_LIBS)
++
++bin_PROGRAMS = relayserver stunserver
++relayserver_SOURCES = relayserver.cc relayserver_main.cc
++relayserver_LDADD = $(P2PLIBS)
++relayserver_CPPFLAGS = $(AM_CPPFLAGS)
++
++stunserver_SOURCES = stunserver.cc stunserver_main.cc
++stunserver_LDADD = $(P2PLIBS)
++stunserver_CPPFLAGS = $(AM_CPPFLAGS)
+diff -up libjingle-0.6.0/talk/p2p/client/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/client/Makefile.am
+--- libjingle-0.6.0/talk/p2p/client/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400
++++ libjingle-0.6.0/talk/p2p/client/Makefile.am 2011-09-27 16:25:02.582566857 -0400
+@@ -0,0 +1,18 @@
++lib_LTLIBRARIES = libjinglep2pclient.la
++
++libjinglep2pclient_la_SOURCES = basicportallocator.cc \
++ httpportallocator.cc \
++ socketmonitor.cc
++
++libjinglep2pclient_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/p2p/client
++
++libjinglep2pclient_include_HEADERS = basicportallocator.h \
++ socketmonitor.h \
++ sessionmanagertask.h \
++ sessionsendtask.h \
++ httpportallocator.h
++
++libjinglep2pclient_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CPPFLAGS = -I../../.. -DLINUX -DPOSIX -DINTERNAL_BUILD
++
+diff -up libjingle-0.6.0/talk/p2p/Makefile.am.SANITY libjingle-0.6.0/talk/p2p/Makefile.am
+--- libjingle-0.6.0/talk/p2p/Makefile.am.SANITY 2011-09-27 16:25:02.582566857 -0400
++++ libjingle-0.6.0/talk/p2p/Makefile.am 2011-09-27 16:25:02.582566857 -0400
+@@ -0,0 +1 @@
++SUBDIRS=base client
+diff -up libjingle-0.6.0/talk/session/Makefile.am.SANITY libjingle-0.6.0/talk/session/Makefile.am
+--- libjingle-0.6.0/talk/session/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400
++++ libjingle-0.6.0/talk/session/Makefile.am 2011-09-27 16:25:02.583566844 -0400
+@@ -0,0 +1 @@
++SUBDIRS = tunnel phone
+diff -up libjingle-0.6.0/talk/session/phone/Makefile.am.SANITY libjingle-0.6.0/talk/session/phone/Makefile.am
+--- libjingle-0.6.0/talk/session/phone/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400
++++ libjingle-0.6.0/talk/session/phone/Makefile.am 2011-09-27 16:37:01.185446766 -0400
+@@ -0,0 +1,55 @@
++lib_LTLIBRARIES = libjinglesessionphone.la
++
++libjinglesessionphone_la_SOURCES = audiomonitor.cc \
++ call.cc \
++ channel.cc \
++ channelmanager.cc \
++ codec.cc \
++ currentspeakermonitor.cc \
++ devicemanager.cc \
++ filemediaengine.cc \
++ gtkvideorenderer.cc \
++ libudevsymboltable.cc \
++ mediaengine.cc \
++ mediamessages.cc \
++ mediamonitor.cc \
++ mediasession.cc \
++ mediasessionclient.cc \
++ rtcpmuxfilter.cc \
++ rtpdump.cc \
++ rtputils.cc \
++ soundclip.cc \
++ srtpfilter.cc \
++ v4llookup.cc
++
++libjinglesessionphone_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/session/phone
++libjinglesessionphone_include_HEADERS = audiomonitor.h \
++ call.h \
++ codec.h \
++ channel.h \
++ channelmanager.h \
++ currentspeakermonitor.h \
++ filemediaengine.h \
++ libudevsymboltable.h \
++ mediachannel.h \
++ mediacommon.h \
++ mediaengine.h \
++ mediamessages.h \
++ mediasessionclient.h \
++ mediasink.h \
++ rtcpmuxfilter.h \
++ rtpdump.h \
++ rtputils.h \
++ soundclip.h \
++ srtpfilter.h \
++ voicechannel.h \
++ videocommon.h \
++ videoframe.h \
++ videorenderer.h \
++ videorendererfactory.h
++
++libjinglesessionphone_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++libjinglesessionphone_la_LIBADD = $(LIBSRTP_LIBS) $(GTK2_LIBS)
++
++AM_CPPFLAGS := -DPOSIX $(LIBSRTP_CFLAGS) $(GTK2_CFLAGS)
+diff -up libjingle-0.6.0/talk/session/tunnel/Makefile.am.SANITY libjingle-0.6.0/talk/session/tunnel/Makefile.am
+--- libjingle-0.6.0/talk/session/tunnel/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400
++++ libjingle-0.6.0/talk/session/tunnel/Makefile.am 2011-09-27 16:25:02.583566844 -0400
+@@ -0,0 +1,16 @@
++lib_LTLIBRARIES = libjinglesessiontunnel.la
++
++libjinglesessiontunnel_la_SOURCES = tunnelsessionclient.cc \
++ securetunnelsessionclient.cc \
++ pseudotcpchannel.cc
++
++libjinglesessiontunnel_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/session/tunnel
++
++libjinglesessiontunnel_include_HEADERS = tunnelsessionclient.h \
++ pseudotcpchannel.h \
++ securetunnelsessionclient.h
++
++libjinglesessiontunnel_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CXXFLAGS = -DPOSIX
++
+diff -up libjingle-0.6.0/talk/xmllite/Makefile.am.SANITY libjingle-0.6.0/talk/xmllite/Makefile.am
+--- libjingle-0.6.0/talk/xmllite/Makefile.am.SANITY 2011-09-27 16:25:02.583566844 -0400
++++ libjingle-0.6.0/talk/xmllite/Makefile.am 2011-09-27 16:25:02.583566844 -0400
+@@ -0,0 +1,21 @@
++lib_LTLIBRARIES = libjinglexmllite.la
++
++libjinglexmllite_la_SOURCES = qname.cc \
++ xmlbuilder.cc \
++ xmlconstants.cc \
++ xmlelement.cc \
++ xmlnsstack.cc \
++ xmlparser.cc \
++ xmlprinter.cc
++
++libjinglexmllite_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/xmllite
++libjinglexmllite_include_HEADERS = qname.h \
++ xmlbuilder.h \
++ xmlconstants.h \
++ xmlelement.h \
++ xmlnsstack.h \
++ xmlparser.h \
++ xmlprinter.h
++AM_CPPFLAGS = -DPOSIX
++
++libjinglexmllite_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION) $(EXPAT_LIBS)
+diff -up libjingle-0.6.0/talk/xmpp/Makefile.am.SANITY libjingle-0.6.0/talk/xmpp/Makefile.am
+--- libjingle-0.6.0/talk/xmpp/Makefile.am.SANITY 2011-09-27 16:25:02.584566831 -0400
++++ libjingle-0.6.0/talk/xmpp/Makefile.am 2011-09-27 16:25:02.584566831 -0400
+@@ -0,0 +1,35 @@
++lib_LTLIBRARIES = libjinglexmpp.la
++
++libjinglexmpp_la_SOURCES = constants.cc \
++ jid.cc \
++ saslmechanism.cc \
++ xmppclient.cc \
++ xmppengineimpl.cc \
++ xmppengineimpl_iq.cc \
++ xmpplogintask.cc \
++ xmppstanzaparser.cc \
++ xmpptask.cc \
++ ratelimitmanager.cc
++
++libjinglexmpp_includedir = $(includedir)/libjingle- at LIBJINGLE_MAJORMINOR@/talk/xmpp
++libjinglexmpp_include_HEADERS = asyncsocket.h \
++ prexmppauth.h \
++ saslhandler.h \
++ xmpplogintask.h \
++ jid.h \
++ saslmechanism.h \
++ xmppclient.h \
++ constants.h \
++ saslplainmechanism.h \
++ xmppclientsettings.h \
++ xmppstanzaparser.h \
++ xmppengine.h \
++ xmpptask.h \
++ plainsaslhandler.h \
++ saslcookiemechanism.h \
++ xmppengineimpl.h \
++ ratelimitmanager.h
++
++libjinglexmpp_la_LDFLAGS = -version-info $(LIBJINGLE_LIBRARY_VERSION)
++
++AM_CPPFLAGS = -DPOSIX
diff --git a/libjingle.spec b/libjingle.spec
index 3502310..98cbf90 100644
--- a/libjingle.spec
+++ b/libjingle.spec
@@ -1,12 +1,12 @@
Name: libjingle
Version: 0.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: GoogleTalk implementation of Jingle
Group: System Environment/Libraries
License: BSD
URL: http://code.google.com/apis/talk/libjingle/
Source0: http://libjingle.googlecode.com/files/%{name}-%{version}.zip
-Patch0: libjingle-0.5.8-build-sanity.patch
+Patch0: libjingle-0.6.0-build-sanity.patch
# talk/base/basictypes.h and talk/base/logging.h must be included
# before any header with __BEGIN_DECLS, notably, sys/types.h
Patch1: libjingle-0.5.1-C-linkage-fix.patch
@@ -60,6 +60,7 @@ BuildRequires: alsa-lib-devel
BuildRequires: pkgconfig
BuildRequires: kernel-headers
BuildRequires: libudev-devel
+BuildRequires: gtk2-devel
Requires: libudev
%description
@@ -143,12 +144,16 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root,-)
-%{_includedir}/%{name}-0.5/
+%{_includedir}/%{name}-0.6/
%{_libdir}/*.so
-%{_libdir}/pkgconfig/jingle*-0.5.pc
+%{_libdir}/pkgconfig/jingle*-0.6.pc
%changelog
+* Tue Sep 27 2011 Tom Callaway <spot at fedoraproject.org> - 0.6.0-2
+- fix phone bits up
+- properly bump to 0.6
+
* Tue Sep 27 2011 Tom Callaway <spot at fedoraproject.org> - 0.6.0-1
- update to 0.6.0
More information about the scm-commits
mailing list