Kaynağa Gözat

Merge branch 'hotfix-5.0.4-4' into devel

Edvinas Valatka 10 yıl önce
ebeveyn
işleme
df7a4d34b7
3 değiştirilmiş dosya ile 5 ekleme ve 22 silme
  1. 2 2
      .SRCINFO
  2. 1 1
      PKGBUILD
  3. 2 19
      seafile-server.install

+ 2 - 2
.SRCINFO

@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Thu Jan 14 01:08:44 UTC 2016
+# Thu Jan 14 01:31:11 UTC 2016
 pkgbase = seafile-server
 	pkgdesc = Seafile is an online file storage and collaboration tool
 	pkgver = 5.0.4
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/haiwen/seafile/
 	arch = i686
 	arch = x86_64

+ 1 - 1
PKGBUILD

@@ -3,7 +3,7 @@
 
 pkgname=('seafile-server' 'seafile-client-cli' 'seafile-shared')
 pkgver=5.0.4
-pkgrel=3
+pkgrel=4
 pkgdesc="Seafile is an online file storage and collaboration tool"
 arch=('i686' 'x86_64' 'armv7h' 'armv6h')
 url="https://github.com/haiwen/seafile/"

+ 2 - 19
seafile-server.install

@@ -27,25 +27,8 @@ post_install() {
 }
 
 pre_upgrade() {
-    virtualenv2 --system-site-packages /usr/lib/seafile/seafileenv
-    virtualenv2 --relocatable /usr/lib/seafile/seafileenv
-    source /usr/lib/seafile/seafileenv/bin/activate
-
-    pip install --upgrade chardet
-    pip install --upgrade simplejson
-    pip install --upgrade six
-    pip install --upgrade python-dateutil
-    pip install --upgrade django-pipeline
-    pip install --upgrade "Django>=1.5.8,<1.6"
-    pip install --upgrade http://effbot.org/media/downloads/PIL-1.1.7.tar.gz
-    pip install --upgrade "https://github.com/djblets/djblets/archive/release-0.6.14.zip#egg=Djblets"
-    pip install --upgrade  "Pillow>=2.6.1,<3.0.0"
-    pip install --upgrade gunicorn
-    pip install "django-compressor==1.4"
-    pip install "django-statici18n==1.1.2"
-    pip install --upgrade "git+git://github.com/haiwen/django-constance.git@bde7f7cdfd0ed1631a6817fd4cd76f37bf54fe35#egg=django-constance[database]"
-    pip install --upgrade "openpyxl==2.3.0"
-    deactivate
+    rm -rf /usr/lib/seafile/seafileenv
+    pre_install
 }
 
 post_upgrade() {