SPECS: sugarcrm.spec - use system PEAR packages - package log4php....

[glen]

Author: glen                         Date: Mon Feb  6 19:12:20 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use system PEAR packages
- package log4php.properties
- R: php curl module according to pdf doc

---- Files affected:
SPECS:
   sugarcrm.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: SPECS/sugarcrm.spec
diff -u SPECS/sugarcrm.spec:1.17 SPECS/sugarcrm.spec:1.18
--- SPECS/sugarcrm.spec:1.17	Mon Feb  6 19:51:07 2006
+++ SPECS/sugarcrm.spec	Mon Feb  6 20:12:12 2006
@@ -4,14 +4,13 @@
 # - add other (all?) languages
 # - language packs overwrite common files like jscalendar/calendar-setup_3.js,
 #   which contain locality specifics like first_day_of_week
-# - system PEAR packages
 # - language packs have different license. subpackage them? separate specs?
 %define		namesrc	SugarSuite
 Summary:	Customer Relationship Management
 Summary(pl):	Narzędzie CRM
 Name:		sugarcrm
 Version:	4.0.1
-Release:	0.3
+Release:	0.4
 License:	SugarCRM Public License
 Group:		Applications/WWW
 Source0:	http://www.sugarforge.org/frs/download.php/919/%{namesrc}-%{version}.zip
@@ -26,13 +25,17 @@
 # Source13-md5:	c1fd9063866e7e3be7fe5a4084e3c84e
 Patch0:		%{name}-mysqlroot.patch
 Patch1:		%{name}-smarty.patch
+Patch2:		%{name}-pear.patch
 URL:		http://www.sugarforge.org/
 BuildRequires:	rpmbuild(macros) >= 1.268
+Requires:	Smarty >= 2.6.10-4
 Requires:	php >= 3:4.3.0
 Requires:	php-mysql
+Requires:	php-pear-HTTP_WebDAV_Server
+#Requires:	php-pear-Mail_IMAP - doesn't seem to be used
 Requires:	php-xml
+Requires:	php-curl
 Requires:	webapps
-Requires:	Smarty >= 2.6.10-4
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -84,7 +87,9 @@
 # undos the sources
 find -regex '.*\.\(php\|inc\|html\|txt\|js\)$' -print0 | xargs -0 sed -i -e 's,\r$,,'
 
-rm -rf include/Smarty
+rm -r include/Smarty
+rm -r include/HTTP_WebDAV_Server
+rm -r include/Mail_IMAP
 %patch0 -p1
 %patch1 -p1
 
@@ -95,7 +100,7 @@
 
 cp -a */ $RPM_BUILD_ROOT%{_appdir}
 cp -a *.php *.html $RPM_BUILD_ROOT%{_appdir}
-cp -a robots.txt $RPM_BUILD_ROOT%{_appdir}
+cp -a robots.txt log4php.properties $RPM_BUILD_ROOT%{_appdir}
 
 cp -a LICENSE.txt $RPM_BUILD_ROOT%{_appdir}
 ln -sf %{_appdir}/LICENSE.txt LICENSE
@@ -170,9 +175,11 @@
 %{_appdir}/*.txt
 %{_appdir}/*.html
 %{_appdir}/*.php
+%{_appdir}/log4php.properties
 %exclude %{_appdir}/install
 %exclude %{_appdir}/install.php
 
+# must be writable: cache, custom, data, modules, config.php
 %defattr(644,root,http,775)
 %{_appdir}/cache
 %{_appdir}/custom
@@ -191,6 +198,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2006/02/06 19:12:12  glen
+- use system PEAR packages
+- package log4php.properties
+- R: php curl module according to pdf doc
+
 Revision 1.17  2006/02/06 18:51:07  glen
 - PHP 4.3.0 for HTTP_WebDAV_Server
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/sugarcrm.spec?r1=1.17&r2=1.18&f=u