Add hooks for building a native rpm on ubuntu - we will then use

the "alien" program to convert this into a .deb package
refs #1253

Code/Mantid/SConstruct

@@ -108,23 +108,15 @@ if os.name == 'nt':
 
 else:
 
-	if not rpmBuild:
-		print "* COMMENCING LINUX BUILD *"
-		f=open('Build/Scons_Linux.conf', 'r')
-		for ln in f:
-			boost_path=MantidBuild.procHeaderPath(ln,'BOOST_ROOT',boost_path)
-			poco_path=MantidBuild.procHeaderPath(ln,'POCO_ROOT',poco_path)
-			python_path=MantidBuild.procHeaderPath(ln,'PYTHON_LIB',python_path)
-			boost_append=MantidBuild.procHeader(ln,'BOOST_APPEND',boost_append)
-			nexus_path=MantidBuild.procHeader(ln,'NEXUS_ROOT',nexus_path)
-		f.close()
-	else:
-		boost_path=''
-		poco_path=''
-		third_party=''
-		python_path = ''
-		boost_append = ''
-		nexus_path= ''
+	print "* COMMENCING LINUX BUILD *"
+	f=open('Build/Scons_Linux.conf', 'r')
+	for ln in f:
+		boost_path=MantidBuild.procHeaderPath(ln,'BOOST_ROOT',boost_path)
+		poco_path=MantidBuild.procHeaderPath(ln,'POCO_ROOT',poco_path)
+		python_path=MantidBuild.procHeaderPath(ln,'PYTHON_LIB',python_path)
+		boost_append=MantidBuild.procHeader(ln,'BOOST_APPEND',boost_append)
+		nexus_path=MantidBuild.procHeader(ln,'NEXUS_ROOT',nexus_path)
+	f.close()
 		
 	# Store boost append and nexus path to pass to dependent SConscripts
 	env['BOOST_APPEND'] = boost_append

Code/RPM_Kit/make_rpm.sh

-
 #!/bin/sh
 # 
 # @file make_rpm.sh RPM build script for Mantid
 # @author Freddie Akeroyd, STFC ISIS Facility
 # @date 30/03/2009
 #
-function usage { 
+usage() { 
 cat << EOF
 Build an rpm file for Mantid
 
@@ -97,5 +96,9 @@ cp -f Mantid.spec $topdir/SPECS
 rm -f Mantid.spec
 cd $topdir/SPECS
 echo "Building RPM file in $topdir/RPMS"
-rpmbuild -ba Mantid.spec
+if test -e /etc/debian_version; then
+    rpmbuild --nodeps -ba Mantid.spec
+else
+    rpmbuild -ba Mantid.spec
+fi
 echo "Building complete - check $topdir/RPMS"

Code/RPM_Kit/mantid.spec.template

@@ -3,6 +3,7 @@
 %define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
 %define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
 %define is_rhel %(test -e /etc/redhat-release && echo 1 || echo 0)
+%define is_debian %(test -e /etc/debian_version && echo 1 || echo 0)
 
 Name:		Mantid
 Summary:	Data Analysis For ISIS
@@ -109,11 +110,16 @@ for i in qtiplotrc.py qtiUtil.py mantidplotrc.py mantidplot.py; do
 done
 install -m755 Code/Mantid/PythonAPI/MantidFramework.py $RPM_BUILD_ROOT/%{mantidbindir}
 
+# on ubuntu sip goes into /usr/lib/pyshared etc
+# not sure why this is needed
+%if %{is_debian}
+%else
 install -m755 %{pythonsitepackages}/sip.so $RPM_BUILD_ROOT/%{mantidbindir}
 for i in %{pythonsitepackages}/PyQt4/*.so; do
     install -m755 $i $RPM_BUILD_ROOT/%{mantidbindir}/PyQt4/`basename $i`
 done
 install -m755 %{pythonsitepackages}/PyQt4/__init__.py $RPM_BUILD_ROOT/%{mantidbindir}/PyQt4/__init__.py
+%endif
 
 cp -r instrument/* $RPM_BUILD_ROOT/%{mantidinstrumentdir}
 cp -r Code/Mantid/PythonAPI/scripts/* $RPM_BUILD_ROOT/%{mantidscriptsdir}
@@ -148,6 +154,8 @@ if test `whoami` = root; then ldconfig; fi
 if test `whoami` = root; then ldconfig; fi
 
 %changelog
+* Thu May 13 2010 Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk> - 1.0.3
+- Configure Debian/Ubuntu builds via alien
 * Mon Apr 07 2010 Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk> - 1.0.2
 - Create PythonAlgorithms directory
 * Mon Mar 30 2009 Freddie Akeroyd <freddie.akeroyd@stfc.ac.uk> - 1.0.1