RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Anders F. Björklund
Root: /v/rpm/cvs Email: afb@rpm5.org
Module: rpm Date: 28-Nov-2007 01:09:49
Branch: HEAD Handle: 2007112800094900
Added files:
rpm devtool-test.spec
Modified files:
rpm devtool.conf
Log:
also add rpmbuild and package to the standalone testdrive
Summary:
Revision Changes Path
2.1 +27 -0 rpm/devtool-test.spec
2.135 +9 -0 rpm/devtool.conf
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/devtool-test.spec
============================================================================
$ cvs diff -u -r0 -r2.1 devtool-test.spec
--- /dev/null 2007-11-28 01:01:00 +0100
+++ devtool-test.spec 2007-11-28 01:09:49 +0100
@@ -0,0 +1,27 @@
+Summary: devtool test
+Name: devtool-test
+Version: 1.0
+Release: 1
+License: Public Domain
+Group: Development/Tools
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildArch: noarch
+
+%description
+Trivial standalone test package
+
+%prep
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+
+%changelog
+
@@ .
patch -p0 <<'@@ .'
Index: rpm/devtool.conf
============================================================================
$ cvs diff -u -r2.134 -r2.135 devtool.conf
--- rpm/devtool.conf 23 Nov 2007 12:09:37 -0000 2.134
+++ rpm/devtool.conf 28 Nov 2007 00:09:49 -0000 2.135
@@ -850,6 +850,15 @@
$prefix/bin/rpm -vv -qi gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -e gpg-pubkey-2039b291-3dbaae72 || exit $?
$prefix/bin/rpm -vv -Va || exit $?
+ rpmtopdir="`$prefix/bin/rpm --macros=macros --eval %{_topdir}`" # override --macros to avoid ~/.rpmmacros
+ $prefix/bin/rpmbuild -vv --macros=macros -ba ${DEVTOOL_SRCDIR}/devtool-test.spec || exit $?
+ $prefix/bin/rpmbuild -vv --macros=macros --rebuild $rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm || exit $?
+ $prefix/bin/rpm -vv -qpil $rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
+ rm -f $rpmtopdir/SRPMS/devtool-test-1.0-1.src.rpm
+ $prefix/bin/rpm -vv -iv $rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm || exit $?
+ $prefix/bin/rpm -vv -qi devtool-test-1.0-1 || exit $?
+ $prefix/bin/rpm -vv -e devtool-test-1.0-1 || exit $?
+ rm -f $rpmtopdir/RPMS/noarch/devtool-test-1.0-1.noarch.rpm
) >/tmp/rpm.devtool.standalone.testdrive 2>&1
if [ $? -ne 0 ]; then
echo "devtool:standalone:testdrive:ERROR: trivial testsuite failed (trace follows):"
@@ .
Received on Wed Nov 28 01:09:49 2007