Request 2029 (superseded)

iRony.spec Changed

@@ -35,11 +35,10 @@
 %endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
-%global upstream_version 0.4.8
 
 Name:           iRony
-Version: 0.4.8.4
-Release:	    1%{?dist}
+Version:        0.4.0
+Release:	    0.20170502.git%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
@@ -47,15 +46,22 @@
 URL:            http://kolab.org
 
 # From 7ebe1adc8b7c0f818d837d682b2b85202aac9303
-Source0:        iRony-%{upstream_version}.tar.gz
+Source0:        iRony-%{version}.tar.gz
 Source1:        iRony.conf
 Source2:        iRony.logrotate
 
 BuildArch:      noarch
 
-Requires:       chwala >= 0.5.2
-Requires:       roundcubemail(core) >= 1.5
-
+Requires:       chwala
+Requires:       php-sabre-dav >= 2.1.3
+Requires:       php-sabre-vobject >= 3.2.4
+Requires:       roundcubemail(core) >= 1.1
+%if 0%{?plesk} < 1
+Requires:       roundcubemail-plugin-kolab_auth >= 3.3
+%endif
+Requires:       roundcubemail-plugin-kolab_folders >= 3.3
+Requires:       roundcubemail-plugin-libcalendaring >= 3.3
+Requires:       roundcubemail-plugin-libkolab >= 3.3
 %if 0%{?suse_version}
 Requires:       http_daemon
 %else
@@ -65,18 +71,35 @@
 # Build requirements needed of *SUSE, which otherwise bails over
 # dead-end symbolic links and/or files and directories not owned
 # by any package.
-BuildRequires:  chwala >= 0.5.2
-
-BuildRequires:  roundcubemail(core) >= 1.5
+BuildRequires:  chwala
+BuildRequires:  composer
+BuildRequires:  roundcubemail
+BuildRequires:  roundcubemail-plugins-kolab
+BuildRequires:  php-sabre-dav >= 2.1.3
+BuildRequires:  php-sabre-vobject >= 3.2.4
+
+%if 0%{?fedora} >= 21
+# Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
+BuildRequires: qca
+%endif
 
 %description
 iRony is the CardDAV, CalDAV and WebDAV storage access provider for the
 Kolab Groupware solution.
 
 %prep
-%setup -q -n %{name}-%{upstream_version}
+%setup -q
 
 %build
+rm -rf composer.json
+mv composer.json-dist composer.json
+mkdir -p $HOME/.composer/
+echo '{}' > $HOME/.composer/composer.json
+%if 0%{?fedora} >= 25
+# workaround for misbehaving Kolab modules for PHP7, probably a swig issue
+export USE_ZEND_ALLOC=0
+%endif
+composer -vvv dumpautoload --optimize
 
 %install
 mkdir -p \
@@ -96,13 +119,9 @@
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/iRony
 
-sed -i \
-    -e 's/apache apache/%{httpd_user} %{httpd_group}/g' \
-    %{buildroot}%{_sysconfdir}/logrotate.d/iRony
-
 mkdir %{buildroot}/usr/share/%{name}/lib
 
-cp -a public_html %{buildroot}/usr/share/%{name}
+cp -a public_html vendor %{buildroot}/usr/share/%{name}
 cp -a lib/Kolab %{buildroot}/usr/share/%{name}/lib/
 
 pushd %{buildroot}/%{_datadir}/%{name}
@@ -117,8 +136,6 @@
 ln -s ../../../..%{_sysconfdir}/roundcubemail/config.inc.php
 popd
 
-ln -s ../roundcubemail/vendor vendor
-
 rm -rf lib/Roundcube
 pushd lib/
 ln -s ../../chwala/lib FileAPI
@@ -130,16 +147,9 @@
 
 install -pm 640 config/dav.inc.php.sample %{buildroot}/%{_sysconfdir}/%{name}/dav.inc.php
 
-%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
-    if  ! -z "`grep ^apc.enabled=1 /etc/php.d/apc{,u}.ini 2>/dev/null`" ; then
+    if  ! -z "`grep ^apc.enabled=1 /etc/php.d/apc{,u}.ini`" ; then
         /sbin/service httpd condrestart
     fi
 fi
