diff --git a/roundcubemail-0.1.1-mysql.update.sql.patch b/roundcubemail-0.1.1-mysql.update.sql.patch new file mode 100644 index 0000000..e1039f7 --- /dev/null +++ b/roundcubemail-0.1.1-mysql.update.sql.patch @@ -0,0 +1,11 @@ +--- 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`, diff --git a/roundcubemail-0.1.1-pear.patch b/roundcubemail-0.1.1-pear.patch new file mode 100644 index 0000000..0c770e6 --- /dev/null +++ b/roundcubemail-0.1.1-pear.patch @@ -0,0 +1,11 @@ +--- 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 diff --git a/roundcubemail.spec b/roundcubemail.spec index f577bcf..afaa09c 100644 --- a/roundcubemail.spec +++ b/roundcubemail.spec @@ -1,7 +1,7 @@ %define roundcubedir %{_datadir}/roundcubemail Name: roundcubemail -Version: 0.1 -Release: 1%{?dist} +Version: 0.1.1 +Release: 3%{?dist} Summary: Round Cube Webmail is a browser-based multilingual IMAP client Group: Applications/System @@ -11,6 +11,8 @@ Source0: roundcubemail-%{version}-dep.tar.gz 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 @@ requires the MySQL database or the PostgreSQL database. The user 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 @@ rm -rf %{buildroot} 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 @@ rm -rf %{buildroot}%{roundcubedir}/{CHANGELOG,INSTALL,LICENSE,README,UPGRADING,S %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,16 @@ exit 0 %config(noreplace) %{_sysconfdir}/logrotate.d/roundcubemail %changelog +* Thu Apr 10 2008 Jon Ciesla = 0.1.1-3 +- Patch to fix PEAR path issue, drop symlinks. + +* Thu Apr 10 2008 Jon Ciesla = 0.1.1-2 +- Drop %%pre script that was breaking pear packages. + +* Wed Apr 09 2008 Jon Ciesla = 0.1.1-1 +- New upstream release. +- Added patch to fix mysql update. + * Tue Mar 18 2008 Jon Ciesla = 0.1-1 - Updgrade to 0.1 final, -dep. - Added new mimeDecode dep. diff --git a/sources b/sources index 9f50f15..698aed6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3b45d063b37ccd15de6b472e33f9bf5d roundcubemail-0.1-dep.tar.gz +658c88252b2a9cd74e1e556b2728324a roundcubemail-0.1.1-dep.tar.gz