Some refinements to my experimental RPM builder script and spec

[wxWidgets.git] / wxPython / distrib / makerpm

diff --git a/wxPython/distrib/makerpm b/wxPython/distrib/makerpm
index cbd77a7bb06f4f56162b1e262a34d073339be74e..b7d5f80a951f293069bd6c84650057b413a799a5 100755 (executable)
--- a/wxPython/distrib/makerpm
+++ b/wxPython/distrib/makerpm
@@ -14,13 +14,13 @@ fi
 # Initialization
 
 distdir=`pwd`/dist
 # Initialization
 
 distdir=`pwd`/dist

-builddir=`pwd`/build_rpm
+builddir=`pwd`/_build_rpm

 rpmtop=${builddir}/rpmtop
 cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/home/wxcvs
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk
 rpmtop=${builddir}/rpmtop
 cvsroot=:pserver:anoncvs@cvs.wxwindows.org:/home/wxcvs
 pythonbin=/usr/bin/python
 port=GTK
 lcport=gtk

-tarname=wxPythonFull
+tarname=wxPythonSrc

 debug=0
 
 
 debug=0
 
 


@@ -54,6 +54,8 @@ version=$2
 pyver=$3
 shift;shift;shift
 
 pyver=$3
 shift;shift;shift
 

+tarver=${tarname}-${version}
+

 
 python=${pythonbin}${pyver}
 if [ ! -e ${python} ]; then
 
 python=${pythonbin}${pyver}
 if [ ! -e ${python} ]; then


@@ -71,6 +73,7 @@ function makespec {
        | sed s:@PORT@:${port}:g \
        | sed s:@LCPORT@:${lcport}:g \
        | sed s:@TARNAME@:${tarname}:g \
        | sed s:@PORT@:${port}:g \
        | sed s:@LCPORT@:${lcport}:g \
        | sed s:@TARNAME@:${tarname}:g \

+       | sed s:@VERSION@:${version}:g \

        > ${distdir}/wxPython${port}.spec
 }
 
        > ${distdir}/wxPython${port}.spec
 }
 


@@ -93,8 +96,6 @@ for flag in $*; do
 done
 
 
 done
 
 

-tarver=${tarname}-${version}
-

 #----------------------------------------------------------------------
 # Setup build dirs
 
 #----------------------------------------------------------------------
 # Setup build dirs
 


@@ -152,12 +153,11 @@ fi
 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------

-# Make the spec file and copy to ${builddir}/${tarver}
+# Make the spec file and copy to ${builddir}/${tarver} so it will be
+# in the tar file when it's built

 
 

-#if [ -z "${skiptar}" ]; then
-    makespec
-    cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec
-#fi
+makespec
+cp ${distdir}/wxPython${port}.spec ${builddir}/${tarver}/wxPython${port}.spec

 
 
 #----------------------------------------------------------------------
 
 
 #----------------------------------------------------------------------


@@ -190,6 +190,7 @@ if [ -z "${skiprpm}" ]; then
        echo "*** RPM failure, exiting."
        exit 1
     else
        echo "*** RPM failure, exiting."
        exit 1
     else

+       echo "*** Moving RPMs to ${distdir}"

        mv -f `find ${rpmtop} -name "wxPython*.rpm"` ${distdir}
     fi
 fi
        mv -f `find ${rpmtop} -name "wxPython*.rpm"` ${distdir}
     fi
 fi