Kolab Groupware OBS

Changes of Revision 156

roundcubemail.spec Changed

@@ -95,7 +95,9 @@
 %if 0%{?plesk} < 1
 BuildRequires:  php-gd
 BuildRequires:  php-mbstring
+%if 0%{?rhel} <= 7
 BuildRequires:  php-mcrypt
+%endif
 BuildRequires:  php-pdo
 BuildRequires:  php-pear >= 1.9.0
 BuildRequires:  php-phpunit-PHPUnit
@@ -126,14 +128,14 @@
 %endif
 
 %if "%{_arch}" != "ppc64" && "%{_arch}" != "ppc64le" && 0%{?suse_version} < 1
-BuildRequires:  python-cssmin
+BuildRequires:  python%{?python3_pkgversion}-cssmin
 %endif
 
 # This can, regrettably, not be BuildRequires'ed, since the OSC
 # command-line so epicly fails at downloading as large a chunk of data.
 #BuildRequires:  firefox
-BuildRequires:  python
-BuildRequires:  python-nose
+BuildRequires:  python%{?python3_pkgversion}
+BuildRequires:  python%{?python3_pkgversion}-nose
 #BuildRequires:  python-selenium
 
 Requires:       %{name}(core) = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -1850,7 +1852,7 @@
     find %{buildroot}%{datadir} -type l >> current-new.files
 
     if [ -f "current.files" ]; then
-        python ./comm.py current.files current-new.files
+        python%{?python3_pkgversion} ./comm.py current.files current-new.files
     else
         cat current-new.files
     fi