Request 2271 (accepted)

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Overview

Request 2271 (accepted)

Check in 0.4.1

Created by vanmeeuwen over 6 years ago
In state accepted

Submit iRony

Submit package Kolab:Winterfell / iRony to package Kolab:16 / iRony

iRony.spec Changed

@@ -37,8 +37,8 @@
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version:        0.4.0
-Release:	    0.20170502.git%{?dist}
+Version:        0.4.1
+Release:	    1%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -54,6 +54,8 @@
 
 Requires:       chwala
 Requires:       php-sabre-dav >= 2.1.3
+Requires:       php-sabre-event >= 1.0.1
+Requires:       php-sabre-http >= 3.0.5
 Requires:       php-sabre-vobject >= 3.2.4
 Requires:       roundcubemail(core) >= 1.1
 %if 0%{?plesk} < 1
@@ -73,9 +75,18 @@
 # by any package.
 BuildRequires:  chwala
 BuildRequires:  composer
+%if 0%{?fedora}
+# fix issue:
+# have choice for php-composer(justinrainbow/json-schema) >= 2.0 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema
+# have choice for php-composer(justinrainbow/json-schema) < 5 needed by composer: php-justinrainbow-json-schema4 php-justinrainbow-json-schema php-JsonSchema
+BuildRequires:  php-justinrainbow-json-schema4
+%endif
+
 BuildRequires:  roundcubemail
 BuildRequires:  roundcubemail-plugins-kolab
 BuildRequires:  php-sabre-dav >= 2.1.3
+BuildRequires:  php-sabre-event >= 1.0.1
+BuildRequires:  php-sabre-http >= 3.0.5
 BuildRequires:  php-sabre-vobject >= 3.2.4
 
 %if 0%{?fedora} >= 21
@@ -91,6 +102,8 @@
 %setup -q
 
 %build
+rm -rvf vendor/sabre
+
 rm -rf composer.json
 mv composer.json-dist composer.json
 mkdir -p $HOME/.composer/
@@ -172,6 +185,12 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Wed Jun 13 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.1-1
+- Release of version 0.4.1
+
+* Thu May 25 2017 Timotheus Pokorra <tp@tbits.net> - 0.4.0-3
+- Fix build error on Fedora 25, composer needs php-justinrainbow-json-schema4
+
 * Wed May 10 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-2
 - Fix log rotation on Plesk

debian.changelog Changed

debian.control Changed

@@ -3,7 +3,16 @@
 Priority: extra
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
 Uploaders: Paul Klos <kolab@klos2day.nl>
-Build-Depends: debhelper (>= 8), composer
+Build-Depends:
+        debhelper (>= 8),
+        composer,
+        php-sabre-dav-2.1 (>= 2.1.5),
+        php-sabre-event (>= 1.0.1),
+        php-sabre-http-3 (>= 3.0.5),
+        php-sabre-vobject-3,
+        roundcubemail-core,
+        roundcubemail-plugin-libcalendaring (>= 3.1.12),
+        roundcubemail-plugin-libkolab (>= 3.1.12)
 Standards-Version: 3.9.3
 Homepage: http://www.kolab.org/
 Vcs-Browser: http://git.kolabsys.com/apt/iRony/
@@ -17,8 +26,8 @@
         libapache2-mod-php5 | libapache2-mod-php,
         php5 | php,
         php-sabre-dav-2.1 (>= 2.1.3),
-        php-sabre-http-3 (>= 3.0.5),
         php-sabre-event (>= 1.0.1),
+        php-sabre-http-3 (>= 3.0.5),
         php-sabre-vobject-3 (>= 3.2.4),
         roundcubemail-core,
         roundcubemail-plugin-libcalendaring (>= 3.1.12),

debian.rules Changed

iRony-0.4.0.tar.gz -> iRony-0.4.1.tar.gz Changed

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 2271 0

Request History

vanmeeuwen created request over 6 years ago

Check in 0.4.1

vanmeeuwen accepted review over 6 years ago

vanmeeuwen approved review over 6 years ago

vanmeeuwen accepted request over 6 years ago