Changes of Revision 2

roundcubemail.spec Changed
x
 
1
@@ -48,7 +48,7 @@
2
 %global logdir /var/log/roundcubemail
3
 %global tmpdir /var/lib/roundcubemail
4
 
5
-%global rc_version 1.4.11.20
6
+%global rc_version 1.4.13
7
 %global plugin_version 3.5.9
8
 #%%global rc_rel_suffix rc2.12
9
 %global dot_rel_suffix %{?rc_rel_suffix:.%{rc_rel_suffix}}
10
@@ -57,7 +57,7 @@
11
 Name:           roundcubemail
12
 Version:        %{rc_version}
13
 
14
-Release:        1%{?dot_rel_suffix}%{?dist}
15
+Release:        2%{?dot_rel_suffix}%{?dist}
16
 
17
 Summary:        Round Cube Webmail is a browser-based multilingual IMAP client
18
 
19
@@ -217,8 +217,7 @@
20
 cp -vf %{SOURCE102} plugins/password/config.inc.php.dist
21
 cp -vf %{SOURCE103} plugins/calendar/config.inc.php.dist
22
 cp -vf %{SOURCE104} plugins/kolab_addressbook/config.inc.php.dist
23
-#TODO?
24
-#cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
25
+cp -vf %{SOURCE105} plugins/kolab_chat/config.inc.php.dist
26
 cp -vf %{SOURCE106} plugins/kolab_folders/config.inc.php.dist
27
 cp -vf %{SOURCE107} plugins/libkolab/config.inc.php.dist
28
 %endif
29
@@ -549,6 +548,9 @@
30
 %dir %{_localstatedir}/lib/rpm-state/roundcubemail/
31
 
32
 %changelog
33
+* Tue Nov  30 2021 Christian Mollekopf <mollekopf@apheleia-it.ch> - 1.4.11.20-2
34
+- Selfcontained build
35
+
36
 * Wed Sep  1 2021 Jeroen van Meeuwen <vanmeeuwen@apheleia-it.ch> - 1.4.11.20-1
37
 - Check in release 1.4.11.20
38
 
39
buildroundcubemailtarball.sh Changed
80
 
1
@@ -2,10 +2,16 @@
2
 
3
 set -e
4
 
5
-VERSION=1.4.11.20
6
+VERSION=1.4.13
7
+GIT_REF=1.4.13
8
 NAME=roundcubemail-$VERSION
9
 PLESK_SKIN="roundcubemail-skin-plesk-0.4.0"
10
-LESSC=~/node_modules/less/bin/lessc
11
+
12
+if [ -x "/usr/local/bin/lessc" ]; then
13
+    LESSC=/usr/local/bin/lessc
14
+else
15
+    LESSC=~/node_modules/less/bin/lessc
16
+fi
17
 
18
 
19
 ROOT_DIR=$(pwd)
20
@@ -41,6 +47,13 @@
21
         },
22
         {
23
             "type": "path",
24
+            "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_auth",
25
+            "options": {
26
+                "symlink": false
27
+            }
28
+        },
29
+        {
30
+            "type": "path",
31
             "url": "$PWD/roundcubemail-plugins-kolab-latest/plugins/kolab_config",
32
             "options": {
33
                 "symlink": false
34
@@ -144,15 +157,19 @@
35
         "kolab/calendar": "~3.5.9",
36
         "kolab/kolab_activesync": "~3.5.6",
37
         "kolab/kolab_addressbook": "~3.5.6",
38
+        "kolab/kolab_auth": "~3.5.6",
39
+        "kolab/kolab_chat": "~3.5.2",
40
         "kolab/kolab_config": "~3.4.0",
41
         "kolab/kolab_files": "~3.5.2",
42
         "kolab/kolab_folders": "~3.5.2",
43
         "kolab/kolab_notes": "~3.5.5",
44
         "kolab/kolab_tags": "~3.5.2",
45
+        "kolab/net_ldap3": "~1.1.1",
46
         "kolab/odfviewer": "~3.4.0",
47
         "kolab/pdfviewer": "~3.4.0",
48
         "kolab/tasklist": "~3.5.9",
49
         "johndoh/contextmenu": "~3.2.1",
50
+        "zf1/zend-json": "~1.12.11",
51
         "zf1/zend-log": "~1.12.11",
52
         "zf1/zend-controller": "~1.12.11",
53
         "sabre/dav" : "~2.1.6",
54
@@ -163,7 +180,6 @@
55
         "phpunit/phpunit": "^4.8.36 || ^5.7.21"
56
     },
57
     "suggest": {
58
-        "kolab/net_ldap3": "~1.1.1 required for connecting to LDAP",
59
         "mkopinsky/zxcvbn-php": "^4.4.2 required for Zxcvbn password strength driver"
60
     }
61
 }
62
@@ -172,6 +188,9 @@
63
 rm -f $NAME.tar.gz
64
 [ -d "$NAME" ] && rm -rf "$NAME"
65
 git clone --branch release-1.4 https://github.com/roundcube/roundcubemail.git $NAME
66
+pushd $NAME
67
+git reset --hard $GIT_REF
68
+popd
69
 
70
 [ -d roundcubemail-plugins-kolab-latest ] && rm -rf roundcubemail-plugins-kolab-latest
71
 git clone --branch master ssh://git@git.kolab.org/diffusion/RPK/roundcubemail-plugins-kolab.git roundcubemail-plugins-kolab-latest
72
@@ -250,6 +269,6 @@
73
 
74
 popd
75
 
76
-tar czf "$ROOT_DIR/$NAME.tar.gz" $NAME
77
+tar --exclude="$NAME/.git" -czf "$ROOT_DIR/$NAME.tar.gz" $NAME
78
 
79
 cd "$PWD"
80
debian.changelog Changed
11
 
1
@@ -1,3 +1,9 @@
2
+roundcubemail (1.4.13-0~kolab1) unstable; urgency=low
3
+
4
+  * Check in 1.4.13
5
+
6
+ -- Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>  Fri, 14 Jan 2022 11:11:11 +0200
7
+
8
 roundcubemail (1.4.11.20-0~kolab1) unstable; urgency=low
9
 
10
   * Check in 1.4.11.20
11
roundcubemail-1.4.11.20.tar.gz -> roundcubemail-1.4.13.tar.gz Changed
roundcubemail.dsc Changed
17
 
1
@@ -2,7 +2,7 @@
2
 Source: roundcubemail
3
 Binary: roundcubemail
4
 Architecture: all
5
-Version: 1:1.4.11.20-0~kolab1
6
+Version: 1:1.4.13-0~kolab1
7
 Maintainer: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
8
 Uploaders: Jeroen van Meeuwen <vanmeeuwen@kolabsys.com>
9
 Homepage: http://www.roundcube.net/
10
@@ -14,5 +14,5 @@
11
  roundcubemail deb web extra
12
  roundcubemail-core deb web extra
13
 Files:
14
- 00000000000000000000000000000000 0 roundcubemail-1.4.11.20.tar.gz
15
+ 00000000000000000000000000000000 0 roundcubemail-1.4.13.tar.gz
16
  00000000000000000000000000000000 0 debian.tar.gz
17