Kolab Groupware OBS

Changes of Revision 18

roundcubemail.spec Changed

@@ -64,8 +64,10 @@
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
 
+%if 0%{?suse_version} < 1
 BuildRequires:  python-cssmin
 BuildRequires:  uglify-js
+%endif
 
 %if 0%{?suse_version}
 Requires:       http_daemon
@@ -89,6 +91,7 @@
 Requires:       php-pear(MDB2_Driver_mysqli)
 Requires:       php-pear(Net_IDNA2)
 Requires:       php-pear(Net_LDAP2)
+Requires:       php-pear(Net_LDAP3)
 Requires:       php-pear(Net_Sieve)
 Requires:       php-pear(Net_SMTP)
 Requires:       php-pear(Net_Socket)
@@ -233,6 +236,9 @@
 # Exclude the following external libraries
 #
 
+# php-pear-Net-LDAP3
+rm -rf %{buildroot}/%{roundcube}/program/lib/Net/LDAP3/ \
+    %{buildroot}/%{roundcube}/program/lib/Net/LDAP3.php
 # php-pear-Net-IDNA2
 rm -rf %{buildroot}/%{roundcube}/program/lib/Net/IDNA2/ \
     %{buildroot}/%{roundcube}/program/lib/Net/IDNA2.php
@@ -249,6 +255,9 @@
 rm -rf %{buildroot}/%{roundcube}/program/lib/PEAR.php \
     %{buildroot}/%{roundcube}/program/lib/PEAR5.php
 
+# Remove any empty directory we might be left with
+find %{buildroot}/%{roundcube}/program/lib -type d -empty -delete
+
 %if 0%{?rhel} > 5 || 0%{?fedora} > 13
 # php-pear-Net-Sieve
 rm -rf %{buildroot}/%{roundcube_plugins}/managesieve/lib/Net

debian.control Changed