Projects
Kontact:4.13:Development
libkolab
Log In
Username
Password
Problem getting expanded diff: bad link: conflict in file libkolab.dsc
×
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 13
View file
libkolab.spec
Changed
@@ -30,7 +30,7 @@ Name: libkolab %endif -Version: 0.6 +Version: 0.7 Release: 0.1.dev20150112.gitf0f953aa%{?dist} Summary: Kolab Object Handling Library @@ -41,12 +41,12 @@ Source0: http://git.kolab.org/%{name}/snapshot/libkolab-%{version}.tar.gz BuildRequires: cmake -%if 0%{?rhel} > 6 || 0%{?fedora} > 16 -BuildRequires: kdepimlibs-devel >= 4.9 +%if 0%{?rhel} > 7 || 0%{?fedora} > 21 +BuildRequires: kdepimlibs-devel >= 4.11 %else # Note: available within kolabsys.com infrastructure only, as being (essentially) a # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9 +BuildRequires: libcalendaring-devel >= 4.9.1 %endif BuildRequires: libcurl-devel BuildRequires: libkolabxml-devel >= 1.0 @@ -70,12 +70,12 @@ %endif Summary: Kolab library development headers Requires: libkolab%{?_isa} = %{version} -%if 0%{?rhel} > 6 || 0%{?fedora} > 16 -BuildRequires: kdepimlibs-devel >= 4.9 +%if 0%{?rhel} > 7 || 0%{?fedora} > 21 +BuildRequires: kdepimlibs-devel >= 4.11 %else # Note: available within kolabsys.com infrastructure only, as being (essentially) a # fork of various kde 4.9 libraries that depend on kde*, and that have no place in el6. -BuildRequires: libcalendaring-devel >= 4.9 +BuildRequires: libcalendaring-devel >= 4.9.1 %endif Requires: libkolabxml-devel >= 1.0 Requires: php-devel @@ -153,7 +153,7 @@ -DBoost_NO_BOOST_CMAKE=TRUE \ -Wno-fatal-errors -Wno-errors \ -DINCLUDE_INSTALL_DIR=%{_includedir} \ -%if 0%{?rhel} < 7 && 0%{?fedora} < 17 +%if 0%{?rhel} < 8 && 0%{?fedora} < 22 -DUSE_LIBCALENDARING=ON \ %endif -DPHP_BINDINGS=ON \ @@ -211,7 +211,7 @@ %files %{_libdir}/libkolab.so.0 -%{_libdir}/libkolab.so.0.6 +%{_libdir}/libkolab.so.0.7 %if 0%{?suse_version} %files -n libkolab-devel @@ -249,6 +249,9 @@ %{python_sitearch}/kolab/shared.py* %changelog +* Mon Feb 09 2015 Timotheus Pokorra <tp@tbits.net> +- master is going towards 0.7 + * Mon Jan 12 2015 Christoph Wickert <wickert@kolabsys.com> - 0.6-0.1.dev20150112.gitf0f953aa - Add dummy plugin to workaround httpd reload issue (#2050)
View file
_link
Changed
@@ -1,4 +1,4 @@ -<link project="Kolab:Development" baserev="6cb96e1ecab97cf3501e83fbece7add0"> +<link project="Kolab:Development" baserev="80be1b512cc0407fb5328336b4c7583e"> <patches> <branch/> </patches>
View file
_service
Changed
@@ -1,7 +1,7 @@ <services> <service name="tar_scm"> <param name="scm">git</param> - <param name="url">git://git.kolab.org/git/libkolab.git</param> + <param name="url">https://git.kolab.org/diffusion/LK/libkolab.git</param> <param name="versionprefix">0.6.git</param> <param name="filename">libkolab</param> </service> @@ -14,4 +14,4 @@ <param name="compression">gz</param> </service> <service name="set_version"/> -</services> \ No newline at end of file +</services>
View file
debian.changelog
Changed
@@ -1,3 +1,9 @@ +libkolab (0.6~dev20150112-0~kolab2) unstable; urgency=low + + * make sure the dummy plugin is loaded before all other plugins to workaround httpd reload issue (#2050) + + -- Timotheus Pokorra <tp@tbits.net> Thu, 22 January 2015 13:36:13 +0100 + libkolab (0.6~dev20150112-0~kolab1) unstable; urgency=low * Add dummy plugin to workaround httpd reload issue (#2050)
View file
debian.control
Changed
@@ -49,7 +49,7 @@ Depends: libkolab0 (= ${binary:Version}), php-kolabformat, ucf, - libcalendaring, + libcalendaring (>= 4.9.1), ${php:Depends}, ${misc:Depends}, ${shlibs:Depends} @@ -80,6 +80,7 @@ Section: libdevel Architecture: any Depends: libkolab0 (= ${binary:Version}), + libcalendaring-dev (>= 4.9.1), ${misc:Depends} Conflicts: libkolab-kde-dev Description: Development package for Kolab library
View file
debian.tar.gz/php-kolab.postinst
Changed
@@ -69,4 +69,12 @@ fi fi +if [ "$1" = "configure" ]; then + + # make sure that kolabformat.so is loaded after dummy.so, see #2050 + sed -i "s/extension=dummy.so/extension=dummy.so\nextension=kolabformat.so/" /usr/share/php5/kolab/kolab.ini + sed -i "s/extension=kolabformat.so/;extension=kolabformat.so/" /usr/share/php5/kolab/kolabformat.ini + +fi + exit 0
View file
debian.tar.gz/usr/share/php5/kolab/kolab.ini
Changed
@@ -1,4 +1,5 @@ ; Kolab libraries +extension=dummy.so extension=kolabobject.so extension=kolabshared.so extension=kolabcalendaring.so
View file
debian.tar.gz/usr/share/php5/kolabdummy/kolabdummy.ini
Changed
@@ -1,2 +1,2 @@ ; Kolab libraries -extension=dummy.so +;extension=dummy.so
View file
libkolab.dsc
Changed
@@ -2,7 +2,7 @@ Source: libkolab Binary: libkolab0, php-kolab, python-kolab, libkolab-dev Architecture: any -Version: 0.6~dev20150112-0~kolab1 +Version: 0.6~dev20150112-0~kolab2 Maintainer: Debian Kolab Maintainers <pkg-kolab-devel@lists.alioth.debian.org> Uploaders: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Christoph Wickert <wickert@kolabsys.com>, Paul Klos <kolab@klos2day.nl> Homepage: http://git.kolab.org/libkolab
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
.