rpms/linphone/FC-6 linphone-1.5.1-osipcompat.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 linphone.spec, 1.23, 1.24 sources, 1.6, 1.7

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/linphone/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2882

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.5.1-osipcompat.patch 
Log Message:
Update to 1.5.1

linphone-1.5.1-osipcompat.patch:

--- NEW FILE linphone-1.5.1-osipcompat.patch ---
Index: console/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/console/Makefile.am,v
retrieving revision 1.45
diff -u -r1.45 Makefile.am
--- console/Makefile.am	18 Oct 2006 13:41:21 -0000	1.45
+++ console/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -6,7 +6,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/exosip \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: coreapi/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/coreapi/Makefile.am,v
retrieving revision 1.38
diff -u -r1.38 Makefile.am
--- coreapi/Makefile.am	21 Jul 2006 14:35:35 -0000	1.38
+++ coreapi/Makefile.am	22 Nov 2006 04:02:08 -0000
@@ -10,7 +10,7 @@
 	-I$(top_srcdir)/exosip\
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include/ 
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 lib_LTLIBRARIES=liblinphone.la
Index: exosip/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/exosip/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- exosip/Makefile.am	15 Feb 2005 16:12:13 -0000	1.3
+++ exosip/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -1,7 +1,7 @@
 noinst_LTLIBRARIES = libeXosip.la
 
 
-AM_CFLAGS = $(EXOSIP_CFLAGS)
+AM_CFLAGS = $(EXOSIP_CFLAGS) $(OSIP_CFLAGS)
 
 libeXosip_la_SOURCES =       eXosip.c  \
 jrequest.c jresponse.c    jcallback.c  jdialog.c   udp.c  \
Index: gnome/Makefile.am
===================================================================
RCS file: /sources/linphone/linphone/gnome/Makefile.am,v
retrieving revision 1.33
diff -u -r1.33 Makefile.am
--- gnome/Makefile.am	25 Aug 2006 14:15:17 -0000	1.33
+++ gnome/Makefile.am	22 Nov 2006 04:02:09 -0000
@@ -20,7 +20,7 @@
 	-I$(top_srcdir)/oRTP/include \
 	-I$(top_srcdir)/coreapi \
 	-I$(top_srcdir)/mediastreamer2/include \
-	-I$(osip_prefix)/include
+	-I$(osip_prefix)/include/osip2-2.2.2
 
 
 
Index: m4/osip.m4
===================================================================
RCS file: /sources/linphone/linphone/m4/osip.m4,v
retrieving revision 1.2
diff -u -r1.2 osip.m4
--- m4/osip.m4	22 Feb 2005 17:31:03 -0000	1.2
+++ m4/osip.m4	22 Nov 2006 04:02:09 -0000
@@ -6,7 +6,7 @@
 AC_SUBST(osip_prefix)
 
 
-OSIP_CFLAGS="-I$osip_prefix/include"
+OSIP_CFLAGS="-I$osip_prefix/include/osip2-2.2.2"
 OSIP_LIBS="-L$osip_prefix/lib"
 
 dnl check osip2 headers
@@ -20,11 +20,11 @@
 LDFLAGS=$OSIP_LIBS
 dnl AC_CHECK_LIB adds osipparser2 to LIBS, I don't want that !
 LIBS_save=$LIBS
-AC_CHECK_LIB(osipparser2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
+AC_CHECK_LIB(osipparser2-2.2.2,osip_message_init, , AC_MSG_ERROR([Could not find osip2 libraries !]))
 LDFLAGS=$LDFLAGS_save
 LIBS=$LIBS_save
 
-OSIP_LIBS="$OSIP_LIBS -losipparser2 -losip2"
+OSIP_LIBS="$OSIP_LIBS -losipparser2-2.2.2 -losip2-2.2.2"
 
 AC_SUBST(OSIP_CFLAGS)
 AC_SUBST(OSIP_LIBS)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
+++ .cvsignore	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-linphone-1.5.0.tar.gz
+linphone-1.5.1.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
+++ linphone.spec	22 Nov 2006 04:52:00 -0000	1.24
@@ -1,6 +1,6 @@
 Name:           linphone
-Version:        1.5.0
-Release:        2%{?dist}
+Version:        1.5.1
+Release:        1%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -9,10 +9,11 @@
 Source0:        http://download.savannah.nongnu.org/releases/linphone/1.5.x/source/%{name}-%{version}.tar.gz
 Patch:          linphone-1.0.1-desktop.patch
 Patch1:         linphone-1.4.1-libs.patch
+Patch2:		linphone-1.5.1-osipcompat.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libosip2-devel
-BuildRequires:  ortp-devel = 0.11.0
+BuildRequires:  compat-libosip2-devel
+BuildRequires:  ortp-devel = 0.12.0
 
 BuildRequires:  readline-devel
 BuildRequires:  ncurses-devel
@@ -59,12 +60,14 @@
 Libraries and headers required to develop software with linphone.
 
 %prep
-%setup -q
-%patch -p 1 -b .old
-%patch1 -p 1 -b .libs
+%setup0 -q
+%patch0 -p1 -b .old
+%patch1 -p1 -b .libs
+%patch2 -p0 -b .osip
 
 rm -r oRTP
 
+%build
 libtoolize --copy --force
 autoheader
 aclocal -I m4
@@ -80,7 +83,6 @@
 autoconf
 popd
 
-%build
 %configure --disable-static --disable-video
 make %{?_smp_mflags}
 
@@ -116,6 +118,7 @@
 %{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
+%{_mandir}/cs/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
@@ -133,6 +136,9 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Tue Nov 21 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.1-1
+- Update to 1.5.1
+
 * Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-2
 - Don't forget to add new files and remove old ones!
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	9 Nov 2006 17:52:58 -0000	1.6
+++ sources	22 Nov 2006 04:52:00 -0000	1.7
@@ -1 +1 @@
-e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz
+196f817d77aba906e7c1a896f8501a0f  linphone-1.5.1.tar.gz