diff --git a/.cvsignore b/.cvsignore index 9a292bc..7bde54c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -linphone-1.6.0.tar.gz +linphone-1.7.1.tar.gz diff --git a/linphone-1.7.1-gtkosip.patch b/linphone-1.7.1-gtkosip.patch new file mode 100644 index 0000000..5e0c92f --- /dev/null +++ b/linphone-1.7.1-gtkosip.patch @@ -0,0 +1,27 @@ +From 6ebb0b61d9634dd24db0148b05f383977474aa44 Mon Sep 17 00:00:00 2001 +From: Jeffrey C. Ollie +Date: Mon, 23 Apr 2007 10:22:34 -0500 +Subject: [PATCH] Use OSIP_CFLAGS to compile gtk front end. + + +Signed-off-by: Jeffrey C. Ollie +--- + gtk/Makefile.am | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/gtk/Makefile.am b/gtk/Makefile.am +index b98149d..cb05421 100644 +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -20,7 +20,7 @@ INCLUDES = \ + $(ORTP_CFLAGS) \ + -I$(top_srcdir)/coreapi \ + -I$(top_srcdir)/mediastreamer2/include \ +- -I$(osip_prefix)/include ++ $(OSIP_CFLAGS) + + + +-- +1.5.1.2 + diff --git a/linphone-1.7.1-imagedir.patch b/linphone-1.7.1-imagedir.patch new file mode 100644 index 0000000..0f45245 --- /dev/null +++ b/linphone-1.7.1-imagedir.patch @@ -0,0 +1,28 @@ +diff --git a/mediastreamer2/src/Makefile.am b/mediastreamer2/src/Makefile.am +index 4940246..3e1df60 100644 +--- a/mediastreamer2/src/Makefile.am ++++ b/mediastreamer2/src/Makefile.am +@@ -105,7 +105,7 @@ AM_CFLAGS= -I$(top_srcdir) \ + $(GSM_CFLAGS) \ + $(STRICT_OPTIONS) + +-imgdir=$(datadir)/images/ ++imgdir=$(datadir)/images/linphone/ + + img_DATA=nowebcamCIF.jpg + +diff --git a/mediastreamer2/src/nowebcam.c b/mediastreamer2/src/nowebcam.c +index 6e06ee6..917a927 100644 +--- a/mediastreamer2/src/nowebcam.c ++++ b/mediastreamer2/src/nowebcam.c +@@ -81,8 +81,8 @@ mblk_t *ms_load_jpeg_as_yuv(const char *jpgpath, MSVideoSize *reqsize){ + mblk_t *ms_load_nowebcam(MSVideoSize *reqsize, int idx){ + char tmp[256]; + if (idx<0) +- snprintf(tmp, sizeof(tmp), "%s/images/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG); ++ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG); + else +- snprintf(tmp, sizeof(tmp), "%s/images/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx); ++ snprintf(tmp, sizeof(tmp), "%s/images/linphone/%s%i.jpg", PACKAGE_DATA_DIR, NOWEBCAM_JPG, idx); + return ms_load_jpeg_as_yuv(tmp,reqsize); + } diff --git a/linphone-1.7.1-ortpm4.patch b/linphone-1.7.1-ortpm4.patch new file mode 100644 index 0000000..9312e37 --- /dev/null +++ b/linphone-1.7.1-ortpm4.patch @@ -0,0 +1,23 @@ +diff --git a/m4/ortp.m4 b/m4/ortp.m4 +new file mode 100644 +index 0000000..f0c0216 +--- /dev/null ++++ b/m4/ortp.m4 +@@ -0,0 +1,17 @@ ++AC_DEFUN([LP_CHECK_ORTP],[ ++ ++ortp_pkgconfig=true ++ ++PKG_CHECK_MODULES([ORTP], [ortp], , [ortp_pkgconfig=false]) ++ ++if test $ortp_pkgconfig = false; then ++ AC_CHECK_HEADER([ortp/ortp.h], ,AC_MSG_ERROR([Could not find oRTP headers !])) ++ LIBS_save=$LIBS ++ AC_CHECK_LIB([ortp], [ortp_init], , AC_MSG_ERROR([Could not find oRTP library])) ++ ORTP_LIBS='-lortp' ++ LIBS=$LIBS_save ++fi ++AC_SUBST([ORTP_LIBS]) ++AC_SUBST([ORTP_CFLAGS]) ++ ++]) diff --git a/linphone.spec b/linphone.spec index 7cd16ea..2c319b5 100644 --- a/linphone.spec +++ b/linphone.spec @@ -1,26 +1,24 @@ Name: linphone -Version: 1.6.0 -Release: 4%{?dist} +Version: 1.7.1 +Release: 1%{?dist} Summary: Phone anywhere in the whole world by using the Internet Group: Applications/Communications License: GPL URL: http://www.linphone.org/ -Source0: http://download.savannah.nongnu.org/releases/linphone/1.6.x/sources/%{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 +Source0: http://download.savannah.nongnu.org/releases/linphone/1.7.x/sources/%{name}-%{version}.tar.gz +Patch0: linphone-1.7.1-ortpm4.patch +Patch1: linphone-1.7.1-imagedir.patch +Patch2: linphone-1.7.1-gtkosip.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: compat-libosip2-devel -BuildRequires: ortp-devel = 0.13.0 +BuildRequires: ortp-devel >= 0.13.1 BuildRequires: readline-devel BuildRequires: ncurses-devel -BuildRequires: gnome-panel-devel -BuildRequires: libgnomeui-devel -BuildRequires: glib2-devel +BuildRequires: gtk2-devel BuildRequires: alsa-lib-devel BuildRequires: speex-devel >= 1.2 @@ -29,6 +27,8 @@ BuildRequires: desktop-file-utils BuildRequires: perl(XML::Parser) +BuildRequires: docbook-utils + BuildRequires: automake BuildRequires: autoconf BuildRequires: libtool @@ -61,11 +61,15 @@ Libraries and headers required to develop software with linphone. %prep %setup0 -q -%patch0 -p1 -b .old -%patch1 -p1 -b .libs -%patch2 -p0 -b .osip +%patch0 -p1 -b .ortpm4 +%patch1 -p1 -b .imagedir +%patch2 -p1 -b .gtkosip -rm -r oRTP +#patch0 -p1 -b .old +#patch1 -p1 -b .libs +#patch2 -p0 -b .osip + +#rm -r oRTP pushd share/cs for f in *.1 @@ -75,6 +79,7 @@ done popd %build + libtoolize --copy --force aclocal -I m4 autoheader @@ -90,7 +95,7 @@ automake --force-missing --add-missing --copy autoconf popd -%configure --disable-static --disable-video +%configure --disable-static --disable-rpath --disable-video --enable-alsa --enable-strict --enable-external-ortp --with-osip-version=2.2.2 make %{?_smp_mflags} %install @@ -119,7 +124,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %{_bindir}/* -%{_libdir}/bonobo/servers/*.server %{_libdir}/liblinphone.so.* %{_libdir}/libmediastreamer.so.* %{_libdir}/libquickstream.so.* @@ -128,10 +132,10 @@ rm -rf $RPM_BUILD_ROOT %lang(cs) %{_mandir}/cs/man1/* %{_datadir}/applications/*%{name}.desktop %{_datadir}/gnome/help/linphone -%{_datadir}/gnome-2.0/ui/*.xml %{_datadir}/pixmaps/linphone %{_datadir}/pixmaps/linphone2.png %{_datadir}/sounds/linphone +%{_datadir}/images/linphone %files devel %defattr(-,root,root) @@ -143,6 +147,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/* %changelog +* Tue Apr 17 2007 Jeffrey C. Ollie - 1.7.1-1 +- Update to 1.7.1 +- Drop linphone-1.0.1-desktop.patch, linphone-1.4.1-libs.patch and + linphone-1.5.1-osipcompat.patch + * Fri Mar 16 2007 Jeffrey C. Ollie - 1.6.0-4 - Fix up encodings in Czech manpages diff --git a/sources b/sources index e32ac83..433a5d0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fb345125e23c787df0818ff7caad5515 linphone-1.6.0.tar.gz +6fe246d072fad2f4a9533317ab7e9060 linphone-1.7.1.tar.gz