Overview

Request 2004 (accepted)

Check in 0.4.0

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

iRony.spec Changed
x
 
1
@@ -23,32 +23,42 @@
2
 %global httpd_name apache2
3
 %global httpd_user wwwrun
4
 %else
5
+%if 0%{?plesk}
6
+%global httpd_group roundcube_sysgroup
7
+%global httpd_name httpd
8
+%global httpd_user roundcube_sysuser
9
+%else
10
 %global httpd_group apache
11
 %global httpd_name httpd
12
 %global httpd_user apache
13
 %endif
14
+%endif
15
 
16
 %global _ap_sysconfdir %{_sysconfdir}/%{httpd_name}
17
 
18
 Name:           iRony
19
-Version: 0.4
20
-Release:       0.20160321.git%{?dist}
21
+Version:        0.4.0
22
+Release:       0.20170502.git%{?dist}
23
 Summary:        DAV for Kolab Groupware
24
 
25
 Group:          Applications/Internet
26
 License:        AGPLv3+
27
 URL:            http://kolab.org
28
 
29
-# From f7e4e0e36b62f10d2570d6fccef686c3e1c43af0
30
-Source0:        iRony-0.4.tar.gz
31
+# From 7ebe1adc8b7c0f818d837d682b2b85202aac9303
32
+Source0:        iRony-%{version}.tar.gz
33
 Source1:        iRony.conf
34
 Source2:        iRony.logrotate
35
 
36
 BuildArch:      noarch
37
 
38
 Requires:       chwala
39
+Requires:       php-sabre-dav >= 2.1.3
40
+Requires:       php-sabre-vobject >= 3.2.4
41
 Requires:       roundcubemail(core) >= 1.1
42
+%if 0%{?plesk} < 1
43
 Requires:       roundcubemail-plugin-kolab_auth >= 3.3
44
+%endif
45
 Requires:       roundcubemail-plugin-kolab_folders >= 3.3
46
 Requires:       roundcubemail-plugin-libkolab >= 3.3
47
 %if 0%{?suse_version}
48
@@ -67,9 +77,6 @@
49
 BuildRequires:  php-sabre-dav >= 2.1.3
50
 BuildRequires:  php-sabre-vobject >= 3.2.4
51
 
52
-Requires:       php-sabre-dav >= 2.1.3
53
-Requires:       php-sabre-vobject >= 3.2.4
54
-
55
 %if 0%{?fedora} >= 21
56
 # Fedora 21 has qca2 and qca, qca2 has been renamed to qca, required by kdelibs
57
 BuildRequires: qca
58
@@ -95,14 +102,18 @@
59
 
60
 %install
61
 mkdir -p \
62
+%if 0%{?plesk} < 1
63
     %{buildroot}/%{_ap_sysconfdir}/conf.d \
64
+%endif
65
     %{buildroot}/%{_sysconfdir}/%{name} \
66
     %{buildroot}/%{_datadir}/%{name} \
67
     %{buildroot}/%{_localstatedir}/cache/%{name} \
68
     %{buildroot}/%{_localstatedir}/lib/%{name} \
69
     %{buildroot}/%{_localstatedir}/log/%{name}
70
 
71
+%if 0%{?plesk} < 1
72
 install -pm 644 %{SOURCE1} %{buildroot}/%{_ap_sysconfdir}/conf.d/%{name}.conf
73
+%endif
74
 
75
 mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d
76
 cp -pr %SOURCE2 %{buildroot}%{_sysconfdir}/logrotate.d/iRony
77
@@ -144,7 +155,9 @@
78
 
79
 %files
80
 %doc README.md
81
+%if 0%{?plesk} < 1
82
 %{_ap_sysconfdir}/conf.d/%{name}.conf
83
+%endif
84
 %attr(0750,root,%{httpd_group}) %dir %{_sysconfdir}/%{name}
85
 %attr(0640,root,%{httpd_group}) %config(noreplace) %{_sysconfdir}/%{name}/dav.inc.php
86
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
87
@@ -154,6 +167,9 @@
88
 %attr(0770,%{httpd_user},%{httpd_group}) %{_localstatedir}/log/%{name}
89
 
90
 %changelog
91
+* Tue May  2 2017 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.4.0-1
92
+- Release of version 0.4.0
93
+
94
 * Thu Jan  8 2015 Jeroen van Meeuwen <vanmeeuwen@kolabsys.com> - 0.3.0-1
