[Erp5-report] r35073 lucas - /erp5/trunk/buildout/Makefile

[nobody at svn.erp5.org]

Author: lucas
Date: Fri May  7 00:22:42 2010
New Revision: 35073

URL: http://svn.erp5.org?rev=35073&view=rev
Log:
Moved some part of the procedure to rpmgen Makefile.

Modified:
    erp5/trunk/buildout/Makefile

Modified: erp5/trunk/buildout/Makefile
URL: http://svn.erp5.org/erp5/trunk/buildout/Makefile?rev=35073&r1=35072&r2=35073&view=diff
==============================================================================
--- erp5/trunk/buildout/Makefile [utf8] (original)
+++ erp5/trunk/buildout/Makefile [utf8] Fri May  7 00:22:42 2010
@@ -40,24 +40,13 @@
 	sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_SOFTWARE_RELEASE),g" debian-tiolive-application/debian/changelog
 	cd debian-tiolive-application; sudo dpkg-buildpackage -b
 
-rpm-appliance:
+mandriva-rpm-appliance:
 	svn co https://svn.erp5.org/repos/public/erp5/trunk/utils/rpmgen rpmgen
-	# set the correct name erp5-5.4.6
-	sed -i "s,name = erp5-official-buildout,name = erp5-`cat VERSION.txt`,g" rpmgen/buildout.cfg
-	# set the correct version defined in the main buildout
-	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/buildout.cfg
-	# set the correct release
-	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/buildout.cfg
-	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/buildout.cfg
-	# it must use version defined in the main buildout
+	sed -i "s,name = erp5-official-buildout,name = erp5-`cat VERSION.txt`,g" rpmgen/profiles/mandriva.cfg
+	sed -i "s,\$${checkout:location\}\/VERSION.txt,$(PACKAGE_VERSION),g" rpmgen/profiles/mandriva.cfg
+	sed -i "/release \= 001/{x;/^$$/s//0/;y/012/123/;/2/{x;s/release = 001/release = $(PACKAGE_APPLICATION_RELEASE)/;x;};x;}" rpmgen/profiles/mandriva.cfg
+	sed -i 's,release = 001,release = $(PACKAGE_SOFTWARE_RELEASE),1' rpmgen/profiles/mandriva.cfg
 	sed -i "s,\$$(shell cat parts/checkout/VERSION.txt), `cat VERSION.txt`,g" rpmgen/Makefile
 	sudo helpers/mandriva2010.0.sh
-	# just make and wait...
-	cd rpmgen; make erp5-software
-	# now we have the erp5 software rpm and we need it installed to build tiolive application rpm
-	if test -d ~/rpmbuild/RPMS/x86_64; \
-	then find ~/rpmbuild/RPMS/x86_64/ -name  erp5-`cat VERSION.txt`*.rpm -print0 | xargs -0 sudo urpmi --auto ; \
-	else find ~/rpmbuild/RPMS/i586/ -name  erp5-`cat VERSION.txt`*.rpm -print0 | xargs -0 sudo urpmi --auto ; \
- 	fi
-	# building tiolive appliance
-	sudo rpmbuild -bb rpmgen/specs/tiolive-application-buildout-mandriva2010.spec
+	cd rpmgen; make mandriva
+