Request 3093 (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 3093 (accepted)

Updated tarball, reduced dependencies, symlink vendor directory.

Created by mollekopf about 2 years ago
In state accepted
Open review for Admin
Open review for vanmeeuwen
Open review for mollekopf
Open review for kolab-developers

Submit iRony

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

iRony.spec Changed

@@ -38,7 +38,7 @@
 
 Name:           iRony
 Version:        0.4.6
-Release:	    2%{?dist}
+Release:	    3%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -53,13 +53,8 @@
 BuildArch:      noarch
 
 Requires:       chwala >= 0.5.2
-Requires:       roundcubemail(core) >= 1.3
-%if 0%{?plesk} < 1
-Requires:       roundcubemail-plugin-kolab_auth >= 3.3.6
-%endif
-Requires:       roundcubemail-plugin-kolab_folders >= 3.3.6
-Requires:       roundcubemail-plugin-libcalendaring >= 3.3.6
-Requires:       roundcubemail-plugin-libkolab >= 3.3.6
+Requires:       roundcubemail(core) >= 1.5
+
 %if 0%{?suse_version}
 Requires:       http_daemon
 %else
@@ -71,29 +66,7 @@
 # by any package.
 BuildRequires:  chwala >= 0.5.2
 
-%if 0%{?rhel} < 8
-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(core) >= 1.3
-BuildRequires:  roundcubemail-plugins-kolab >= 3.3.6
-%if 0%{?rhel} < 8
-BuildRequires:  php-sabre-dav >= 2.1.11
-BuildRequires:  php-sabre-event >= 2.0.2
-BuildRequires:  php-sabre-http >= 3.0.5
-BuildRequires:  php-sabre-vobject >= 3.5.3
-%endif
-
-%if 0%{?fedora} >= 21
-# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
-BuildRequires: qca
-%endif
-%endif
+BuildRequires:  roundcubemail(core) >= 1.5
 
 %description
 iRony is the CardDAV, CalDAV and WebDAV storage access provider for the
@@ -128,14 +101,11 @@
 
 mkdir %{buildroot}/usr/share/%{name}/lib
 
-cp -a public_html vendor %{buildroot}/usr/share/%{name}
+cp -a public_html %{buildroot}/usr/share/%{name}
 cp -a lib/Kolab %{buildroot}/usr/share/%{name}/lib/
 
 pushd %{buildroot}/%{_datadir}/%{name}
 
-rm -rf vendor/sabre/dav/bin/naturalselection
-rm -rf vendor/sabre/dav/bin/googlecode_upload.py
-
 ln -s ../../..%{_localstatedir}/cache/%{name} temp
 ln -s ../../..%{_localstatedir}/log/%{name} logs
 
@@ -146,10 +116,7 @@
 ln -s ../../../..%{_sysconfdir}/roundcubemail/config.inc.php
 popd
 
-%if 0%{?rhel} < 8
-rm -rf vendor
 ln -s ../roundcubemail/vendor vendor
-%endif
 
 rm -rf lib/Roundcube
 pushd lib/
@@ -162,25 +129,12 @@
 
 install -pm 640 config/dav.inc.php.sample %{buildroot}/%{_sysconfdir}/%{name}/dav.inc.php
 
-# Fix upgrade path for `vendor` directory -> symlink change
-%if 0%{?rhel} < 8
-%pretrans -p <lua>
--- Define the path to directory being replaced below.
--- DO NOT add a trailing slash at the end.
-path = "%{_datadir}/%{name}/vendor"
-st = posix.stat(path)
-if st and st.type == "directory" then
-  status = os.rename(path, path .. ".rpmmoved")
-  if not status then
-    suffix = 0
-    while not status do
-      suffix = suffix + 1
-      status = os.rename(path .. ".rpmmoved", path .. ".rpmmoved." .. suffix)
-    end
-    os.rename(path, path .. ".rpmmoved")
-  end
-end
-%endif
+%pretrans
+# upgrade path for `vendor` directory -> symlink change. It's a vendor directory, so we don't do the rpmmoved dance.
+if  -d "/usr/share/iRony/vendor" -a ! -L "/usr/share/iRony/vendor" ; then
+    rm -rf /usr/share/iRony/vendor
+fi
+
 
 %post
 if  -f "/etc/php.d/apc.ini" -o -f "%{php_inidir}/apcu.ini" ; then
@@ -197,12 +151,17 @@
 %attr(0755,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
 %attr(0644,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
+
 %{_datadir}/%{name}
+
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/cache/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/lib/%{name}
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Mon Dec 19 2022 Christian Mollekopf <mollekopf@apheleia-it.ch> - 0.4.6-3
+- Updated tarball
+
 * Sat Feb 12 2022 Christoph Erhardt <kolab@sicherha.de> - 0.4.6-2
 - Fix transaction error on upgrade

debian.changelog Changed

debian.control Changed

debian.rules Changed

debian.tar.gz/links Changed

@@ -1,8 +1,9 @@
-etc/iRony/dav.inc.php usr/share/iRony/config/dav.inc.php
-etc/roundcubemail/defaults.inc.php usr/share/iRony/config/defaults.inc.php
-etc/roundcubemail/config.inc.php usr/share/iRony/config/config.inc.php
-usr/share/chwala/lib usr/share/iRony/lib/FileAPI
-usr/share/roundcubemail/program/lib/Roundcube usr/share/iRony/lib/Roundcube
-usr/share/roundcubemail/plugins usr/share/iRony/lib/plugins
-var/cache/iRony usr/share/iRony/temp
-var/log/iRony usr/share/iRony/logs
+etc/iRony/dav.inc.php /usr/share/iRony/config/dav.inc.php
+etc/roundcubemail/defaults.inc.php /usr/share/iRony/config/defaults.inc.php
+etc/roundcubemail/config.inc.php /usr/share/iRony/config/config.inc.php
+usr/share/chwala/lib /usr/share/iRony/lib/FileAPI
+usr/share/roundcubemail/program/lib/Roundcube /usr/share/iRony/lib/Roundcube
+usr/share/roundcubemail/plugins /usr/share/iRony/lib/plugins
+usr/share/roundcubemail/vendor /usr/share/iRony/vendor
+var/cache/iRony /usr/share/iRony/temp
+var/log/iRony /usr/share/iRony/logs

debian.tar.gz/preinst Changed

iRony-0.4.6.tar.gz Changed

iRony.dsc Changed

Build Results
RPM Lint

Refresh

Comments for request 3093 0

Request History

mollekopf created request about 2 years ago

Updated tarball, reduced dependencies, symlink vendor directory.

mollekopf accepted request about 2 years ago