rpms/roundcubemail/EL-4 roundcubemail-0.1.1-mysql.update.sql.patch, NONE, 1.1 roundcubemail-0.1.1-pear.patch, NONE, 1.1 roundcubemail.spec, 1.4, 1.5 sources, 1.4, 1.5

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/roundcubemail/EL-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16715/EL-4

Modified Files:
	roundcubemail.spec sources 
Added Files:
	roundcubemail-0.1.1-mysql.update.sql.patch 
	roundcubemail-0.1.1-pear.patch 
Log Message:
New upstream, PEAR fix.


roundcubemail-0.1.1-mysql.update.sql.patch:

--- NEW FILE roundcubemail-0.1.1-mysql.update.sql.patch ---
--- SQL/mysql.update.sql	2008-04-09 08:34:22.000000000 -0500
+++ SQL/mysql.update.sql	2008-04-09 08:34:22.000000000 -0500
@@ -5,7 +5,7 @@
 
 ALTER TABLE `messages`
   DROP INDEX `idx`,
-  DROP INDEX `uid`
+  DROP INDEX `uid`;
 
 ALTER TABLE `cache`
   DROP INDEX `cache_key`,

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/EL-4/roundcubemail.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- roundcubemail.spec	1 Apr 2008 18:34:44 -0000	1.4
+++ roundcubemail.spec	10 Apr 2008 17:32:24 -0000	1.5
@@ -1,7 +1,7 @@
 %define roundcubedir %{_datadir}/roundcubemail
 Name: roundcubemail
-Version:  0.1
-Release:  1%{?dist}
+Version:  0.1.1
+Release:  3%{?dist}.1
 Summary: Round Cube Webmail is a browser-based multilingual IMAP client
 
 Group: Applications/System         
@@ -11,6 +11,8 @@
 Source1: roundcubemail.conf
 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)
@@ -32,7 +34,10 @@
 interface is fully skinnable using XHTML and CSS 2.
 
 %prep
-%setup -q -n roundcubemail-0.1-dep
+%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
@@ -58,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
 
@@ -89,9 +94,6 @@
 %clean
 rm -rf %{buildroot}
 
-%pre
-rm -rf %{roundcubedir}/program/lib
-
 %post
 # replace default des string in config file for better security
 function makedesstr
@@ -123,6 +125,19 @@
 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail
 
 %changelog
+* Thu Apr 10 2008 Jon Ciesla <limb at jcomserv.net> = 0.1.1-3.fc7.1
+- Drop Requires for php-pear-Mail-mimDecode, not split in F-7.
+
+* 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.
+
+* Wed Apr 09 2008 Jon Ciesla <limb at jcomserv.net> = 0.1.1-1
+- New upstream release.
+- Added patch to fix mysql update.
+
 * Tue Mar 18 2008 Jon Ciesla <limb at jcomserv.net> = 0.1-1
 - Updgrade to 0.1 final, -dep.
 - Added new mimeDecode dep.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/roundcubemail/EL-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	1 Apr 2008 18:34:44 -0000	1.4
+++ sources	10 Apr 2008 17:32:24 -0000	1.5
@@ -1 +1 @@
-3b45d063b37ccd15de6b472e33f9bf5d  roundcubemail-0.1-dep.tar.gz
+658c88252b2a9cd74e1e556b2728324a  roundcubemail-0.1.1-dep.tar.gz