RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: j...@rpm5.org
Module: rpm Date: 25-Dec-2010 19:07:08
Branch: HEAD Handle: 2010122518070701
Modified files:
rpm CHANGES
rpm/scripts Makefile.am
rpm/tests Makefile.am
Log:
- distcheck: tests: move target from "check" to "test".
- distcheck: no globs, only explict lists, for EXTRA_DIST.
Summary:
Revision Changes Path
1.3518 +2 -0 rpm/CHANGES
1.76 +6 -3 rpm/scripts/Makefile.am
1.96 +32 -5 rpm/tests/Makefile.am
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.3517 -r1.3518 CHANGES
--- rpm/CHANGES 25 Dec 2010 18:01:37 -0000 1.3517
+++ rpm/CHANGES 25 Dec 2010 18:07:07 -0000 1.3518
@@ -1,4 +1,6 @@
5.3.7 -> 5.4a1:
+ - jbj: distcheck: tests: move target from "check" to "test".
+ - jbj: distcheck: no globs, only explict lists, for EXTRA_DIST.
- jbj: distcheck: make internal neon "opt-in", avoid GSS-API wrestling.
- jbj: verify: fix: NULL fnpyKey caused doubled parentdir/linkto check.
- jbj: rpmal: add common exit point to control flow.
@@ .
patch -p0 <<'@@ .'
Index: rpm/scripts/Makefile.am
============================================================================
$ cvs diff -u -r1.75 -r1.76 Makefile.am
--- rpm/scripts/Makefile.am 1 Dec 2010 16:02:41 -0000 1.75
+++ rpm/scripts/Makefile.am 25 Dec 2010 18:07:08 -0000 1.76
@@ -16,8 +16,10 @@
executabledeps.sh \
find-debuginfo.sh find-lang.sh find-prov.pl find-req.pl \
find-provides.ksyms find-requires.ksyms kmodtool \
- cpanflute cpanflute2 Specfile.pm find-provides.perl \
- find-requires.perl freshen.sh gendiff getpo.sh http.req \
+ cpanflute cpanflute2 Specfile.pm \
+ find-provides.perl find-requires.perl \
+ find-provides.php find-requires.php \
+ freshen.sh gendiff getpo.sh http.req \
check-java-closure.sh java.prov.sh java.req.sh \
javadeps.sh libtooldeps.sh \
mono-find-provides mono-find-requires \
@@ -36,7 +38,8 @@
xiu_stdenv \
yum_filelists_sqlite yum_other_sqlite yum_primary_sqlite \
yum_filelists_xml yum_other_xml yum_primary_xml \
- find-*.php find-php-* ${HELPERS}
+ find-php-provides find-php-requires \
+ ${HELPERS}
all:
@@ .
patch -p0 <<'@@ .'
Index: rpm/tests/Makefile.am
============================================================================
$ cvs diff -u -r1.95 -r1.96 Makefile.am
--- rpm/tests/Makefile.am 3 Dec 2010 18:23:19 -0000 1.95
+++ rpm/tests/Makefile.am 25 Dec 2010 18:07:08 -0000 1.96
@@ -2,10 +2,35 @@
AUTOMAKE_OPTIONS = 1.4 foreign
-# Note: *.src.rpm's cannot be added here because of suffix rules.
EXTRA_DIST = \
- genpgp.sh genssl.sh tpgp.c tssl.c ref/[^C]* ref/.alldigests \
- gpsee/*.js spew spew.conf
+ genpgp.sh \
+ genssl.sh \
+ gpsee/gffi.js \
+ ref/.alldigests \
+ ref/DB_CONFIG \
+ ref/edos.manifest \
+ ref/edos.qa.1 \
+ ref/edos.qa.2 \
+ ref/filelists.xml \
+ ref/hkp \
+ ref/manifest \
+ ref/other.xml \
+ ref/popt.Kv \
+ ref/popt.Kv-beecrypt \
+ ref/popt.Kv-nss \
+ ref/popt.Kv-ssl \
+ ref/popt.xml \
+ ref/popt.yaml \
+ ref/primary.xml \
+ ref/querytags \
+ ref/repomd.xml \
+ ref/rpmdb.sql \
+ ref/showrc \
+ ref/sqldb-basic.out \
+ ref/sqldb-basic.sql \
+ ref/version \
+ spew spew.conf \
+ tpgp.c tssl.c
EXTRA_PROGRAMS = tecdsa thkp tkey tpgp trsa tssl
@@ -592,7 +617,7 @@
@echo "`${now}` ==> $...@d}: Exporting ..." | tee -a $...@d}/export
for F in $</*.rpm; do \
echo "--> $$F"; \
- ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo}
${mongoserver}/$...@d}; \
+ ${rpm} -qp --nosignature --json $$F | tee -a $@ | ${mongo}
${mongoserver}/$...@d} > /dev/null; \
done
@echo "`${now}` <== $...@d}: Exported." | tee -a $...@d}/export
@@ -851,11 +876,13 @@
;; \
esac
-check-local: check-init check-pubkeys check-markup check-macros \
+test: check-init check-pubkeys check-markup check-macros \
check-build check-sign check-ACID check-install \
check-query check-verify check-rpmv3\
check-triggers check-convert # check-tools # check-repo
+check-local: check-init
+
clean-local:
rm -f genpgp.h genssl.h
$(sudo) rm -rf */ROOT tmp/repackage
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
