From 4b6e155f94e6a6cd801e120b05e9837be142c53c Mon Sep 17 00:00:00 2001 From: Ignacio Vazquez-Abrams Date: Fri, 8 Apr 2005 20:38:17 +0000 Subject: [PATCH] It's not pretty, but it works... --- linphone-1.0.1-Werror.patch | 13 +++++++++++++ linphone-1.0.1-desktop.patch | 9 +++++++++ linphone.spec | 10 +++++++++- 3 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 linphone-1.0.1-Werror.patch create mode 100644 linphone-1.0.1-desktop.patch diff --git a/linphone-1.0.1-Werror.patch b/linphone-1.0.1-Werror.patch new file mode 100644 index 0000000..770ac1d --- /dev/null +++ b/linphone-1.0.1-Werror.patch @@ -0,0 +1,13 @@ +--- linphone-1.0.1/oRTP/configure.orig 2005-04-08 16:11:32.480520030 -0400 ++++ linphone-1.0.1/oRTP/configure 2005-04-08 16:13:20.515559404 -0400 +@@ -20712,10 +20712,6 @@ + posixtimer_interval=20000 + fi + +-if test "$GCC" = "yes" ; then +- CFLAGS="$CFLAGS -Werror" +-fi +- + + cat >>confdefs.h <<_ACEOF + #define POSIXTIMER_INTERVAL $posixtimer_interval diff --git a/linphone-1.0.1-desktop.patch b/linphone-1.0.1-desktop.patch new file mode 100644 index 0000000..d1c2368 --- /dev/null +++ b/linphone-1.0.1-desktop.patch @@ -0,0 +1,9 @@ +--- linphone-1.0.1/share/linphone.desktop.term 2005-04-08 16:26:59.110190675 -0400 ++++ linphone-1.0.1/share/linphone.desktop 2005-04-08 16:27:07.641592794 -0400 +@@ -6,5 +6,5 @@ + Type=Application + Exec=linphone + Icon=linphone/linphone2.png +-Terminal=0 ++Terminal=false + Categories=Application;Network; diff --git a/linphone.spec b/linphone.spec index 7bc6d6a..56c273a 100644 --- a/linphone.spec +++ b/linphone.spec @@ -1,6 +1,6 @@ Name: linphone Version: 1.0.1 -Release: 1 +Release: 2 Summary: Phone anywhere in the whole world by using the Internet Group: Applications/Communications @@ -8,6 +8,8 @@ License: GPL 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 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gnome-panel-devel libgnomeui-devel glib2-devel alsa-lib-devel @@ -57,6 +59,8 @@ 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 %build %configure @@ -125,6 +129,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libortp.so %changelog +* Fri Apr 8 2005 Ignacio Vazquez-Abrams 1.0.1-2 +- Remove -Werror from configure for now +- Fix .desktop file to have Terminal=false instead of 0 + * Thu Mar 24 2005 Ignacio Vazquez-Abrams 1.0.1-1 - Upstream update - Separated ortp