@@ -147,58 +157,17 @@
 %files
 %doc README.md
 %if 0%{?plesk} < 1
-%config(noreplace) %{_ap_sysconfdir}/conf.d/%{name}.conf
+%{_ap_sysconfdir}/conf.d/%{name}.conf
 %endif
-%attr(0755,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
-%attr(0644,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
+%attr(0750,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
+%attr(0640,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
-
-* Sat Dec 25 2021 Christian Mollekopf <mollekopf@kolabsys.com> - 0.4.5-2
-- Fixed configuration directory permissions
-- Link to roundcubemail vendor directory in ootpa
-
-* Mon Oct 19 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.5-1
-- Release of version 0.4.5
-
-* Fri Oct 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.4-1
-- Release of version 0.4.4
-
-* Thu Jan 16 2020 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.3-1
-- Release of version 0.4.3
-
-* Tue Apr 23 2019 Christian Mollekopf (Kolab Systems) <mollekopf@kolabsys.com> - 0.4.2-4
-- Support shortlogins via the username_domain configuration option
-
-* Thu Apr 11 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-2
-- Avoid referring to kolab_auth if it isn't actually installed
-
-* Thu Mar 14 2019 Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com> - 0.4.2-1
-- Release 0.4.2
-
-* Wed Jun 20 2018 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.1-2
-- Fix marking httpd's conf.d/iRony.conf file as a configuration file not
-  to be replaced by package updates
-- Require a more narrow range of Sabre packages
-
-* 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

add-sabre21-path-for-debian.patch Added

buildtarball.sh Deleted

debian.changelog Changed

@@ -1,111 +1,3 @@
-irony (0.4.8.4-1~kolab1) unstable; urgency=low
-
-  * New release
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 24 Feb 2023 12:12:13 +0100
-
-irony (0.4.7-1~kolab1) unstable; urgency=low
-
-  * Disable unauthenticated access
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Sun, 15 Jan 2023 12:12:13 +0100
-
-irony (0.4.6-7~kolab1) unstable; urgency=low
-
-  * sabre/vobject 4 compatiblity
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 30 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-6~kolab1) unstable; urgency=low
-
-  * Remove type declaration from property
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Fri, 30 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-5~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.6
-
- -- Christian Mollekopf <mollekopf@apheleia-it.ch>  Mon, 19 Dec 2022 12:12:13 +0100
-
-irony (0.4.6-1~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.6
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Tue, 11 Jan 2022 12:12:13 +0100
-
-irony (0.4.5-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.5
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Mon, 19 Oct 2020 12:12:13 +0100
-
-irony (0.4.4-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.4
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 16 Oct 2020 12:12:13 +0100
-
-irony (0.4.3-1~kolab2) unstable; urgency=low
-
-  * Release of version 0.4.3
-
- -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Thu, 16 Jan 2020 12:12:13 +0100
-
-irony (0.4.2-1~kolab6) unstable; urgency=low
-
-  * Support shortlogins via the username_domain configuration option.
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Tue, 23 Apr 2019 12:12:12 +0100
-
-irony (0.4.2-1~kolab3) unstable; urgency=low
-
-  * Adjusted iRony.logrotate according to new filenames
-
- -- Christian Mollekopf (Kolab Systems) <mollekopf@kolabys.com>  Mon, 15 Apr 2019 12:12:12 +0100
-
-irony (0.4.2-1~kolab2) unstable; urgency=low
-
-  * Avoid referring to kolab_auth if it isn't actually installed
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 Apr 2019 12:12:13 +0100
-
-irony (0.4.2-1~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.2
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 14 Mar 2019 12:12:13 +0100
-
-irony (0.4.1-2~kolab1) unstable; urgency=low
-
-  * Narrow the requirements on specific sabre packages
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 20 Jun 2018 12:12:13 +0100
-
-irony (0.4.1-1~kolab1) unstable; urgency=low
-
-  * Fix autoloader mess, again
-
- -- Christoph Erhardt <kolab@sicherha.de>  Fri, 15 Jun 2018 17:33:17 +0200
-
-irony (0.4.1-0~kolab1) unstable; urgency=low
-
-  * Release of version 0.4.1
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Wed, 13 Jun 2018 12:12:13 +0100
-
-irony (0.4.0-0~kolab4) unstable; urgency=low
-
-  * Smoothen upgrade path
-
- -- Christoph Erhardt <kolab@sicherha.de>  Sun, 04 Jun 2017 11:27:27 +0200
-
-irony (0.4.0-0~kolab3) unstable; urgency=low
-
-  * Fix iRony apache site configuration
-
- -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Thu, 11 May 2017 12:12:13 +0100
-
 irony (0.4.0-0~kolab2) unstable; urgency=low
 
   * Fix log rotation on Plesk

debian.control Changed

debian.rules Changed

@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-export DH_VERBOSE=1
-export DH_OPTIONS=-v
+#export DH_OPTIONS=-v
+#export DH_VERBOSE=1
 
 %:
 	dh $@
@@ -12,17 +12,17 @@
 	fi
 
 override_dh_install:
-	dh_install -X.arcconfig -X.gitignore
+	mkdir -p $(CURDIR)/debian/irony/etc/iRony/
 
-	if  ! -f "/etc/plesk-release" ; then \
+	if  ! -f "/etc/plesk-release" ; then
 		mkdir -p $(CURDIR)/debian/irony/etc/apache2/sites-available ; \
-		install -pm 644 $(CURDIR)/debian/iRony.conf \
-			$(CURDIR)/debian/irony/etc/apache2/sites-available/iRony.conf ; \
+		cp -a $(CURDIR)/debian/iRony.conf \
+			$(CURDIR)/debian/irony/etc/apache2/sites-available/irony.conf ; \
 	fi
 
-	mkdir -p $(CURDIR)/debian/irony/etc/iRony/
 	cp -a config/dav.inc.php.sample $(CURDIR)/debian/irony/etc/iRony/dav.inc.php
 	mkdir -p $(CURDIR)/debian/irony/usr/share/iRony/config
 	mkdir -p $(CURDIR)/debian/irony/usr/share/iRony/lib
 	cp -a lib/Kolab $(CURDIR)/debian/irony/usr/share/iRony/lib
 	cp -a public_html $(CURDIR)/debian/irony/usr/share/iRony/
+	cp -a vendor $(CURDIR)/debian/irony/usr/share/iRony/

debian.series Changed

debian.tar.gz/links Changed

@@ -1,9 +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
-usr/share/roundcubemail/vendor /usr/share/iRony/vendor
-var/cache/iRony /usr/share/iRony/temp
-var/log/iRony /usr/share/iRony/logs
+etc/iRony/apache.conf etc/apache2/sites-available/iRony.conf
+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

debian.tar.gz/postinst Changed

debian.tar.gz/preinst Changed

@@ -14,7 +14,7 @@
 
 case "$1" in
     upgrade|install)
-        # rename old apache/http sites from sitename to sitename.conf
+        # rename old apache/http sites rom sitename to sitename.conf
         if  -e /etc/apache2/sites-available/iRony -a ! -e /etc/apache2/sites-available/iRony.conf ; then
             if  -h /etc/apache2/sites-enabled/iRony ; then
                 a2dissite iRony
@@ -23,18 +23,8 @@
             a2ensite iRony.conf
             reload_apache
         fi
-        # fixup accidental creation of irony.conf in 0.4.0-0~kolab1
-        if  -e /etc/apache2/sites-available/irony.conf -a ! -e /etc/apache2/sites-available/iRony.conf ; then
-            if  -h /etc/apache2/sites-enabled/irony.conf ; then
-                a2dissite irony.conf
-            fi
-            mv /etc/apache2/sites-available/irony.conf /etc/apache2/sites-available/iRony.conf
-            a2ensite iRony.conf
-            reload_apache
-        fi
-        # Remove vendor directory so it can be replaced with a symlink
-        rm -rf /usr/share/iRony/vendor
     ;;
 esac
 
 exit 0
+

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

iRony.dsc Changed

iRony.logrotate Changed

Overview

Request 2029 (superseded)

Request History