Request 644 (accepted)

Overview

Request 644 (accepted)

added patches for setup-kolab and fixed assets_path

Created by dhoffend about 10 years ago
In state accepted
Open review for Admin
Open review for kolab-developers

Submit pykolab

Submit package home:dhoffend:b...lab:Development / pykolab to package Kolab:Development / pykolab

pykolab.spec Changed

@@ -29,7 +29,7 @@
 Summary:            Kolab Groupware Solution
 Name:               pykolab
 Version:            0.7.2
-Release:            1%{?dist}
+Release:            2%{?dist}
 License:            GPLv3+
 Group:              Applications/System
 URL:                http://kolab.org/
@@ -40,6 +40,8 @@
 Patch0001:          0001-Fix-typo.patch
 Patch0002:          0002-Fix-session-timeouts.patch
 Patch0003:          0003-Actually-fix-the-socket-file.patch
+Patch0004:          0004-setup-roundcube.patch
+Patch0005:          0005-make-a-assets_path-a-relative-url.patch
 
 BuildRoot:          %{_tmppath}/%{name}-%{version}-%{release}-root
 BuildArch:          noarch
@@ -207,6 +209,8 @@
 %patch0001 -p1
 %patch0002 -p1
 %patch0003 -p1
+%patch0004 -p1
+%patch0005 -p1
 
 %build
 autoreconf -v
@@ -530,6 +534,10 @@
 %attr(0700,%{kolab_user},%{kolab_group}) %dir %{_var}/spool/pykolab/wallace
 
 %changelog
+* Mon Sep 15 2014 Daniel Hoffend <dh@dotlan.net> - 0.7.2-2
+- added patch to fix setup-kolab mysql.initial
+- added patch to fix assets_path
+
 * Thu Sep 11 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.7.2-1
 - Wrap it all up in a new release

0004-setup-roundcube.patch Added

@@ -0,0 +1,33 @@
+From 8b2933d7bdc2d410691fbc5a39a74a02166610c6 Mon Sep 17 00:00:00 2001
+From: Daniel Hoffend <dh@dotlan.net>
+Date: Sun, 14 Sep 2014 02:18:04 +0200
+Subject: [PATCH] fixed import of roundcube mysql.initial.sql
+
+---
+ pykolab/setup/setup_roundcube.py |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/pykolab/setup/setup_roundcube.py b/pykolab/setup/setup_roundcube.py
+index 259f676..ab73861 100644
+--- a/pykolab/setup/setup_roundcube.py
++++ b/pykolab/setup/setup_roundcube.py
+@@ -140,12 +140,13 @@ def execute(*args, **kw):
+ 
+     schema_files = []
+     for root, directories, filenames in os.walk('/usr/share/doc/'):
++        directories.sort()
+         for directory in directories:
+             if directory.startswith("roundcubemail"):
+-                for root, directories, filenames in os.walk(os.path.join(root, directory)):
+-                    for filename in filenames:
++                for nested_root, nested_directories, nested_filenames in os.walk(os.path.join(root, directory)):
++                    for filename in nested_filenames:
+                         if filename.startswith('mysql.initial') and filename.endswith('.sql'):
+-                            schema_filepath = os.path.join(root,filename)
++                            schema_filepath = os.path.join(nested_root,filename)
+                             if not schema_filepath in schema_files:
+                                 schema_files.append(schema_filepath)
+ 
+-- 
+1.7.10.4
+

0005-make-a-assets_path-a-relative-url.patch Added

debian.changelog Changed

debian.series Changed

pykolab.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 644 0

Request History

dhoffend created request about 10 years ago

added patches for setup-kolab and fixed assets_path

dhoffend accepted request about 10 years ago

Please add a comment