packages: roundcubemail/roundcubemail.spec - use system pear pkgs, for libs...

[glen]

Author: glen                         Date: Fri Aug 27 21:00:03 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use system pear pkgs, for libs unmodified
- some deps are soft; rel 3

---- Files affected:
packages/roundcubemail:
   roundcubemail.spec (1.99 -> 1.100) 

---- Diffs:

================================================================
Index: packages/roundcubemail/roundcubemail.spec
diff -u packages/roundcubemail/roundcubemail.spec:1.99 packages/roundcubemail/roundcubemail.spec:1.100
--- packages/roundcubemail/roundcubemail.spec:1.99	Fri Aug 27 22:14:34 2010
+++ packages/roundcubemail/roundcubemail.spec	Fri Aug 27 22:59:57 2010
@@ -1,7 +1,6 @@
 # $Revision$, $Date$
 # TODO:
-# - it has PEAR boundled inside - use system ones
-# - use pear-deps system?
+# - move bin/* to -setup which are related to upgrading/setup
 # - use system js/tiny_mce
 # - package: http://blog.ilohamail.org/ and remove boundled classess from it
 # - Some php-database backend. Suggests?
@@ -19,7 +18,7 @@
 Summary(pl.UTF-8):	RoundCube Webmail - poczta przez WWW
 Name:		roundcubemail
 Version:	0.4
-Release:	2
+Release:	3
 License:	GPL v2
 Group:		Applications/Mail
 Source0:	http://downloads.sourceforge.net/roundcubemail/%{name}-%{version}.tar.gz
@@ -43,7 +42,6 @@
 Requires:	php-date
 Requires:	php-dom
 Requires:	php-imap
-Requires:	php-json
 Requires:	php-pcre
 Requires:	php-pear-DB
 Requires:	php-session
@@ -56,13 +54,18 @@
 Requires:	webserver(alias)
 Requires:	webserver(indexfile)
 Requires:	webserver(php)
-Suggests:	php-fileinfo
+Suggests:	php(fileinfo)
 Suggests:	php-gd
 Suggests:	php-iconv
+Suggests:	php-json
 Suggests:	php-mbstring
 Suggests:	php-mcrypt
 Suggests:	php-openssl
+Suggests:	php-pear-Auth_SASL
 Suggests:	php-pear-Net_LDAP2
+Suggests:	php-pear-Net_Sieve
+Suggests:	php-pear-Net_Socket
+Suggests:	php-xml
 Conflicts:	logrotate < 3.7-4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -79,7 +82,7 @@
 %define		_noautopear	pear
 
 # exclude optional php dependencies
-%define		_noautophp	php-sqlite php-mysql php-mysqli php-pgsql php-hash
+%define		_noautophp	php-sqlite php-mysql php-mysqli php-pgsql php-hash php-json php-xml
 
 # put it together for rpmbuild
 %define		_noautoreq	%{?_noautophp} %{?_noautopear}
@@ -151,6 +154,36 @@
 	mv $a ${a%.sh}
 done
 
+# php-pear-PEAR-core 1.9.0 (used indirectly)
+rm program/lib/PEAR.php
+rm program/lib/PEAR5.php
+
+# php-pear-Net_Socket 1.0.9 (used by password, managesieve plugins)
+rm program/lib/Net/Socket.php
+
+# php-pear-Net_SMTP 1.4.2 (nothing seem to use it)
+rm program/lib/Net/SMTP.php
+
+# php-pear-Auth_SASL 1.0.4 (used by managesieve)
+rm program/lib/Auth/SASL.php
+rm -r program/lib/Auth/SASL
+
+# php-pear-Mail_Mime 1.8.0 (nothing seems to use it)
+rm program/lib/Mail/mime.php
+rm program/lib/Mail/mimePart.php
+
+# php-pear-Net_Sieve 1.3.0
+rm plugins/managesieve/lib/Net/Sieve.php
+
+# now empty dirs
+rmdir program/lib/Auth
+rmdir program/lib/Mail
+rmdir program/lib/Net
+rmdir plugins/managesieve/lib/Net
+
+# unknown MDB2 version (newer than released 2.5.0b2, or modified by rc)
+#rm program/lib/MDB2.php
+
 mv config/db.inc.php.dist config/db.inc.php
 mv config/main.inc.php.dist config/main.inc.php
 %if %{with postfixadmin}
@@ -234,6 +267,8 @@
 %triggerpostun -- %{name} < %{version}
 %banner -e %{name} <<-EOF
 Run %{_appdir}/bin/update to update to version %{version}.
+(Be sure to have %{name}-setup installed when you run it)
+
 See %{_docdir}/%{name}-%{version}/UPGRADING* for more information.
 EOF
 
@@ -377,6 +412,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.100  2010/08/27 20:59:57  glen
+- use system pear pkgs, for libs unmodified
+- some deps are soft; rel 3
+
 Revision 1.99  2010/08/27 20:14:34  glen
 - update extension deps
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/roundcubemail/roundcubemail.spec?r1=1.99&r2=1.100&f=u