rpms/linphone/FC-6 linphone-1.4.1-libs.patch, NONE, 1.1 .cvsignore, 1.5, 1.6 linphone.spec, 1.22, 1.23 sources, 1.5, 1.6 linphone-1.0.1-pkgconfig.patch, 1.1, NONE linphone-1.1.0-Werror.patch, 1.1, NONE linphone-1.2.0-gtkentry.patch, 1.1, NONE linphone-1.2.0-maxrtp.patch, 1.1, NONE linphone-1.2.0-ortp.patch, 1.1, NONE

Thu Nov 9 17:53:28 UTC 2006

Author: jcollie

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

Modified Files:
	.cvsignore linphone.spec sources 
Added Files:
	linphone-1.4.1-libs.patch 
Removed Files:
	linphone-1.0.1-pkgconfig.patch linphone-1.1.0-Werror.patch 
	linphone-1.2.0-gtkentry.patch linphone-1.2.0-maxrtp.patch 
	linphone-1.2.0-ortp.patch 
Log Message:
Update to 1.5.0

linphone-1.4.1-libs.patch:

--- NEW FILE linphone-1.4.1-libs.patch ---
diff -ru linphone-1.4.1.old/configure.in linphone-1.4.1.new/configure.in
--- linphone-1.4.1.old/configure.in	2006-09-18 02:28:20.000000000 -0500
+++ linphone-1.4.1.new/configure.in	2006-10-09 08:49:20.000000000 -0500
@@ -242,7 +242,7 @@
 
 AC_SUBST(STRICT_OPTIONS)
 
-AC_CONFIG_SUBDIRS( oRTP mediastreamer2 )
+AC_CONFIG_SUBDIRS( mediastreamer2 )
 
 dnl check for db2html (docbook) to generate html user manual
 AC_CHECK_PROG(have_db2html,db2html, yes, no)
