Re: [libvirt] [PATCH 1/2] Update MinGW specfile

-- Richard Jones, Emerging Technologies, Red Hat http://et.redhat.com/~rjones Read my OCaml programming blog: http://camltastic.blogspot.com/ Fedora now supports 68 OCaml packages (the OPEN alternative to F#) http://cocan.org/getting_started_with_ocaml_on_red_hat_and_fedora

Index: autobuild.sh =================================================================== RCS file: /data/cvs/libvirt/autobuild.sh,v retrieving revision 1.11 diff -u -r1.11 autobuild.sh --- autobuild.sh 5 Sep 2008 12:03:45 -0000 1.11 +++ autobuild.sh 8 Oct 2008 15:45:00 -0000 @@ -42,14 +42,14 @@ rm -f *.tar.gz make dist -if [ -f /usr/bin/rpmbuild ]; then - if [ -n "$AUTOBUILD_COUNTER" ]; then - EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" - else - NOW=`date +"%s"` - EXTRA_RELEASE=".$USER$NOW" - fi +if [ -n "$AUTOBUILD_COUNTER" ]; then + EXTRA_RELEASE=".auto$AUTOBUILD_COUNTER" +else + NOW=`date +"%s"` + EXTRA_RELEASE=".$USER$NOW" +fi +if [ -f /usr/bin/rpmbuild ]; then rpmbuild --nodeps \ --define "extra_release $EXTRA_RELEASE" \ --define "_sourcedir `pwd`" \ @@ -81,8 +81,10 @@ #set -o pipefail #make check 2>&1 | tee "$RESULTS" - rpmbuild --nodeps \ - --define "extra_release $EXTRA_RELEASE" \ - --define "_sourcedir `pwd`" \ - -ba --clean mingw-libvirt.spec + if [ -f /usr/bin/rpmbuild ]; then + rpmbuild --nodeps \ + --define "extra_release $EXTRA_RELEASE" \ + --define "_sourcedir `pwd`" \ + -ba --clean mingw32-libvirt.spec + fi fi

Index: .cvsignore =================================================================== RCS file: /data/cvs/libvirt/.cvsignore,v retrieving revision 1.11 diff -u -r1.11 .cvsignore --- .cvsignore 5 Sep 2008 12:03:45 -0000 1.11 +++ .cvsignore 8 Oct 2008 15:45:00 -0000 @@ -20,7 +20,7 @@ update.log libvirt.pc libvirt.spec -mingw-libvirt.spec +mingw32-libvirt.spec COPYING m4 ABOUT-NLS Index: Makefile.am =================================================================== RCS file: /data/cvs/libvirt/Makefile.am,v retrieving revision 1.29 diff -u -r1.29 Makefile.am --- Makefile.am 8 Sep 2008 14:32:18 -0000 1.29 +++ Makefile.am 8 Oct 2008 15:45:00 -0000 @@ -10,7 +10,7 @@ EXTRA_DIST = \ libvirt.spec libvirt.spec.in \ - mingw-libvirt.spec.in \ + mingw32-libvirt.spec.in \ libvirt.pc libvirt.pc.in \ $(man_MANS) autobuild.sh \ .x-sc_avoid_if_before_free \ Index: configure.in =================================================================== RCS file: /data/cvs/libvirt/configure.in,v retrieving revision 1.169 diff -u -r1.169 configure.in --- configure.in 23 Sep 2008 20:48:49 -0000 1.169 +++ configure.in 8 Oct 2008 15:45:00 -0000 @@ -1045,7 +1045,7 @@ docs/examples/python/Makefile \ gnulib/lib/Makefile \ gnulib/tests/Makefile \ - libvirt.pc libvirt.spec mingw-libvirt.spec \ + libvirt.pc libvirt.spec mingw32-libvirt.spec \ po/Makefile.in \ include/libvirt/Makefile include/libvirt/libvirt.h \ python/Makefile python/tests/Makefile \