Author: jajcus Date: Sat Apr 30 11:54:17 2011 GMT Module: packages Tag: HEAD ---- Log message: - Version: 3.4.3 - Release: 1 (usable now) - patches for compiler warning and bad image path
---- Files affected: packages/linphone: linphone.spec (1.54 -> 1.55) , linphone-chdir.patch (NONE -> 1.1) (NEW), linphone-imgdir.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/linphone/linphone.spec diff -u packages/linphone/linphone.spec:1.54 packages/linphone/linphone.spec:1.55 --- packages/linphone/linphone.spec:1.54 Sat Mar 5 21:02:46 2011 +++ packages/linphone/linphone.spec Sat Apr 30 13:54:11 2011 @@ -7,12 +7,14 @@ Summary: Linphone Internet Phone Summary(pl.UTF-8): Linphone - telefon internetowy Name: linphone -Version: 3.4.2 -Release: 0.3 +Version: 3.4.3 +Release: 1 License: LGPL/GPL Group: Applications/Communications Source0: http://download.savannah.gnu.org/releases/linphone/stable/sources//%{name}-%{version}.tar.gz -# Source0-md5: aaa5bb7c60d7cab2b1a63a1a42535d38 +# Source0-md5: 66e21f36d62c2094f7b4360262c46f20 +Patch0: %{name}-chdir.patch +Patch1: %{name}-imgdir.patch URL: http://www.linphone.org/ BuildRequires: alsa-lib-devel >= 0.9.0 BuildRequires: autoconf @@ -107,6 +109,8 @@ %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build # requires .po file fixes @@ -136,6 +140,8 @@ # kill .desktop in GNOME1-specific location #rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/apps +rm -r $RPM_BUILD_ROOT/usr/share/doc/{linphone,mediastreamer,ortp} + %find_lang %{name} --with-gnome --all-name %clean @@ -164,7 +170,7 @@ %{_desktopdir}/*.desktop %{_pixmapsdir}/linphone.png %{_pixmapsdir}/linphone -#%{_imagesdir}/* +%{_datadir}/linphone %{_mandir}/man1/* %lang(cs) %{_mandir}/cs/man1/* @@ -193,6 +199,11 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.55 2011/04/30 11:54:11 jajcus +- Version: 3.4.3 +- Release: 1 (usable now) +- patches for compiler warning and bad image path + Revision 1.54 2011/03/05 20:02:46 pawelz - reverted last commit. It does not work with our ortp. Unfortunately it means, it conflicts with ortp. ================================================================ Index: packages/linphone/linphone-chdir.patch diff -u /dev/null packages/linphone/linphone-chdir.patch:1.1 --- /dev/null Sat Apr 30 13:54:17 2011 +++ packages/linphone/linphone-chdir.patch Sat Apr 30 13:54:11 2011 @@ -0,0 +1,15 @@ +diff -dur linphone-3.4.3.orig/gtk/main.c linphone-3.4.3/gtk/main.c +--- linphone-3.4.3.orig/gtk/main.c 2011-03-25 14:40:44.000000000 +0100 ++++ linphone-3.4.3/gtk/main.c 2011-04-30 13:26:33.000000000 +0200 +@@ -1431,8 +1431,9 @@ + g_object_set(settings, "gtk-menu-images", TRUE, NULL); + g_object_set(settings, "gtk-button-images", TRUE, NULL); + +- if (workingdir!=NULL) +- chdir(workingdir); ++ if (workingdir!=NULL && chdir(workingdir)) { ++ g_warning("Cannot chdir to the working directory: %s", workingdir); ++ } + + /* Now, look for the factory configuration file, we do it this late + since we want to have had time to change directory and to parse ================================================================ Index: packages/linphone/linphone-imgdir.patch diff -u /dev/null packages/linphone/linphone-imgdir.patch:1.1 --- /dev/null Sat Apr 30 13:54:17 2011 +++ packages/linphone/linphone-imgdir.patch Sat Apr 30 13:54:11 2011 @@ -0,0 +1,24 @@ +diff -dur -x '*~' linphone-3.4.3.orig/mediastreamer2/configure.ac linphone-3.4.3/mediastreamer2/configure.ac +--- linphone-3.4.3.orig/mediastreamer2/configure.ac 2011-03-28 15:04:21.000000000 +0200 ++++ linphone-3.4.3/mediastreamer2/configure.ac 2011-04-30 13:45:13.000000000 +0200 +@@ -586,7 +586,7 @@ + + AC_SUBST(PACKAGE_PLUGINS_DIR) + +-PACKAGE_DATA_DIR="$prefix/share" ++PACKAGE_DATA_DIR="$(datadir)/linphone" + AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${package_prefix}/share" ,[path of data]) + AC_SUBST(PACKAGE_DATA_DIR) + +diff -dur -x '*~' linphone-3.4.3.orig/mediastreamer2/src/Makefile.am linphone-3.4.3/mediastreamer2/src/Makefile.am +--- linphone-3.4.3.orig/mediastreamer2/src/Makefile.am 2011-02-09 09:43:11.000000000 +0100 ++++ linphone-3.4.3/mediastreamer2/src/Makefile.am 2011-04-30 13:44:49.000000000 +0200 +@@ -220,7 +220,7 @@ + + AM_OBJCFLAGS=$(AM_CFLAGS) + +-imgdir=$(datadir)/images/ ++imgdir=$(datadir)/linphone/images/ + + img_DATA=nowebcamCIF.jpg + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/linphone/linphone.spec?r1=1.54&r2=1.55&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
