Kolab Groupware OBS

iRony.spec Changed

@@ -23,32 +23,42 @@
 %global httpd_name apache2
 %global httpd_user wwwrun
 %else
+%if 0%{?plesk}
+%global httpd_group roundcube_sysgroup
+%global httpd_name httpd
+%global httpd_user roundcube_sysuser
+%else
 %global httpd_group apache
 %global httpd_name httpd
 %global httpd_user apache
 %endif
+%endif
 
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
 
 Name:           iRony
-Version: 0.4
-Release:	    0.20160321.git%{?dist}
+Version:        0.4.0
+Release:	    0.20170502.git%{?dist}
 Summary:        DAV for Kolab Groupware
 
 Group:          Applications/Internet
 License:        AGPLv3+
 URL:            http://kolab.org
 
-# From f7e4e0e36b62f10d2570d6fccef686c3e1c43af0
-Source0:        iRony-0.4.tar.gz
+# From 7ebe1adc8b7c0f818d837d682b2b85202aac9303
+Source0:        iRony-%{version}.tar.gz
 Source1:        iRony.conf
 Source2:        iRony.logrotate
 
 BuildArch:      noarch
 
 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-libkolab >= 3.3
 %if 0%{?suse_version}
@@ -67,9 +77,6 @@
 BuildRequires:  php-sabre-dav >= 2.1.3
 BuildRequires:  php-sabre-vobject >= 3.2.4
 
-Requires:       php-sabre-dav >= 2.1.3
-Requires:       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
@@ -95,14 +102,18 @@
 
 %install
 mkdir -p \
+%if 0%{?plesk} < 1
     %{buildroot}/%{_ap_sysconfdir}/conf.d \
+%endif
     %{buildroot}/%{_sysconfdir}/%{name} \
     %{buildroot}/%{_datadir}/%{name} \
     %{buildroot}/%{_localstatedir}/cache/%{name} \
     %{buildroot}/%{_localstatedir}/lib/%{name} \
     %{buildroot}/%{_localstatedir}/log/%{name}
 
+%if 0%{?plesk} < 1
 install -pm 644 %{SOURCE1} %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
 cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/iRony
@@ -144,7 +155,9 @@
 
 %files
 %doc README.md
+%if 0%{?plesk} < 1
 %{_ap_sysconfdir}/conf.d/%{name}.conf
+%endif
 %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}
@@ -154,6 +167,9 @@
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
 
 %changelog
+* Tue May  2 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-1
+- Release of version 0.4.0
+
 * Thu Jan  8 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-1
 - Release of version 0.3.0

debian.changelog Changed

debian.control Changed

debian.tar.gz/postinst Changed

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

iRony.dsc Changed

Changes of Revision 5