rpms/linphone/devel linphone-1.0.1-ortp.patch, NONE, 1.1 linphone.spec, 1.11, 1.12 linphone-1.0.1-Werror.patch, 1.1, NONE

Ignacio Vazquez-Abrams (ivazquez) fedora-extras-commits at redhat.com
Wed Nov 30 14:03:19 UTC 2005 

Author: ivazquez

Update of /cvs/extras/rpms/linphone/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27694/devel

Modified Files:
	linphone.spec 
Added Files:
	linphone-1.0.1-ortp.patch 
Removed Files:
	linphone-1.0.1-Werror.patch 
Log Message:
Split out ortp

linphone-1.0.1-ortp.patch:

--- NEW FILE linphone-1.0.1-ortp.patch ---
--- linphone-1.0.1/gnome/Makefile.in.ortp	2005-03-23 03:17:46.000000000 -0500
+++ linphone-1.0.1/gnome/Makefile.in	2005-11-30 07:57:54.000000000 -0500
@@ -340,8 +340,7 @@
 @BUILD_GNOME_TRUE at INCLUDES = \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)\
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/intl \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/src \
- at BUILD_GNOME_TRUE@	-I$(top_srcdir)/oRTP/ \
+ at BUILD_GNOME_TRUE@	-I$(includedir)/ortp/ \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/mediastreamer \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/speex/libspeex \
 @BUILD_GNOME_TRUE@	-I$(top_srcdir)/coreapi \
--- linphone-1.0.1/coreapi/Makefile.in.ortp	2005-03-23 03:17:45.000000000 -0500
+++ linphone-1.0.1/coreapi/Makefile.in	2005-11-30 07:57:54.000000000 -0500
@@ -288,8 +288,7 @@
 INCLUDES = \
 	-I$(top_srcdir)\
 	-I$(top_srcdir)/exosip\
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS) \
 	-I$(osip_prefix)/include/ 
--- linphone-1.0.1/Makefile.in.ortp	2005-03-23 03:17:45.000000000 -0500
+++ linphone-1.0.1/Makefile.in	2005-11-30 07:57:54.000000000 -0500
@@ -61,7 +61,7 @@
 	uninstall-recursive
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+DIST_SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
 	win32acm mediastreamer mediastreamer2 media_api exosip coreapi \
 	console gnome share developer-docs
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -274,7 +274,7 @@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 @BUILD_TRUESPEECH_TRUE at WIN32ACM_DIR = win32acm
-SUBDIRS = m4 support pixmaps po ipkg oRTP gsmlib lpc10-1.5 \
+SUBDIRS = m4 support pixmaps po ipkg gsmlib lpc10-1.5 \
                 $(WIN32ACM_DIR) mediastreamer mediastreamer2\
 		media_api exosip coreapi console gnome share developer-docs
 
--- linphone-1.0.1/console/Makefile.in.ortp	2005-03-23 03:17:45.000000000 -0500
+++ linphone-1.0.1/console/Makefile.in	2005-11-30 07:57:54.000000000 -0500
@@ -281,8 +281,7 @@
 	-I$(top_srcdir)/coreapi\
 	-I$(top_srcdir)/osipua/\
 	-I$(top_srcdir)/osipua/src \
-	-I$(top_srcdir)/oRTP/include \
-	-I$(top_srcdir)/oRTP/ \
+	-I$(includedir)/ortp/ \
 	-I$(top_srcdir)/mediastreamer \
 	$(SPEEX_CFLAGS)\
 	-I$(osip_prefix)/include \
--- linphone-1.0.1/mediastreamer/Makefile.in.ortp	2005-03-23 03:17:47.000000000 -0500
+++ linphone-1.0.1/mediastreamer/Makefile.in	2005-11-30 07:57:54.000000000 -0500
@@ -67,7 +67,7 @@
 @BUILD_TRUESPEECH_TRUE at am__DEPENDENCIES_3 = ../win32acm/libwin32acm.a
 libmediastreamer_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_3) \
 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
@@ -363,6 +363,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -495,7 +496,7 @@
 libmediastreamer_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SAMPLERATE_LIBS)\
 							$(SUPPORTLIB) \
