You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/06/03 19:03:38 UTC
[3/3] git commit: [#6255] remove symlink workarounds for PIL
[#6255] remove symlink workarounds for PIL
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/84638183
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/84638183
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/84638183
Branch: refs/heads/master
Commit: 84638183a71bc8f7e40a4dab973c3ce245a8bbfb
Parents: 3f51e12
Author: Dave Brondsema <db...@slashdotmedia.com>
Authored: Sat May 25 11:23:42 2013 -0400
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Jun 3 17:01:52 2013 +0000
----------------------------------------------------------------------
README.markdown | 4 +---
vagrant/manifests/ubuntu-1204-server-amd64.pp | 12 ------------
2 files changed, 1 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/84638183/README.markdown
----------------------------------------------------------------------
diff --git a/README.markdown b/README.markdown
index 4284960..55b6c13 100644
--- a/README.markdown
+++ b/README.markdown
@@ -36,11 +36,9 @@ We'll use [VirtualBox](http://www.virtualbox.org) and [Ubuntu 12.04](http://ubun
# Installation
-Before we begin, you'll need to install some system packages. [Use google if you need additional PIL/jpeg help.](http://www.google.com/search?q=ubuntu+pil+jpeg+virtualenv)
+Before we begin, you'll need to install some system packages.
~$ sudo aptitude install git-core default-jre-headless python-dev libssl-dev libldap2-dev libsasl2-dev libjpeg8-dev zlib1g-dev
- ~$ sudo ln -s /usr/lib/x86_64-linux-gnu/libz.so /usr/lib
- ~$ sudo ln -s /usr/lib/x86_64-linux-gnu/libjpeg.so /usr/lib
To install MongoDB 2.2.3, follow the instructions here:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/84638183/vagrant/manifests/ubuntu-1204-server-amd64.pp
----------------------------------------------------------------------
diff --git a/vagrant/manifests/ubuntu-1204-server-amd64.pp b/vagrant/manifests/ubuntu-1204-server-amd64.pp
index 950f2af..be00025 100644
--- a/vagrant/manifests/ubuntu-1204-server-amd64.pp
+++ b/vagrant/manifests/ubuntu-1204-server-amd64.pp
@@ -45,17 +45,6 @@ package { $packages:
require => Exec[ "package index update" ],
}
-file { '/usr/lib/libz.so':
- ensure => 'link',
- target => '/usr/lib/x86_64-linux-gnu/libz.so',
- require => Package[ "zlib1g-dev" ],
-}
-file { '/usr/lib/libjpeg.so':
- ensure => 'link',
- target => '/usr/lib/x86_64-linux-gnu/libjpeg.so',
- require => Package[ "libjpeg8-dev" ],
-}
-
# install python pip
exec { "install venv":
command => "/usr/bin/pip install virtualenv",
@@ -115,7 +104,6 @@ exec { "pip install":
returns => 0,
tries => 3,
require => [ Exec[ "clone repo"], Exec[ "create allura venv" ],
- File["/usr/lib/libjpeg.so"], File["/usr/lib/libz.so"],
],
}