- Re-base patches to fix rebuild breakdowns.

- Fix various autotool source file bugs.
- Use pre-built autotool-generated files.

.cvsignore

@@ -1 +1,2 @@
 linphone-2.1.1.tar.gz
+linphone-2.1.1-auto.patch

linphone.spec

@@ -1,15 +1,21 @@
 Name:           linphone
 Version:        2.1.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Phone anywhere in the whole world by using the Internet
 
 Group:          Applications/Communications
 License:        GPLv2+
 URL:            http://www.linphone.org/
 Source0:        http://download.savannah.nongnu.org/releases/linphone/2.1.x/sources/%{name}-%{version}.tar.gz
-Patch0:         linphone-2.1.0-imagedir.patch
+Patch0:         linphone-2.1.1-configure.patch
-Patch1:		linphone-2.1.0-ni_maxhost_hack.patch
+Patch1:         linphone-2.1.1-mediastreamer.patch
-Patch2:		linphone-2.1.0-no_werror.patch
+Patch2:         linphone-2.1.1-oRTP.patch
+
+# This patch is generated by
+# autoreconf -fi
+# with the patches above applied
+Patch10:         linphone-2.1.1-auto.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libosip2-devel >= 3.1.0
@@ -31,13 +37,7 @@ BuildRequires:  perl(XML::Parser)
 
 BuildRequires:  docbook-utils
 
-BuildRequires:  automake
-BuildRequires:  autoconf
-BuildRequires:  libtool
 BuildRequires:  intltool
-BuildRequires:  gettext
-
-#BuildRequires:  popt-devel
 
 %description
 Linphone is mostly sip compliant. It works successfully with these
@@ -69,40 +69,36 @@ Libraries and headers required to develop software with linphone.
 %patch1 -p1
 %patch2 -p1
 
-#pushd share/cs
+%patch10 -p1
-#for f in *.1
+
-#do
+# Make sure autotools are not rerun
-#        /usr/bin/iconv --from-code iso-8859-2 --to-code utf-8 --output $f.new $f && sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new && mv $f.new $f
+touch -r aclocal.m4 configure*
-#done
+touch -r mediastreamer2/aclocal.m4 mediastreamer2/configure*
-#popd
+touch -r oRTP/aclocal.m4 oRTP/configure*
+
+# Fix encoding
+for f in share/cs/*.1; do
+  /usr/bin/iconv -f iso-8859-2 -t utf-8 -o $f.new $f
+  sed -i -e 's/Encoding: ISO-8859-2/Encoding: UTF-8/' $f.new
+  mv $f.new $f
+done
+for f in ChangeLog AUTHORS; do
+  /usr/bin/iconv -f iso-8859-1 -t utf-8 -o $f.new $f
+  mv $f.new $f
+done
+
 
 %build
-
-libtoolize --copy --force
-aclocal -I m4
-autoheader
-automake --force-missing --add-missing --copy
-autoconf
-rm -rf config.cache
-
-pushd mediastreamer2
-libtoolize --copy --force
-aclocal -I ../m4
-autoheader
-automake --force-missing --add-missing --copy
-autoconf
-popd
-
 %configure --disable-static \
-	   --disable-rpath \
+           --disable-rpath \
-	   --enable-console_ui=yes \
+           --enable-console_ui=yes \
-	   --enable-gtk_ui=yes \
+           --enable-gtk_ui=yes \
-	   --enable-ipv6 \
+           --enable-ipv6 \
-	   --enable-truespeech \
+           --enable-truespeech \
-	   --disable-video \
+           --disable-video \
-	   --enable-alsa \
+           --enable-alsa \
-	   --enable-strict \
+           --enable-strict \
-	   --enable-external-ortp
+           --enable-external-ortp
 
 make %{?_smp_mflags}
 
@@ -153,6 +149,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Fri Mar 13 2009 Ralf Corsépius <corsepiu@fedoraproject.org> - 2.1.1-3
+- Re-base patches to fix rebuild breakdowns.
+- Fix various autotool source file bugs.
+- Use pre-built autotool-generated files.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.1.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 

sources

@@ -1 +1,2 @@
 130fb6048f84ee89f7c1a8a010ff1add  linphone-2.1.1.tar.gz
+fef0a88ae97394fca6b5315489c93432  linphone-2.1.1-auto.patch