[Erp5-report] r33926 lucas - /erp5/trunk/utils/rpmgen/templates/

[nobody at svn.erp5.org]

Author: lucas
Date: Fri Mar 19 18:11:30 2010
New Revision: 33926

URL: http://svn.erp5.org?rev=33926&view=rev
Log:
Fixed missing redirection. Added new requires exceptions which will be better handled after. libocbc.so is in REQUIRED list but it is not in PROVIDED list so it should be found in a external package.

Modified:
    erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in

Modified: erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in?rev=33926&r1=33925&r2=33926&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in [utf8] (original)
+++ erp5/trunk/utils/rpmgen/templates/erp5-official-buildout-mandriva2010.spec.in [utf8] Fri Mar 19 18:11:30 2010
@@ -5,7 +5,7 @@
 %define instancehome /var/lib/erp5
 %define erp5user erp5
 # We do not actually use /usr/local/bin/python
-%define _requires_exceptions /usr/local/bin/python
+%define _requires_exceptions \\(/usr/local/bin/python\\|/usr/bin/python2.4\\|libodbc.so\\)
 %define fullname %{name}-%{version}
 %define installdir /opt/erp5/%{version}
 %define __find_provides ${:find_provides}
@@ -19,6 +19,8 @@
 Vendor: Nexedi
 Packager: Nicolas Dumazet <nicolas.dumazet at nexedi.com>
 Group: Databases
+
+Requires: libodbc.so.1
 
 ${:dependencies}
 
@@ -46,7 +48,7 @@
 cd %{instancehome}
 svn co https://svn.erp5.org/repos/public/erp5/trunk/buildout/ .
 echo "[software_definition]" >> timmy-base.cfg
-echo "software_home = %{installdir}"
+echo "software_home = %{installdir}" >> timmy-base.cfg
 %{installdir}/bin/python2.4 bootstrap/bootstrap.py -c timmy-base.cfg
 bin/buildout -c timmy-base.cfg