@@ -578,8 +579,7 @@
 
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						-I/usr/X11R6/include/X11 \
--- linphone-1.0.1/mediastreamer2/Makefile.in.ortp	2005-03-23 03:17:48.000000000 -0500
+++ linphone-1.0.1/mediastreamer2/Makefile.in	2005-11-30 08:05:12.000000000 -0500
@@ -54,7 +54,7 @@
 @BUILD_UGLIB_TRUE@	$(top_builddir)/support/libuglib.la
 libmediastreamer2_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
 	../gsmlib/libgsm.la ../lpc10-1.5/liblpc10.la \
-	../oRTP/src/libortp.la $(am__DEPENDENCIES_1) \
+	$(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_1) \
 	$(am__DEPENDENCIES_1)
 am_libmediastreamer2_la_OBJECTS = msfilter.lo msAlawdec.lo \
@@ -215,6 +215,7 @@
 MKINSTALLDIRS = @MKINSTALLDIRS@
 MSGFMT = @MSGFMT@
 OBJEXT = @OBJEXT@
+ORTP_LIBS = -lortp
 OSIP_CFLAGS = @OSIP_CFLAGS@
 OSIP_LIBS = @OSIP_LIBS@
 PACKAGE = @PACKAGE@
@@ -313,7 +314,7 @@
 libmediastreamer2_la_LIBADD = $(GLIB_LIBS) \
 							../gsmlib/libgsm.la \
 							../lpc10-1.5/liblpc10.la \
-							../oRTP/src/libortp.la \
+							$(ORTP_LIBS) \
 							$(JACK_LIBS)\
 							$(SUPPORTLIB) \
 							$(ALSA_LIBS) \
@@ -322,8 +323,7 @@
 AM_CFLAGS = $(GLIB_CFLAGS) -DG_LOG_DOMAIN=\"MediaStreamer\" $(TRUESPEECH_CFLAGS) $(IPV6_CFLAGS)
 INCLUDES = -I$(top_srcdir) \
 						-I$(top_srcdir)/mediastreamer2 \
-						-I$(top_srcdir)/oRTP/include \
-						-I$(top_srcdir)/oRTP \
+						-I$(includedir)/ortp \
 						-I$(top_srcdir)/gsmlib   \
 						-I$(top_srcdir)/lpc10-1.5    \
 						$(SPEEX_CFLAGS)
--- linphone-1.0.1/media_api/Makefile.in.ortp	2005-03-23 03:17:47.000000000 -0500
+++ linphone-1.0.1/media_api/Makefile.in	2005-11-30 07:57:55.000000000 -0500
@@ -299,8 +299,7 @@
 INCLUDES = -I$(top_srcdir)/mediastreamer \
 		-I$(top_srcdir)/speex \
 		-I$(top_srcdir)/gsmlib \
-		-I$(top_srcdir)/oRTP \
-		-I$(top_srcdir)/oRTP/src \
+		-I$(includedir)/ortp \
 		-I$(top_srcdir)/lpc10-1.5 \
 		-I$(top_srcdir)/ffmpeg 
 
--- linphone-1.0.1/configure.ortp	2005-03-23 03:17:50.000000000 -0500
+++ linphone-1.0.1/configure	2005-11-30 07:57:55.000000000 -0500
@@ -463,7 +463,6 @@
 # include <unistd.h>
 #endif"
 
-ac_subdirs_all="$ac_subdirs_all oRTP"
 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS LIBLINPHONE_SO_VERSION LINPHONE_VERSION INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RU!
 LE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL GETTEXT_PACKAGE USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS PKG_CONFIG GLIB_CFLAGS GLIB_LIBS GLIB_GENMARSHAL GOBJECT_QUERY GLIB_MKENUMS LIBGNOMEUI_CFLAGS LIBGNOMEUI_LIBS LIBGNOME_CFLAGS LIBGNOME_LIBS LIBGTK_CFLAGS LIBGTK_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS IPV6_CFLAGS TRUESPEECH_CFLAGS BUILD_TRUESPEECH_TRUE BUILD_TRUESPEECH_FALSE JACK_CFLAGS JACK_LIBS SAMPLERATE_CFLAGS SAMPLERATE_!
 LIBS osip_prefix OSIP_CFLAGS OSIP_LIBS EXOSIP_CFLAGS EXOSIP_LI!
 BS SPE
