Author: glen Date: Fri Aug 27 20:14:39 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- update extension deps
---- Files affected:
packages/roundcubemail:
roundcubemail.spec (1.98 -> 1.99)
---- Diffs:
================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.98
packages/roundcubemail/roundcubemail.spec:1.99
--- packages/roundcubemail/roundcubemail.spec:1.98 Fri Aug 27 08:45:44 2010
+++ packages/roundcubemail/roundcubemail.spec Fri Aug 27 22:14:34 2010
@@ -1,6 +1,5 @@
# $Revision$, $Date$
# TODO:
-# - prepare config for lighttpd
# - it has PEAR boundled inside - use system ones
# - use pear-deps system?
# - use system js/tiny_mce
@@ -13,6 +12,9 @@
%bcond_with password_anon_ldap_bind # apply with password-anon-ldap-bind
patch.
%define rcpfa_ver 1.0.5
+%define php_min_version 5.2.3
+
+%include /usr/lib/rpm/macros.php
Summary: RoundCube Webmail
Summary(pl.UTF-8): RoundCube Webmail - poczta przez WWW
Name: roundcubemail
@@ -33,28 +35,33 @@
Patch3: %{name}-faq-page.patch
Patch4: %{name}-password-anon-ldap-bind.patch
URL: http://www.roundcube.net/
+BuildRequires: rpm-php-pearprov >= 4.4.2-11
BuildRequires: rpmbuild(macros) >= 1.553
BuildRequires: sed >= 4.0
Requires: %{name}-skin
-Requires: php(dom)
-Requires: php(imap)
-Requires: php(pcre)
-Requires: php(session)
-Requires: php(sockets)
-Requires: php(spl)
-Requires: php(xml)
+Requires: php-common >= 4:%{php_min_version}
+Requires: php-date
+Requires: php-dom
+Requires: php-imap
+Requires: php-json
+Requires: php-pcre
Requires: php-pear-DB
+Requires: php-session
+Requires: php-simplexml
+Requires: php-sockets
+Requires: php-spl
+Requires: php-xml
Requires: rpm-whiteout >= 1.22
Requires: webapps
Requires: webserver(alias)
Requires: webserver(indexfile)
Requires: webserver(php)
-Suggests: php(fileinfo)
-Suggests: php(gd)
-Suggests: php(iconv)
-Suggests: php(mbstring)
-Suggests: php(mcrypt)
-Suggests: php(openssl)
+Suggests: php-fileinfo
+Suggests: php-gd
+Suggests: php-iconv
+Suggests: php-mbstring
+Suggests: php-mcrypt
+Suggests: php-openssl
Suggests: php-pear-Net_LDAP2
Conflicts: logrotate < 3.7-4
BuildArch: noarch
@@ -68,6 +75,15 @@
%define _applogdir /var/log/roundcube
%define _archivelogdir /var/log/archive/roundcube
+# bad depsolver
+%define _noautopear pear
+
+# exclude optional php dependencies
+%define _noautophp php-sqlite php-mysql php-mysqli
php-pgsql php-hash
+
+# put it together for rpmbuild
+%define _noautoreq %{?_noautophp} %{?_noautopear}
+
%description
RoundCube Webmail is a browser-based multilingual IMAP client with an
application-like user interface. It provides full functionality you
@@ -188,10 +204,10 @@
ln -sf %{_sysconfdir}/db.inc.php $RPM_BUILD_ROOT%{_appdir}/config/db.inc.php
ln -sf %{_sysconfdir}/main.inc.php
$RPM_BUILD_ROOT%{_appdir}/config/main.inc.php
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
-install %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/apache.conf
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/lighttpd.conf
+cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/logrotate.d/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
@@ -361,6 +377,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.99 2010/08/27 20:14:34 glen
+- update extension deps
+
Revision 1.98 2010/08/27 06:45:44 glen
- upgrade note
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.98&r2=1.99&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
