[Erp5-report] r43391 rafael - in /erp5/trunk/utils/rpmgen: ./ specs/ specs/erp5-official-bu...

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Feb 16 22:39:18 2011
New Revision: 43391

URL: http://svn.erp5.org?rev=43391&view=rev
Log:
Use custom parameters with erp5apptest212 to preserve previous places.

Modified:
    erp5/trunk/utils/rpmgen/Makefile
    erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/debian/rules
    erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec
    erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec

Modified: erp5/trunk/utils/rpmgen/Makefile
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/Makefile?rev=43391&r1=43390&r2=43391&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/Makefile [utf8] (original)
+++ erp5/trunk/utils/rpmgen/Makefile [utf8] Wed Feb 16 22:39:18 2011
@@ -1,5 +1,6 @@
 VERSION=trunk
 DEST=/opt/erp5/${VERSION}
+INST=/var/lib/erp5/
 
 debian: 
 	cd specs/erp5-official-buildout-trunk-deb/; sudo dpkg-buildpackage -b
@@ -13,7 +14,7 @@ clean:
 build:
 	sudo mkdir -p ${DEST}
 	sudo chmod a+rwx ${DEST}
-	erp5apptest212 -v -s -u -o -l $(DEST)/run.log $(DEST)
+	erp5apptest212 -v -s -u -o -l ./run.log --sofware_path=$(DEST) --instance_path=$(INST) .
 
 prepare:
 	sudo easy_install erp5.appliance.test

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/debian/rules
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/debian/rules?rev=43391&r1=43390&r2=43391&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/debian/rules [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk-deb/debian/rules [utf8] Wed Feb 16 22:39:18 2011
@@ -9,7 +9,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-INSTALL_PATH=/opt/erp5/trunk/software
+INSTALL_PATH=/opt/erp5/trunk
 
 configure:
 # We have nothing to do.

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec?rev=43391&r1=43390&r2=43391&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-buildout-trunk.spec [utf8] Wed Feb 16 22:39:18 2011
@@ -1,7 +1,7 @@
 %define version trunk
 %define name erp5-official-buildout
 %define release r41268
-%define installdir /opt/erp5/%{version}/software
+%define installdir /opt/erp5/%{version}
 
 Name: %{name}
 Version: %{version}
@@ -10,7 +10,7 @@ Summary: Open Source ERP Solution
 URL: http://www.erp5.org
 License: GPL
 Vendor: Nexedi
-Packager: Lucas Carvalho <lucas at nexedi.com>
+Packager: Nexedi SA <info at nexedi.com>
 Group: Databases
 AutoReqProv:0
 Provides: erp5

Modified: erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec
URL: http://svn.erp5.org/erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec?rev=43391&r1=43390&r2=43391&view=diff
==============================================================================
--- erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec [utf8] (original)
+++ erp5/trunk/utils/rpmgen/specs/erp5-official-instance-trunk.spec [utf8] Wed Feb 16 22:39:18 2011
@@ -2,7 +2,7 @@
 %define name erp5-official-instance
 %define release r41268
 %define erp5user erp5
-%define installdir /opt/erp5/%{version}/instance
+%define installdir /var/lib/erp5
 
 Name: %{name}
 Version: %{version}