Commit 641888f9 authored by jehan's avatar jehan

migrate rpm spec to belle sip

parent 34f40589
......@@ -4,7 +4,7 @@
ACLOCAL_AMFLAGS = -I m4 $(ACLOCAL_MACOS_FLAGS)
SUBDIRS = build m4 pixmaps po @ORTP_DIR@ @MS2_DIR@ \
coreapi console gtk share scripts tools tester
coreapi console gtk share scripts tools tester include
......
......@@ -696,7 +696,7 @@ AM_CONDITIONAL(ENABLE_MANUAL, test x$have_sgmltools$build_manual = xyesyes )
dnl for external use of linphone libs
LINPHONE_CFLAGS="-I${includedir} -I${includedir}/linphone"
LINPHONE_LIBS="-L${libdir} -llinphone"
LINPHONE_LIBS="-L${libdir} -llinphone -llpc2xml -lxml2lpc"
AC_SUBST(LINPHONE_CFLAGS)
AC_SUBST(LINPHONE_LIBS)
......@@ -796,6 +796,7 @@ AC_CONFIG_FILES([
m4/Makefile
po/Makefile.in
pixmaps/Makefile
include/Makefile
coreapi/Makefile
coreapi/help/Makefile
coreapi/help/Doxyfile
......
......@@ -27,7 +27,7 @@ lib_LTLIBRARIES=liblinphone.la
liblinphone_la_SOURCES=\
linphonecore.c linphonecore.h private.h\
offeranswer.c offeranswer.h\
sal.c sal.h \
sal.c \
callbacks.c \
misc.c \
address.c \
......@@ -54,7 +54,7 @@ liblinphone_la_SOURCES+=upnp.c upnp.h
endif
liblinphone_la_SOURCES+= bellesip_sal/sal_address_impl.c \
bellesip_sal/sal_impl.c \
bellesip_sal/sal_impl.c bellesip_sal/sal_impl.h \
bellesip_sal/sal_op_impl.c \
bellesip_sal/sal_op_call.c \
bellesip_sal/sal_op_registration.c \
......
......@@ -830,8 +830,9 @@ void linphone_call_unref(LinphoneCall *obj){
* Returns current parameters associated to the call.
**/
const LinphoneCallParams * linphone_call_get_current_params(LinphoneCall *call){
#ifdef VIDEO_ENABLED
VideoStream *vstream;
#endif
MS_VIDEO_SIZE_ASSIGN(call->current_params.sent_vsize, UNKNOWN);
MS_VIDEO_SIZE_ASSIGN(call->current_params.recv_vsize, UNKNOWN);
#ifdef VIDEO_ENABLED
......
......@@ -11,7 +11,7 @@
Name: linphone
Version: @VERSION@
Release: %(git describe --tags --abbrev=40 | sed -rn 's/^.*-([0-9]+)-g[a-z0-9]{40}$/\1/p' || echo '1')%{?dist}
Release: %(version=`git describe --tags --abbrev=40 | sed -rn 's/^.*-([0-9]+)-g[a-z0-9]{40}$/\1/p'` && if test -z "$version" ; then echo 0 ; else echo $version ; fi)%{?dist}
Summary: Phone anywhere in the whole world by using the Internet
Group: Applications/Communications
......@@ -24,7 +24,7 @@ BuildArch: i686
%endif
BuildRequires: gtk2-devel
BuildRequires: libeXosip2-devel speex-devel gettext
BuildRequires: belle-sip-devel speex-devel gettext
BuildRequires: intltool gettext-devel
%if %{video}
BuildRequires: ffmpeg-devel SDL-devel
......@@ -47,9 +47,6 @@ Libraries and headers required to develop software with linphone.
%prep
%setup -q
#%patch -p 1 -b .pkgconfig
#%patch1 -p 1 -b .Werror
#%patch2 -p 1 -b .old
%build
%configure \
......@@ -85,7 +82,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root)
%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/*
%{_libdir}/liblinphone.so.*
%{_libdir}/*.so.*
%{_mandir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/linphone
......@@ -96,13 +93,17 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(-,root,root)
%{_includedir}/linphone
%{_libdir}/liblinphone.a
%{_libdir}/liblinphone.la
%{_libdir}/liblinphone.so
%{_libdir}/*.a
%{_libdir}/*.la
%{_libdir}/*.so
%{_libdir}/pkgconfig/linphone.pc
%{_datadir}/tutorials/linphone/*.c
%{_docdir}
%changelog
* Mon Aug 19 2013 Jehan Monnier <jehan.monnier@linphone.org> - 3.6.99
- belle sip migration
* Wed Sep 28 2005 Francois-Xavier 'FiX' KOWALSKI <francois-xavier.kowalski@hp.com> - 1.2.0pre3
- Updated to latests Simon's work
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment