Changeset 12486 for packaging/centuryegg/build-libxml-rpm

Timestamp:

11/12/10 01:11:31 (18 months ago)

Author:

build

Message:

Get the architecture right in all cases. Specify nomd5 so we can use srpms from Fedora 11 and up. This allows us to build python-sqlalchemy and pytz from srpms

Files:

• packaging/centuryegg/build-libxml-rpm (modified) (2 diffs)

packaging/centuryegg/build-libxml-rpm

@@ -3 +3 @@
 LIBXML_MAJOR_VERSION=$(echo $LIBXML_VERSION | cut -d "-" -f 1)
 mkdir -p logs rpms srpms
-if [ -f rpms/libxml2-$LIBXML_VERSION.i386.rpm ]
+rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
+if [ -f rpms/libxml2-$LIBXML_VERSION.${rpm_arch}.rpm ]
 then
-    echo "Not building libxml2 as rpms/libxml2-$LIBXML_VERSION.i386.rpm already exists"
+    echo "Not building libxml2 as rpms/libxml2-$LIBXML_VERSION.${rpm_arch}.rpm already exists"
     exit
 fi
@@ -22 +23 @@
 cd srpms
 wget -c http://mirror.centos.org/centos/5/os/SRPMS/libxml2-$LIBXML_VERSION.src.rpm
-rpm -ivh libxml2-$LIBXML_MAJOR_VERSION*.src.rpm
+rpm -ivh --nomd5 libxml2-$LIBXML_MAJOR_VERSION*.src.rpm
 )
 # add to changelog
 src_rpm=`rpmbuild -bs --nodeps $HOME/rpmbuild/SPECS/libxml2.spec | sed 's/^Wrote: //'`
-rpm_arch=`rpmbuild -E %{_arch} 2>/dev/null`
 sudo cp -pv /etc/yum.conf{,.builddep.orig}
 sudo python -c "import ConfigParser ; cp = ConfigParser.RawConfigParser() ; cp.read('/etc/yum.conf') ; cp.set('main', 'assumeyes', '1') ; cp.write(open('/etc/yum.conf', 'w'))"