[arch-commits] Commit in taskjuggler3/trunk (PKGBUILD tj-system-dirs.patch)

[Maxime Gauduin]

    Date: Wednesday, November 5, 2014 @ 13:00:05
  Author: alucryd
Revision: 121948

FS#42651: taskjuggler3 3.5.0-8

Modified:
  taskjuggler3/trunk/PKGBUILD
  taskjuggler3/trunk/tj-system-dirs.patch

----------------------+
 PKGBUILD             |   27 +++++++++++++++------------
 tj-system-dirs.patch |    2 +-
 2 files changed, 16 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-11-05 11:53:28 UTC (rev 121947)
+++ PKGBUILD	2014-11-05 12:00:05 UTC (rev 121948)
@@ -1,37 +1,40 @@
 # $Id$
 # Maintainer: Maxime Gauduin <alucryd at gmail.com>
 # Contributor: Mathieu Clabaut <mathieu.clabaut at gmail.com>
+# Contributor: John Henderson <jw.hendy at gmail.com>
 
 pkgname=taskjuggler3
 pkgver=3.5.0
-pkgrel=7
+pkgrel=8
 pkgdesc='Project Management Software'
 arch=('any')
 url='http://www.taskjuggler.org'
 license=('GPL')
 depends=('ruby-mail' 'ruby-term-ansicolor')
-source=("http://rubygems.org/downloads/${pkgname%3}-${pkgver}.gem"
+source=("http://rubygems.org/downloads/taskjuggler-${pkgver}.gem"
         'tj-ruby2.1.patch'
         'tj-system-dirs.patch')
-noextract=("${pkgname%3}-${pkgver}.gem")
+noextract=("taskjuggler-${pkgver}.gem")
 sha256sums=('42f2e81470be9b2486fc074ba6ff04180258f462fed5c46cba871b7518cd0465'
             'e59b510acd1d176ef384101b7eba541713775c8da06c503b48020e8726f8629c'
-            '8174f62598b4230df033feb213e5ec25bc6d3105c71455a88514eaff3db0410a')
+            '973f9b2d538e5caf7f05bccfe8c16cafba2222703315ab7ee7569738063eea6c')
 
 prepare() {
-  gem install --no-{document,user-install} --ignore-dependencies -i . ${pkgname%3}-${pkgver}.gem
+  gem install -N -i . taskjuggler-${pkgver}.gem \
+    --ignore-dependencies \
+    --no-user-install
 
-  cd gems/${pkgname%3}-${pkgver}
+  cd gems/taskjuggler-${pkgver}
   patch -Np1 -i ../../tj-ruby2.1.patch
   patch -Np1 -i ../../tj-system-dirs.patch
 }
 
 package() {
-  cd gems/${pkgname%3}-${pkgver}
+  cd gems/taskjuggler-${pkgver}
 
-  local _rubyver="$(ruby --version | sed 's/.* \(.*\..*\..*\)p.*/\1/')"
+  local _rubyver='2.1.0'
 
-  install -dm 755 "${pkgdir}"/usr/{lib/ruby/{gems/${_rubyver},vendor_ruby},share/{doc,vim/vimfiles/{ftdetect,syntax}}}
+  install -dm 755 "${pkgdir}"/usr/{lib/ruby/{gems/${_rubyver},vendor_ruby},share/{doc,taskjuggler,vim/vimfiles/{ftdetect,syntax}}}
   mv bin "${pkgdir}"/usr/
   mv lib "${pkgdir}"/usr/lib/ruby/vendor_ruby/${_rubyver}
 
@@ -43,11 +46,11 @@
   echo 'au! BufNewFile,BufRead *.tjp,*.tji set ft=tjp' > "${pkgdir}"/usr/share/vim/vimfiles/ftdetect/tjp.vim
 
 # Data
-  mv data "${pkgdir}"/usr/share/${pkgname%3}
-  mv examples "${pkgdir}"/usr/share/${pkgname%3}/
+  mv data "${pkgdir}"/usr/share/taskjuggler/
+  mv examples "${pkgdir}"/usr/share/taskjuggler/
 
 # Documentation
-  mv manual "${pkgdir}"/usr/share/doc/${pkgname%3}
+  mv manual "${pkgdir}"/usr/share/doc/taskjuggler
 }
 
 # vim: ts=2 sw=2 et:

Modified: tj-system-dirs.patch
===================================================================
--- tj-system-dirs.patch	2014-11-05 11:53:28 UTC (rev 121947)
+++ tj-system-dirs.patch	2014-11-05 12:00:05 UTC (rev 121948)
@@ -18,7 +18,7 @@
      dirs << rubyLibDir + '/gems/' \
          + @@packageName + '-' + @@version + "/#{baseDir}/"
 +    # Also look in system share directory
-+    dirs << '/usr/share/' + @@packageName
++    dirs << '/usr/share/' + @@packageName + "/#{baseDir}/"
  
      dirs
    end