rpms/roundcubemail/devel roundcubemail-0.1.1-pear.patch, NONE, 1.1 roundcubemail.spec, 1.8, 1.9

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7202

Modified Files:
	roundcubemail.spec 
Added Files:
	roundcubemail-0.1.1-pear.patch 
Log Message:
> - Patch to fix PEAR path issue, drop symlinks.


roundcubemail-0.1.1-pear.patch:

--- NEW FILE roundcubemail-0.1.1-pear.patch ---
--- index.php~	2008-04-10 11:15:39.000000000 -0500
+++ index.php	2008-04-10 11:15:39.000000000 -0500
@@ -82,7 +82,7 @@
 require_once('include/rcube_imap.inc');
 require_once('include/bugs.inc');
 require_once('include/main.inc');
-require_once('PEAR.php');
+#require_once('PEAR.php');
 
 
 // set PEAR error handling


Index: roundcubemail.spec
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/devel/roundcubemail.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- roundcubemail.spec	10 Apr 2008 12:28:13 -0000	1.8
+++ roundcubemail.spec	10 Apr 2008 16:22:18 -0000	1.9
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
 Version:  0.1.1
-Release:  2%{?dist}
+Release:  3%{?dist}
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -12,6 +12,7 @@
 Source2: roundcubemail.logrotate
 Source4: roundcubemail-README.fedora
 Patch0: roundcubemail-0.1.1-mysql.update.sql.patch
+Patch1: roundcubemail-0.1.1-pear.patch
 
 BuildArch: noarch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root%(%{__id_u} -n)
@@ -36,6 +37,7 @@
 %setup -q -n roundcubemail-0.1.1-dep
 
 %patch0 -p0
+%patch1 -p0
 
 # fix permissions and remove any .htaccess files
 find . -type f -print | xargs chmod a-x
@@ -61,12 +63,12 @@
 install -d %{buildroot}%{roundcubedir}
 cp -pr * %{buildroot}%{roundcubedir}
 
-ln -s ../../../pear/PEAR.php %{buildroot}%{roundcubedir}/program/lib/PEAR.php
-ln -s ../../../pear/Auth %{buildroot}%{roundcubedir}/program/lib/Auth
-ln -s ../../../pear/DB %{buildroot}%{roundcubedir}/program/lib/DB
-ln -s ../../../pear/DB.php %{buildroot}%{roundcubedir}/program/lib/DB.php
-ln -s ../../../pear/Mail %{buildroot}%{roundcubedir}/program/lib/Mail
-ln -s ../../../pear/Net %{buildroot}%{roundcubedir}/program/lib/Net
+#ln -s ../../../pear/PEAR.php %{buildroot}%{roundcubedir}/program/lib/PEAR.php
+#ln -s ../../../pear/Auth %{buildroot}%{roundcubedir}/program/lib/Auth
+#ln -s ../../../pear/DB %{buildroot}%{roundcubedir}/program/lib/DB
+#ln -s ../../../pear/DB.php %{buildroot}%{roundcubedir}/program/lib/DB.php
+#ln -s ../../../pear/Mail %{buildroot}%{roundcubedir}/program/lib/Mail
+#ln -s ../../../pear/Net %{buildroot}%{roundcubedir}/program/lib/Net
 
 rm -rf %{buildroot}%{roundcubedir}/installer
 
@@ -123,6 +125,9 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Apr 10 2008 Jon Ciesla <limb at jcomserv.net> = 0.1.1-3
+- Patch to fix PEAR path issue, drop symlinks.
+
 * Thu Apr 10 2008 Jon Ciesla <limb at jcomserv.net> = 0.1.1-2
 - Drop %%pre script that was breaking pear packages.