@@ -35,16 +35,17 @@

 %endif

 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}

+%global upstream_version 0.5.14

 Name:           chwala

-Version:        0.5.14

+Version: 0.5.14.3

 Release:        1%{?dist}

 Summary:        Glorified WebDAV, done right

 Group:          Applications/Internet

 License:        AGPLv3+

 URL:            http://chwala.org

-Source0:        %{name}-%{version}.tar.gz

+Source0:        %{name}-%{upstream_version}.tar.gz

 Source2:        chwala.logrotate

 Patch0000:      chwala-0.5.4-suhosin.session.encrypt-php_flag.patch

@@ -74,7 +75,7 @@

 party applications.

 %prep

-%setup -q

+%setup -q -n %{name}-%{upstream_version}

 %patch0000 -p1

@@ -145,7 +146,7 @@

 fi

 /usr/share/roundcubemail/bin/updatedb.sh \

-    --dir /usr/share/doc/%{name}-%{version}/SQL/ \

+    --dir /usr/share/doc/%{name}-%{upstream_version}/SQL/ \

     --package %{name} >/dev/null 2>&1 || :

 %files

​

@@ -67,6 +67,8 @@

             // get folders from default driver

             if (!$this->rc->config->get('fileapi_backend_storage_disabled')) {

                 $folders = $this->folder_list($backend, $params);

+            } else {

+                $folders = array();

             }

         }

​

@@ -555,7 +555,8 @@

         }

         // first get upload link

-        $result = $this->request('GET', "repos/$repo_id/upload-link");

+        $parent_dir = '/';

+        $result = $this->request('GET', "repos/$repo_id/upload-link/?p=$parent_dir");

         if ($this->is_error() || empty($result)) {

             return false;

@@ -563,13 +564,14 @@

         $path     = explode('/', $filename);

         $filename = array_pop($path);

-        $dir      = '/' . ltrim(implode('/', $path), '/');

+        $dir      = ltrim(implode('/', $path), '/');

         $file'name' = $filename;

         // then update file

         $result = $this->request('POST', $result, null, array(

-                'parent_dir' => $dir

+                'parent_dir' => $parent_dir,

+                'relative_path' => $dir

             ),

             array('file' => $file)

         );

​

@@ -2,7 +2,7 @@

 Source: chwala

 Binary: chwala

 Architecture: all

-Version: 0.5.14-1~kolab2

+Version: 0.5.14.3-1~kolab1

 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>

 Homepage: http://kolab.org/about/chwala/

​

@@ -1,4 +1,4 @@

-chwala (0.5.14-1~kolab2) unsable; urgency=low

+chwala (0.5.14.3-1~kolab1) unsable; urgency=low

   * Release version 0.5.14

​

@@ -0,0 +1,15 @@

+#!/bin/bash

+

+./buildtarball.sh

+

+# Autobump the version

+CURRENT_VERSION=$(grep '^Version: ' ./*.spec | sed 's/Version: //') 

+NEW_VERSION=$(echo "$CURRENT_VERSION" | awk -F. '/0-9+\./{$NF++;print}' OFS=.)

+echo "Bumping from $CURRENT_VERSION to $NEW_VERSION"

+

+sed -i "s/$CURRENT_VERSION/$NEW_VERSION/" debian.changelog

+sed -i "s/^Version:.*/Version: $NEW_VERSION-1~kolab1/" ./*.dsc

+sed -i "s/^Version:.*/Version: $NEW_VERSION/" ./*.spec

+

+osc ci -m "New release $NEW_VERSION"

+osc sr Kolab:16 --yes -m "New release $NEW_VERSION"

​