From 8de3ea0db54346a4a8cebdfa933a9e4fe60b6910 Mon Sep 17 00:00:00 2001 From: Bas Date: Sun, 1 Jun 2014 15:01:59 +0200 Subject: [PATCH 1/5] Added fedora instructions --- README.md | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index ea3f5f2f40d..5f5919956cf 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,23 @@ We make use of submodules, so remember using the --recursive argument when cloni ## Dependencies ### Debian/Ubuntu/Mint -sudo apt-get install scons build-essential libevent-dev python-libtorrent python-apsw python-wxgtk2.8 python-netifaces python-m2crypto vlc python-igraph python-pyasn1, python-gmpy +```sh +sudo apt-get install scons build-essential libevent-dev \ + python-libtorrent python-apsw \ + python-wxgtk2.8 python-netifaces \ + python-m2crypto vlc python-igraph \ + python-pyasn1 python-gmpy +``` + +### Fedora +```sh +sudo yum group install "Development Tools" -y +sudo yum install scons libevent-devel python-apsw \ + python-netifaces vlc python-igraph \ + python-pyasn1 gmpy gmp-devel python-pip \ + rb_libtorrent-python wxPython +sudo pip install gmpy m2crypto twisted +``` ### Windows TODO From 339b6ab36efb4337fac9c82b817f3ccb08ec47c9 Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 2 Jun 2014 15:05:20 +0200 Subject: [PATCH 2/5] Changed fedora deps Forgot that twisted needs python-devel and gmpy is already provided by yum --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 5f5919956cf..0a7d646eaa1 100644 --- a/README.md +++ b/README.md @@ -19,8 +19,8 @@ sudo yum group install "Development Tools" -y sudo yum install scons libevent-devel python-apsw \ python-netifaces vlc python-igraph \ python-pyasn1 gmpy gmp-devel python-pip \ - rb_libtorrent-python wxPython -sudo pip install gmpy m2crypto twisted + rb_libtorrent-python wxPython python-devel +sudo pip install m2crypto twisted ``` ### Windows From 240bf973093094cf40b88208c349e5e0a0feda7f Mon Sep 17 00:00:00 2001 From: Bas Date: Mon, 2 Jun 2014 20:36:32 +0200 Subject: [PATCH 3/5] don't use pip --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 0a7d646eaa1..6799b9254e9 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,9 @@ sudo apt-get install scons build-essential libevent-dev \ sudo yum group install "Development Tools" -y sudo yum install scons libevent-devel python-apsw \ python-netifaces vlc python-igraph \ - python-pyasn1 gmpy gmp-devel python-pip \ - rb_libtorrent-python wxPython python-devel -sudo pip install m2crypto twisted + python-pyasn1 gmpy gmp-devel m2crypto \ + rb_libtorrent-python wxPython \ + python-devel python-twisted ``` ### Windows From a141ee6ffdb188bb3368c6c712ed9b0358c3c22a Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 3 Jun 2014 10:53:11 +0200 Subject: [PATCH 4/5] Notify the user that rpmfusion is needed --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 6799b9254e9..fd76f191b73 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ sudo apt-get install scons build-essential libevent-dev \ ``` ### Fedora +You'll need to have the [rpmfusion] repos installed for vlc. only the rpmfusion-free repo is needed. ```sh sudo yum group install "Development Tools" -y sudo yum install scons libevent-devel python-apsw \ @@ -65,3 +66,5 @@ TODO - If you forgot to check out a branch before doing a commit, you should get a warning telling you about it. To get the commit to a branch just check out the branch and do a git cherry-pick of the commit. - Take care of not accidentally commiting a submodule change with git commit -a - Do not commit a submodule update without running all the tests first and making sure the new code is not breaking Tribler. + +[rpmfusion]: http://rpmfusion.org/ "RPM Fusion" From fb62d8ecc5dc0987ac1f9a7a8946507c4b513915 Mon Sep 17 00:00:00 2001 From: Bas Date: Tue, 3 Jun 2014 10:56:15 +0200 Subject: [PATCH 5/5] Show the use how to install rpmfusion --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index fd76f191b73..023d4de2c70 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,12 @@ sudo apt-get install scons build-essential libevent-dev \ ``` ### Fedora -You'll need to have the [rpmfusion] repos installed for vlc. only the rpmfusion-free repo is needed. +You'll need to have the [rpmfusion] repos installed for vlc. only the rpmfusion-free repo is needed. This can be done by running the following command: +```sh +su -c 'yum localinstall --nogpgcheck http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm -y' +``` + +The following packages are needed to run tribler on Fedora: ```sh sudo yum group install "Development Tools" -y sudo yum install scons libevent-devel python-apsw \