packages: libjingle/libjingle.spec - up to 0.5.1, with fedora patches to build

Thu Jan 6 11:50:12 CET 2011

Author: glen                         Date: Thu Jan  6 10:50:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 0.5.1, with fedora patches to build

---- Files affected:
packages/libjingle:
   libjingle.spec (1.19 -> 1.20) 

---- Diffs:

================================================================
Index: packages/libjingle/libjingle.spec
diff -u packages/libjingle/libjingle.spec:1.19 packages/libjingle/libjingle.spec:1.20

--- packages/libjingle/libjingle.spec:1.19	Thu Apr 22 03:52:51 2010
+++ packages/libjingle/libjingle.spec	Thu Jan  6 11:50:07 2011
@@ -1,15 +1,31 @@
 # $Revision$, $Date$
+%define		apiver	0.5
 Summary:	Google Talk's implementation of Jingle and Jingle-Audio
 Summary(pl.UTF-8):	Implementacja Jingle i Jingle-Audio programu Google Talk
 Name:		libjingle
-Version:	0.4.0
-Release:	4
+Version:	0.5.1
+Release:	1
 License:	BSD
 Group:		Applications
-Source0:	http://libjingle.googlecode.com/files/%{name}-%{version}.tar.gz
-# Source0-md5:	4fd81566ead30285e157a7fa16430b6e
+Source0:	http://libjingle.googlecode.com/files/%{name}-%{version}.zip
+# Source0-md5:	a59bac5b6111afc79efd3d1e821c13d8
 URL:		http://code.google.com/p/libjingle/
-Patch0:		libjingle-openssl1.patch
+# fedora patches
+Patch0:		build-sanity.patch
+Patch1:		C-linkage-fix.patch
+Patch2:		NULL-fix.patch
+Patch3:		statfix.patch
+Patch4:		uint32-fix.patch
+Patch5:		timefix.patch
+Patch6:		unixfilesystemfix.patch
+Patch7:		system-expat.patch
+Patch8:		system-srtp.patch
+Patch9:		devicemanager-alsafix.patch
+Patch10:	v4llookup-fix.patch
+Patch11:	fixconflict.patch
+Patch12:	64bittypes.patch
+Patch13:	qname-threadsafe.patch
+# /fedora patches
 BuildRequires:	alsa-lib-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -22,10 +38,14 @@
 BuildRequires:	openssl-devel >= 0.9.7g
 BuildRequires:	ortp-devel
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.583
 BuildRequires:	speex-devel
+BuildRequires:	srtp-devel
 Requires:	openssl >= 0.9.7g
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define		skip_post_check_so	libjinglebase.so.*.*.* libjinglexmpp.so.1.0.0 libjinglep2pbase.so.1.0.0 libjinglep2pclient.so.1.0.0 libjinglesessiontunnel.so.1.0.0 libjinglesessionphone.so.1.0.0
+
 %description
 Libjingle is a set of C++ components provided by Google to
 interoperate with Google Talk's peer-to-peer and voice calling
@@ -68,24 +88,22 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
 
 # bashism
-sed 's/^\([A-Z]*\)+=\(.*\)/\1="$\1 \2"/' -i configure.ac
-
-# outdated C++ style
-sed '1i\#include <string.h>\n#include <stdlib.h>\n#include <stdio.h>' \
-	-i talk/base/{basictypes.h,stringutils.h,cryptstring.h}
-sed 's/std::exit/exit/; 1i\#include <stdlib.h>' -i talk/base/host.cc
-sed 's/Base64:://' -i talk/base/base64.h
-sed 's/Traits<char>:://' -i talk/base/stringutils.h
-sed '1i\#include <malloc.h>\n#include <string.h>' -i talk/base/urlencode.cc
-sed 's/std::\(strerror\|memcmp\|memcpy\)/\1/' \
-	-i talk/base/{asynctcpsocket.cc,socketadapters.cc} \
-	-i talk/base/{natsocketfactory.cc,natserver.cc,testclient.cc} \
-	-i talk/p2p/base/{stun.cc,port.cc,relayport.cc,relayserver_main.cc,stunserver.cc,stunserver_main.cc,session_unittest.cc}
-
-sed 's/XmppClient:://' -i talk/xmpp/xmppclient.h
-sed 's/SessionManager:://' -i talk/p2p/base/sessionmanager.h
+sed 's/\([A-Z]*\)+=\(.*\)/\1="$\1 \2"/' -i configure.ac
 
 %build
 %{__libtoolize}
@@ -93,7 +111,8 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
+%configure \
+	--disable-static
 %{__make}
 
 %install
@@ -110,16 +129,45 @@
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog COPYING DOCUMENTATION NEWS README
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc AUTHORS COPYING README
+%attr(755,root,root) %{_bindir}/relayserver
+%attr(755,root,root) %{_bindir}/stunserver
+%attr(755,root,root) %{_libdir}/libjinglebase.so.*.*.*
+%ghost %{_libdir}/libjinglebase.so.1
+%attr(755,root,root) %{_libdir}/libjinglep2pbase.so.*.*.*
+%ghost %{_libdir}/libjinglep2pbase.so.1
+%attr(755,root,root) %{_libdir}/libjinglep2pclient.so.*.*.*
+%ghost %{_libdir}/libjinglep2pclient.so.1
+%attr(755,root,root) %{_libdir}/libjinglesessionphone.so.*.*.*
+%ghost %{_libdir}/libjinglesessionphone.so.1
+%attr(755,root,root) %{_libdir}/libjinglesessiontunnel.so.*.*.*
+%ghost %{_libdir}/libjinglesessiontunnel.so.1
+%attr(755,root,root) %{_libdir}/libjinglexmllite.so.*.*.*
+%ghost %{_libdir}/libjinglexmllite.so.1
+%attr(755,root,root) %{_libdir}/libjinglexmpp.so.*.*.*
+%ghost %{_libdir}/libjinglexmpp.so.1
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/lib*.so
-%{_libdir}/libjingle*.la
-%{_includedir}/*
-%{_pkgconfigdir}/*.pc
+%{_libdir}/libjinglebase.so
+%{_libdir}/libjinglep2pbase.so
+%{_libdir}/libjinglep2pclient.so
+%{_libdir}/libjinglesessionphone.so
+%{_libdir}/libjinglesessiontunnel.so
+%{_libdir}/libjinglexmllite.so
+%{_libdir}/libjinglexmpp.so
+%{_libdir}/libjinglebase.la
+%{_libdir}/libjinglep2pbase.la
+%{_libdir}/libjinglep2pclient.la
+%{_libdir}/libjinglesessionphone.la
+%{_libdir}/libjinglesessiontunnel.la
+%{_libdir}/libjinglexmllite.la
+%{_libdir}/libjinglexmpp.la
+%{_includedir}/libjingle-%{apiver}
+%{_pkgconfigdir}/jinglebase-%{apiver}.pc
+%{_pkgconfigdir}/jinglep2p-%{apiver}.pc
+%{_pkgconfigdir}/jinglesessionphone-%{apiver}.pc
+%{_pkgconfigdir}/jinglesessiontunnel-%{apiver}.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -127,6 +175,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.20  2011/01/06 10:50:07  glen
+- up to 0.5.1, with fedora patches to build
+
 Revision 1.19  2010/04/22 01:52:51  wiget
 - added openssl1.patch to fix compilation with openssl 1.0.x
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libjingle/libjingle.spec?r1=1.19&r2=1.20&f=u