CFLAGS SPEEX_LIBS GDK_CFLAGS GDK_LIBS VIDEO_CFLAGS VIDEO_LIBS BUILD_MEDIASTREAMER_TRUE BUILD_MEDIASTREAMER_FALSE BUILD_MEDIA_API_TRUE BUILD_MEDIA_API_FALSE BUILD_UGLIB_TRUE BUILD_UGLIB_FALSE BUILD_GNOME_TRUE BUILD_GNOME_FALSE BUILD_GNOME_APPLET_TRUE BUILD_GNOME_APPLET_FALSE BUILD_SPEEX_TRUE BUILD_SPEEX_FALSE ARMBUILD_TRUE ARMBUILD_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE ALSA_LIBS subdirs HTML_DIR GTK_DOC_CFLAGS GTK_DOC_LIBS ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE have_db2html ENABLE_MANUAL_TRUE ENABLE_MANUAL_FALSE LINPHONE_CFLAGS LINPHONE_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
@@ -29042,9 +29041,6 @@
 
 
 
-subdirs="$subdirs oRTP"
-
-
 ##################################################
 # Check for gtk-doc.
 ##################################################


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/devel/linphone.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- linphone.spec	27 May 2005 20:26:30 -0000	1.11
+++ linphone.spec	30 Nov 2005 14:03:17 -0000	1.12
@@ -1,6 +1,6 @@
 Name:           linphone
 Version:        1.0.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
@@ -8,12 +8,13 @@
 URL:            http://www.linphone.org/?lang=us&rubrique=1
 Source0:        http://simon.morlat.free.fr/download/1.0.x/source/linphone-1.0.1.tar.gz
 Patch:          linphone-1.0.1-pkgconfig.patch
-Patch1:         linphone-1.0.1-Werror.patch
-Patch2:         linphone-1.0.1-desktop.patch
+Patch1:         linphone-1.0.1-desktop.patch
+Patch2:         linphone-1.0.1-ortp.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel
 BuildRequires:  libosip2-devel speex-devel gettext desktop-file-utils
+BuildRequires:  ortp-devel
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -39,28 +40,12 @@
 %description    devel
 Libraries and headers required to develop software with linphone.
 
-%package -n ortp
-Summary:        A C library implementing the RTP protocol (rfc1889)
-Group:          System Environment/Libraries
-Version:        0.7.0
-
-%description -n ortp
-oRTP is a LGPL licensed C library implementing the RTP protocol (rfc1889). It
-is available for most *nix clones (primilarly Linux and HP-UX), and Win32.
-
-%package -n ortp-devel
-Summary:        Development libraries for ortp
-Group:          Development/Libraries
-Version:        0.7.0
-
-%description -n ortp-devel
-Libraries and headers required to develop software with ortp.
-
 %prep
 %setup -q
 %patch -p 1 -b .pkgconfig
-%patch1 -p 1 -b .Werror
-%patch2 -p 1 -b .old
+%patch1 -p 1 -b .old
+%patch2 -p 1 -b .ortp
+rm -r oRTP
 
 %build
 %configure
@@ -87,10 +72,6 @@
 
 %postun -p /sbin/ldconfig
 
-%post -n ortp -p /sbin/ldconfig
-
-%postun -n ortp -p /sbin/ldconfig
-
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc AUTHORS ChangeLog COPYING NEWS README TODO
@@ -116,19 +97,10 @@
 %{_libdir}/liblinphone.so
 %{_libdir}/pkgconfig/*
 
-%files -n ortp
-%defattr(-,root,root)
-%doc oRTP/AUTHORS oRTP/ChangeLog oRTP/COPYING oRTP/NEWS oRTP/README oRTP/TODO oRTP/
-%{_libdir}/libortp.so.*
-
-%files -n ortp-devel
-%defattr(-,root,root)
-%{_includedir}/ortp
-%{_libdir}/libortp.a
-%{_libdir}/libortp.la
-%{_libdir}/libortp.so
-
 %changelog
+* Wed Nov 30 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.1-4
+- Split out ortp
+
 * Fri May 27 2005 Ignacio Vazquez-Abrams <ivazquez at ivazquez.net> 1.0.1-3
 - Fix multiple menu entry and missing icon (#158975)
 - Clean up spec file


--- linphone-1.0.1-Werror.patch DELETED ---

More information about the fedora-extras-commits mailing list