osmo-svn package build instructions split

2 files changed, 23 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8d9f6e31c0fd..952b72c67560 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
 pkgbase = osmo-svn
-	pkgdesc = Development version of a handy personal organizer.
+	pkgdesc = Development version of a handy personal organizer
 	pkgver = 777
 	pkgrel = 1
 	url = http://clayo.org/osmo/
@@ -8,10 +8,10 @@ pkgbase = osmo-svn
 	license = GPL
 	makedepends = subversion
 	makedepends = autoconf
-	depends = gtk2>=2.10
+	depends = gtk2
 	depends = libxml2
 	optdepends = libical
-	optdepends = libgringotts>=1.2.1
+	optdepends = libgringotts
 	optdepends = libsyncml
 	optdepends = libnotify
 	provides = osmo
diff --git a/PKGBUILD b/PKGBUILD
index b3fe83329bec..5fe8e383465b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 pkgname=osmo-svn
 pkgver=777
 pkgrel=1
-pkgdesc="Development version of a handy personal organizer."
+pkgdesc="Development version of a handy personal organizer"
 arch=('i686' 'x86_64')
 url="http://clayo.org/osmo/"
 license=('GPL')
-depends=('gtk2>=2.10' 'libxml2')
-optdepends=('libical' 'libgringotts>=1.2.1' 'libsyncml' 'libnotify')
+depends=('gtk2' 'libxml2')
+optdepends=('libical' 'libgringotts' 'libsyncml' 'libnotify')
 provides=('osmo')
 conflicts=('osmo')
 makedepends=('subversion' 'autoconf')
@@ -16,17 +16,17 @@ makedepends=('subversion' 'autoconf')
 source=()
 md5sums=()
 
-_svntrunk=https://osmo-pim.svn.sourceforge.net/svnroot/osmo-pim/trunk
+_svntrunk=https://svn.code.sf.net/p/osmo-pim/code/trunk
 _svnmod=osmo
 
-build() {
-  cd ${srcdir}
+prepare() {
+  cd "${srcdir}"
 
   msg "Connecting to $_svntrunk ..."
   if [ -d $_svnmod/.svn ]; then
-    (cd $_svnmod && svn up -r $pkgver) || return 1
+    (cd $_svnmod && svn up -r $pkgver)
   else
-    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod || return 1
+    svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
   fi
   msg "SVN checkout done or server timeout"
 
@@ -36,13 +36,19 @@ build() {
   fi
 
   msg "Setting up build environment..."
-  cp -r ${_svnmod} ${_svnmod}-build || return 1
-  cd ${_svnmod}-build || return 1
+  cp -r ${_svnmod} ${_svnmod}-build
+}
 
-  msg "Starting build"
+build() {
+  cd ${_svnmod}-build
 
   ./autogen.sh
-  ./configure --prefix=/usr || return 1
-  make || return 1
-  make DESTDIR=${pkgdir} install || return 1
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${_svnmod}-build
+
+  make DESTDIR="${pkgdir}" install
 }