@@ -258,12 +258,7 @@
 
 AC_DEFINE_UNQUOTED(LINPHONE_VERSION,"$PACKAGE_VERSION",[Linphone's version number])
 
-dnl Packaging: Pick oRTP version from ${top_srcdir}/oRTP/configure.ac
-dnl Feel free to propose an alternative & cleaner version...
-top_srcdir=`dirname $0`
-changequote(, )dnl
-ORTP_VERSION=`grep -E ^[AC]+_INIT ${top_srcdir}/oRTP/configure.ac | sed -e 's:^.*_INIT(.*,\[\(.*\)\]):\1:g'`
-changequote([, ])dnl
+ORTP_VERSION=0.11.0
 AC_SUBST([ORTP_VERSION])
 
 AC_OUTPUT([ 
diff -ru linphone-1.4.1.old/Makefile.am linphone-1.4.1.new/Makefile.am
--- linphone-1.4.1.old/Makefile.am	2006-09-11 07:58:46.000000000 -0500
+++ linphone-1.4.1.new/Makefile.am	2006-10-09 08:49:33.000000000 -0500
@@ -3,7 +3,7 @@
 # let make re-run automake upon need
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = m4 pixmaps po ipkg oRTP gsmlib mediastreamer2\
+SUBDIRS = m4 pixmaps po ipkg gsmlib mediastreamer2\
 		media_api exosip coreapi console gnome share
 
 


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore	3 Jan 2006 12:05:15 -0000	1.5
+++ .cvsignore	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-linphone-1.2.0.tar.gz
+linphone-1.5.0.tar.gz


Index: linphone.spec
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/linphone.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- linphone.spec	30 Aug 2006 15:50:47 -0000	1.22
+++ linphone.spec	9 Nov 2006 17:52:58 -0000	1.23
@@ -1,24 +1,39 @@
 Name:           linphone
-Version:        1.2.0
-Release:        7%{?dist}
+Version:        1.5.0
+Release:        2%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPL
-URL:            http://www.linphone.org/?lang=us&rubrique=1
-Source0:        http://simon.morlat.free.fr/download/1.2.x/source/%{name}-%{version}.tar.gz
+URL:            http://www.linphone.org/
+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.2.0-ortp.patch
-Patch2:         linphone-1.1.0-Werror.patch
-Patch3:         linphone-1.2.0-maxrtp.patch
-Patch4:         linphone-1.2.0-gtkentry.patch
+Patch1:         linphone-1.4.1-libs.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 >= 1.0.5  gettext desktop-file-utils
-BuildRequires:  ortp-devel >= 0.7.1
+BuildRequires:  libosip2-devel
+BuildRequires:  ortp-devel = 0.11.0
+
+BuildRequires:  readline-devel
+BuildRequires:  ncurses-devel
+
+BuildRequires:  gnome-panel-devel
+BuildRequires:  libgnomeui-devel
+BuildRequires:  glib2-devel
+BuildRequires:  alsa-lib-devel
+
+BuildRequires:  speex-devel >= 1.2
+
+BuildRequires:  desktop-file-utils
+
 BuildRequires:  perl(XML::Parser)
 
+BuildRequires:  automake
+BuildRequires:  autoconf
+BuildRequires:  libtool
+BuildRequires:  intltool
+BuildRequires:  gettext
+
 %description
 Linphone is mostly sip compliant. It works successfully with these
 implementations:
@@ -27,7 +42,7 @@
     * Hotsip, a free of charge phone for Windows.
     * Vocal, an open source SIP stack from Vovida that includes a SIP proxy
         that works with linphone since version 0.7.1.
-    * Siproxd is a free sip proxy being developped by Thomas Ries because he
+    * Siproxd is a free sip proxy being developed by Thomas Ries because he
         would like to have linphone working behind his firewall. Siproxd is
         simple to setup and works perfectly with linphone.
     * Partysip aims at being a generic and fully functionnal SIP proxy. Visit
@@ -46,14 +61,27 @@
 %prep
 %setup -q
 %patch -p 1 -b .old
-%patch1 -p 1 -b .ortp
-%patch2 -p 1 -b .Werror
-%patch3 -p 1 -b .maxrtp
-%patch4 -p 1 -b .gtkentry
+%patch1 -p 1 -b .libs
+
 rm -r oRTP
 
+libtoolize --copy --force
+autoheader
+aclocal -I m4
+automake --force-missing --add-missing --copy
+autoconf
+rm -rf config.cache
+
+pushd mediastreamer2
+libtoolize --copy --force
+autoheader
+aclocal
+automake --force-missing --add-missing --copy
+autoconf
+popd
+
 %build
-%configure
+%configure --disable-static --disable-video
 make %{?_smp_mflags}
 
 %install
@@ -65,10 +93,11 @@
 desktop-file-install --vendor=fedora \
   --delete-original \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications \
-  --add-category X-Fedora \
+  --remove-category Application \
   --add-category Telephony \
   --add-category GTK \
   $RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
+rm -f %{buildroot}%{_libdir}/*.la
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -83,12 +112,13 @@
 %{_bindir}/*
 %{_libdir}/bonobo/servers/*.server
 %{_libdir}/liblinphone.so.*
+%{_libdir}/libmediastreamer.so.*
+%{_libdir}/libquickstream.so.*
 %{_libexecdir}/*
 %{_mandir}/man1/*
 %{_datadir}/applications/*%{name}.desktop
 %{_datadir}/gnome/help/linphone
 %{_datadir}/gnome-2.0/ui/*.xml
-%{_datadir}/gtk-doc/html/mediastreamer
 %{_datadir}/pixmaps/linphone
 %{_datadir}/pixmaps/linphone2.png
 %{_datadir}/sounds/linphone
@@ -96,12 +126,21 @@
 %files devel
 %defattr(-,root,root)
 %{_includedir}/linphone
-%{_libdir}/liblinphone.a
-%{_libdir}/liblinphone.la
+%{_includedir}/mediastreamer2
 %{_libdir}/liblinphone.so
+%{_libdir}/libmediastreamer.so
+%{_libdir}/libquickstream.so
 %{_libdir}/pkgconfig/*
 
 %changelog
+* 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!
+
+* Thu Oct 26 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.5.0-1
+- Update to 1.5.0
+- Fix spelling error in description.
+- Remove invalid categories on desktop file.
+
 * Wed Aug 30 2006 Jeffrey C. Ollie <jeff at ocjtech.us> - 1.2.0-7
 - Bump release so that I can "make tag"
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/linphone/FC-6/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources	3 Jan 2006 12:05:15 -0000	1.5
+++ sources	9 Nov 2006 17:52:58 -0000	1.6
@@ -1 +1 @@
-bd5e513a665ce2e381afce64d569c707  linphone-1.2.0.tar.gz
+e9b01b74a3bb989aa5859d06e56162bd  linphone-1.5.0.tar.gz


--- linphone-1.0.1-pkgconfig.patch DELETED ---


--- linphone-1.1.0-Werror.patch DELETED ---


--- linphone-1.2.0-gtkentry.patch DELETED ---


--- linphone-1.2.0-maxrtp.patch DELETED ---


--- linphone-1.2.0-ortp.patch DELETED ---


