Projects
Kolab:3.4:Updates
kolab-freebusy
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 29
View file
kolab-freebusy.spec
Changed
@@ -23,7 +23,7 @@ Name: kolab-freebusy Version: 1.0.5 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Kolab Free/Busy Web Presentation Layer Group: Applications/Internet @@ -32,6 +32,8 @@ Source0: http://mirror.kolabsys.com/pub/releases/%{name}-%{version}+dep.tar.gz Source1: kolab-freebusy.logrotate +Patch0001: 0001-fix-net-ldap3.patch + BuildArch: noarch %if 0%{?suse_version} @@ -57,6 +59,7 @@ %prep %setup -q +%patch0001 -p1 %build @@ -134,6 +137,9 @@ %attr(0770,root,%{httpd_group}) %{_localstatedir}/log/%{name} %changelog +* Wed Aug 20 2014 Daniel Hoffend <dh@dotlan.net> - 1.0.5-2 +- added fix for loading Net_LDAP3 + * Thu Aug 14 2014 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 1.0.5-1 - Release version 1.0.5
View file
0001-fix-net-ldap3.patch
Added
@@ -0,0 +1,35 @@ +From b86d6d05973920954d65e9705680c85596b72375 Mon Sep 17 00:00:00 2001 +From: Thomas Bruederli <thomas@roundcube.net> +Date: Tue, 19 Aug 2014 11:33:21 +0000 +Subject: List PEAR packages in require-dev; let the autoloader search the include path for those packages remmoved in commit 823ae6ca. + +Call `php composer.phar install --no-dev` to package without the PEAR dependencies. +--- +diff --git a/composer.json b/composer.json +index 731da78..d820de2 100644 +--- a/composer.json ++++ b/composer.json +@@ -19,5 +19,9 @@ + "desarrolla2/cache": "dev-master", + "sabre/vobject" : "2.0.*" + }, ++ "require-dev": { ++ "kolab/Net_LDAP3": "dev-master", ++ "pear-pear/Net_LDAP2":">=2.0.12" ++ }, + "minimum-stability": "dev" + } +diff --git a/public_html/index.php b/public_html/index.php +index 08bcbd9..d4fcee6 100644 +--- a/public_html/index.php ++++ b/public_html/index.php +@@ -33,6 +33,7 @@ ini_set('error_reporting', E_ALL &~ E_NOTICE); + // use composer's autoloader for both dependencies and local lib + $loader = require_once(KOLAB_FREEBUSY_ROOT . '/vendor/autoload.php'); + $loader->set('Kolab', array(KOLAB_FREEBUSY_ROOT . '/lib')); // register Kolab namespace ++$loader->setUseIncludePath(true); // enable searching the include_path (e.g. for PEAR packages) + + use Kolab\Config; + use Kolab\FreeBusy\Utils; +-- +cgit v0.9.0.2
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +kolab-freebusy (1.0.5-0~kolab2) unstable; urgency=low + + * applied patch to fix usage of Net_LDAP3 + + -- Daniel Hoffend <dh@dotlan.net> Wed, 20 Aug 2014 16:54:02 +0100 + kolab-freebusy (1.0.5-0~kolab1) unstable; urgency=low * Release 1.0.5
View file
debian.series
Changed
@@ -0,0 +1,1 @@ +0001-fix-net-ldap3.patch -p1
View file
kolab-freebusy.dsc
Changed
@@ -2,7 +2,7 @@ Source: kolab-freebusy Binary: kolab-freebusy Architecture: all -Version: 1.0.5-0~kolab1 +Version: 1.0.5-0~kolab2 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> Homepage: http://www.kolab.org Standards-Version: 3.9.3
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.