From a4b7c14244a75acce25b4b3d49bb0bbbfb226f63 Mon Sep 17 00:00:00 2001
From: "Markus M. May" <mmay@javafreedom.org>
Date: Mon, 7 Dec 2009 20:55:27 +0100
Subject: [PATCH] changes for newest release of sonar.

---
 redmine/PKGBUILD        | 29 +++++++++++++++++------------
 redmine/redmine.install |  2 +-
 sonar/PKGBUILD          |  8 ++++----
 sonar/sonar.sh          |  2 ++
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/redmine/PKGBUILD b/redmine/PKGBUILD
index 18e2757..b320d22 100644
--- a/redmine/PKGBUILD
+++ b/redmine/PKGBUILD
@@ -1,20 +1,20 @@
 # Contributor: Markus M. May <mmay AT javafreedom DOT org>
 # this work is heavily based on the work done at
 # http://scm.narf.ssji.net/archlinux-packages/browser/redmine
-pkgname=redmine-mysql-svn
-pkgver=3094
-pkgrel=2
+pkgname=redmine-mysql-git
+pkgver=f2113e735d8d4cf8a7707ccc45d0c2570483465c
+pkgrel=1
 pkgdesc="Redmine is a flexible project management web application written using Ruby on Rails framework."
 url="http://www.redmine.org"
 arch=(any)
 license=('GPL2')
 depends=('ruby>=1.8.6' 'rails>=2.3.4' 'rake' 'mysql' 'ruby-mysql')
 optdepends=('apache: a full featured webserver'
-			'ruby-rmagick: to enable Gantt export to png image'
+            'ruby-rmagick: to enable Gantt export to png image'
             'git: a distributed version control system'
-			'passenger: Apache Module for Rails')
+            'passenger: Apache Module for Rails')
 	
-makedepends=('subversion')
+makedepends=('git')
 
 conflicts=('redmine')
 
@@ -41,20 +41,25 @@ md5sums=('17d3e23378691237ae7f5e3412e19aa0'
          '9be1332a86523d3fa663a694194c5e5a'
          '8b73bc56174d92b09d596bae998384bb')
 
-_svntrunk=http://redmine.rubyforge.org/svn/trunk
-_svnmod=redmine
+_gitroot="git://github.com/edavis10/redmine.git"
+_gitname="redmine"
+
 
 build() {
   _instdir=${pkgdir}/opt/${pkgname/-*/}
   cd ${srcdir}
 
-  if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver)
+  msg "Connecting to GIT server...."
+
+  if [ -d $_gitname ] ; then
+    cd $_gitname && git pull origin
+    msg "The local files are updated."
   else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || exit 1
+    git clone $_gitroot
   fi
 
-  msg "SVN checkout done"
+  msg "GIT checkout done or server timeout"
+  msg "Starting make..."
 
   mkdir -p ${_instdir}
   cp -ra ${srcdir}/redmine/* ${_instdir}
diff --git a/redmine/redmine.install b/redmine/redmine.install
index 1eabab8..9b26e73 100644
--- a/redmine/redmine.install
+++ b/redmine/redmine.install
@@ -69,7 +69,7 @@ pre_upgrade() {
 # arg 1:  the new package version
 # arg 2:  the old package version
 post_upgrade() {
-  cd usr/lib/redmine
+  cd opt/redmine
   echo ">>> Clearing cache and existing sessions..."
   rake tmp:cache:clear
   rake tmp:sessions:clear
diff --git a/sonar/PKGBUILD b/sonar/PKGBUILD
index 3b984f3..3d82e79 100644
--- a/sonar/PKGBUILD
+++ b/sonar/PKGBUILD
@@ -1,7 +1,7 @@
 #Contributor: Markus M. May <mmay AT javafreedom DOT org>
 pkgname=sonar
-pkgver=1.11.1
-pkgrel=4
+pkgver=1.12
+pkgrel=1
 pkgdesc="A code quality management platform."
 url="http://sonar.codehaus.org"
 arch=('i686' 'x86_64')
@@ -24,8 +24,8 @@ source=(http://dist.sonar.codehaus.org/${pkgname}-${pkgver}.zip
         'wrapper.conf'
         'logback.xml')	
 
-md5sums=('aa227be630999c6aa767b7641ec71879'
-         '02f3e34350bba682b675585132b8651b'
+md5sums=('84080b76ffc386f0ef906501122c9fc1'
+         '24c9c63c0adb8323217942ecc131d5a5'
          '3cac81e4078940c907cee5c2dd154df0'
          'e235ae1698147995a9961a951438f00d')
 
diff --git a/sonar/sonar.sh b/sonar/sonar.sh
index d31b943..3f4e883 100644
--- a/sonar/sonar.sh
+++ b/sonar/sonar.sh
@@ -14,6 +14,8 @@
 # Java Service Wrapper sh script.  Suitable for starting and stopping
 #  wrapped Java applications on UNIX platforms.
 #
+source /etc/profile.d/jdk.sh
+
 export SONAR_HOME=${SONAR_HOME:=/opt/sonar}
 export SONAR_RUN_DIR=${SONAR_RUN_DIR:=/var/run/sonar}
 export SONAR_ETC_DIR=${SONAR_ETC_DIR:=/etc/sonar}
-- 
2.11.4.GIT