95
 - Release of version 0.3.0
96
 
97
debian.changelog Changed
17
 
1
@@ -1,3 +1,15 @@
2
+irony (0.4.0-0~kolab1) unstable; urgency=low
3
+
4
+  * Release of version 0.4.0
5
+
6
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  2 May 2017 12:12:13 +0100
7
+
8
+irony (0.4~dev20160321-0~kolab4.1) unstable; urgency=low
9
+
10
+  * Enhance packaging
11
+
12
+ -- Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>  Tue,  7 Feb 2017 12:12:13 +0100
13
+
14
 irony (0.4~dev20160321-0~kolab4) unstable; urgency=low
15
 
16
   * Updated Autoloader again
17
debian.control Changed
13
 
1
@@ -20,8 +20,9 @@
2
         php-sabre-http-3 (>= 3.0.5),
3
         php-sabre-event (>= 1.0.1),
4
         php-sabre-vobject-3 (>= 3.2.4),
5
-        roundcubemail,
6
-        roundcubemail-plugins-kolab (>= 3.1.12),
7
+        roundcubemail-core,
8
+        roundcubemail-plugin-libcalendaring (>= 3.1.12),
9
+        roundcubemail-plugin-libkolab (>= 3.1.12),
10
         ${misc:Depends}
11
 Description: Kolab Groupware DAV Access
12
  iRony is the DAV protocol access layer to Kolab Groupware
13
debian.tar.gz/postinst Changed
37
 
1
@@ -2,11 +2,10 @@
2
 
3
 set -e
4
 
5
-#EXTRA#
6
-#DEBHELPER#
7
-
8
 fixperms() {
9
-    chown -R www-data:www-data \
10
+    group=$(getent group roundcube_sysgroup >/dev/null 2>&1 && echo "roundcube_sysgroup" || echo "adm")
11
+    user=$(getent passwd roundcube_sysuser >/dev/null 2>&1 && echo "roundcube_sysuser" || echo "www-data")
12
+    chown -R ${user}:${group} \
13
         /var/cache/iRony \
14
         /var/log/iRony
15
     chmod 750 \
16
@@ -23,13 +22,17 @@
17
     fi
18
 }
19
 
20
-
21
 case "$1" in
22
     configure)
23
         fixperms
24
         a2enmod rewrite >/dev/null 2>&1 || true
25
-        if [ -e "/etc/apache2/sites-available/iRony.conf" -a ! -e "/etc/apache2/sites-enabled/iRony.conf" ]; then
26
-            a2ensite iRony.conf
27
+
28
+        if [ -f "/etc/plesk-release" ]; then
29
+            exit 0
30
+        fi
31
+
32
+        if [ -e "/etc/apache2/sites-available/chwala.conf" -a ! -e "/etc/apache2/sites-enabled/chwala.conf" ]; then
33
+            a2ensite chwala.conf
34
         fi
35
         reload_apache reload
36
     ;;
37
iRony-0.4.tar.gz -> iRony-0.4.0.tar.gz Changed
iRony.dsc Changed
22
 
1
@@ -2,7 +2,7 @@
2
 Source: irony
3
 Binary: irony
4
 Architecture: all
5
-Version: 0.4~dev20160321-0~kolab4
6
+Version: 0.4.0-0~kolab1
7
 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>
8
 Uploaders: Paul Klos <kolab@klos2day.nl>
9
 Homepage: http://www.kolab.org/
10
@@ -10,8 +10,8 @@
11
 Vcs-Browser: http://git.kolabsys.com/apt/iRony/
12
 Vcs-Git: git://git.kolabsys.com/git/apt/iRony
13
 Build-Depends: debhelper (>= 8), composer
14
-Package-List: 
15
+Package-List:
16
  iRony deb admin extra
17
-Files: 
18
- 00000000000000000000000000000000 0 iRony-0.4.tar.gz
19
+Files:
20
+ 00000000000000000000000000000000 0 iRony-0.4.0.tar.gz
21
  00000000000000000000000000000000 0 debian.tar.gz
22
Refresh
Refresh
Request History
Jeroen van Meeuwen's avatar

vanmeeuwen created request almost 8 years ago

Check in 0.4.0


Jeroen van Meeuwen's avatar

vanmeeuwen accepted review almost 8 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen approved review almost 8 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen accepted review almost 8 years ago

Accept


Jeroen van Meeuwen's avatar

vanmeeuwen accepted request almost 8 years ago

Accept