From 643dd99e2def27d7c0e41b24a6bd6ab432eee122 Mon Sep 17 00:00:00 2001
From: Gautier Pelloux-Prayer
<gautier.pelloux-prayer@belledonne-communications.com>
Date: Thu, 30 Jun 2016 13:19:12 +0200
Subject: [PATCH] =?UTF-8?q?README:=20pff=E2=80=A6=20autotools,=20what=20el?=
=?UTF-8?q?se=3F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Makefile.am | 4 ++--
README.md => README | 0
linphone.iss.in | 2 +-
linphone.spec.in | 10 +++++-----
tester/CMakeLists.txt | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
rename README.md => README (100%)
diff --git a/Makefile.am b/Makefile.am
index 55fc176178..7960711f08 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -161,7 +161,7 @@ zip:
make gtk-cherrypick
make other-cherrypick
cp -f $(top_srcdir)/gtk/gtkrc $(INSTALLDIR_WITH_PREFIX)/.
- cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/.
+ cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/.
cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/.
cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(ZIPFILE) *
@@ -173,7 +173,7 @@ sdk:
# remove unwanted stuff (gtk interface)
cd $(INSTALLDIR_WITH_PREFIX) && rm -rf $(SDK_EXCLUDED)
make other-cherrypick
- cp -f $(top_srcdir)/README.md $(INSTALLDIR_WITH_PREFIX)/.
+ cp -f $(top_srcdir)/README $(INSTALLDIR_WITH_PREFIX)/.
cp -f $(top_srcdir)/COPYING $(INSTALLDIR_WITH_PREFIX)/.
cd $(INSTALLDIR_WITH_PREFIX) && zip -r $(SDK_ZIPFILE) *
diff --git a/README.md b/README
similarity index 100%
rename from README.md
rename to README
diff --git a/linphone.iss.in b/linphone.iss.in
index c065c2b52d..aa700200ca 100644
--- a/linphone.iss.in
+++ b/linphone.iss.in
@@ -8,7 +8,7 @@ AppUpdatesURL=http://www.linphone.org
DefaultDirName={pf}\Linphone
DefaultGroupName=Linphone
LicenseFile=COPYING
-;InfoBeforeFile=README.md
+;InfoBeforeFile=README
OutputBaseFilename=setup
Compression=lzma
SolidCompression=yes
diff --git a/linphone.spec.in b/linphone.spec.in
index f18bf0cbe2..ca4d43a62d 100644
--- a/linphone.spec.in
+++ b/linphone.spec.in
@@ -23,15 +23,15 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: i686
%endif
-BuildRequires: gtk2-devel
-BuildRequires: belle-sip-devel speex-devel gettext
-BuildRequires: intltool gettext-devel
+BuildRequires: gtk2-devel
+BuildRequires: belle-sip-devel speex-devel gettext
+BuildRequires: intltool gettext-devel
%if %{video}
BuildRequires: ffmpeg-devel SDL-devel
%endif
%description
-Linphone is a SIP compliant audio & video phone. It can be used to run calls
+Linphone is a SIP compliant audio & video phone. It can be used to run calls
over the internet. It has a gtk+ and console interface.
%package devel
@@ -79,7 +79,7 @@ rm -rf $RPM_BUILD_ROOT
%files -f %{name}.lang
%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING NEWS README.md TODO
+%doc AUTHORS ChangeLog COPYING NEWS README TODO
%{_bindir}/linphone
%{_bindir}/linphonec
%{_bindir}/linphonecsh
diff --git a/tester/CMakeLists.txt b/tester/CMakeLists.txt
index f4e890f8fc..afb6781c26 100644
--- a/tester/CMakeLists.txt
+++ b/tester/CMakeLists.txt
@@ -248,7 +248,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
endif()
endif()
-# on iOS though, we also build the executable so that one can compile it from Xcode and run it directly
+# on iOS though, we also build the exectuable so that one can compile it from Xcode and run it directly
if (NOT ANDROID AND NOT CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
if(IOS)
set_source_files_properties(${IOS_RESOURCES_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
--
GitLab