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:   13-Mar-2016 06:15:49
  Branch: rpm-5_4                          Handle: 2016031305154800

  Modified files:           (Branch: rpm-5_4)
    rpm/tests               Makefile.am
    rpm/tests/ref           showrc

  Log:
    - sanity.

  Summary:
    Revision    Changes     Path
    1.95.2.75   +82 -55     rpm/tests/Makefile.am
    1.37.2.11   +196 -120   rpm/tests/ref/showrc
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: rpm/tests/Makefile.am
  ============================================================================
  $ cvs diff -u -r1.95.2.74 -r1.95.2.75 Makefile.am
  --- rpm/tests/Makefile.am     1 May 2015 20:14:40 -0000       1.95.2.74
  +++ rpm/tests/Makefile.am     13 Mar 2016 05:15:48 -0000      1.95.2.75
  @@ -5,32 +5,33 @@
   AUTOMAKE_OPTIONS = 1.4 foreign
   
   EXTRA_DIST = \
  +     fib.js \
        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 \
  +     $(srcdir)/ref/.alldigests \
  +     $(srcdir)/ref/DB_CONFIG \
  +     $(srcdir)/ref/edos.manifest \
  +     $(srcdir)/ref/edos.qa.1 \
  +     $(srcdir)/ref/edos.qa.2 \
  +     $(srcdir)/ref/filelists.xml \
  +     $(srcdir)/ref/hkp \
  +     $(srcdir)/ref/manifest \
  +     $(srcdir)/ref/other.xml \
  +     $(srcdir)/ref/popt.Kv \
  +     $(srcdir)/ref/popt.Kv-beecrypt \
  +     $(srcdir)/ref/popt.Kv-nss \
  +     $(srcdir)/ref/popt.Kv-ssl \
  +     $(srcdir)/ref/popt.xml \
  +     $(srcdir)/ref/popt.yaml \
  +     $(srcdir)/ref/primary.xml \
  +     $(srcdir)/ref/querytags \
  +     $(srcdir)/ref/repomd.xml \
  +     $(srcdir)/ref/rpmdb.sql \
  +     $(srcdir)/ref/showrc \
  +     $(srcdir)/ref/sqldb-basic.out \
  +     $(srcdir)/ref/sqldb-basic.sql \
  +     $(srcdir)/ref/version \
        spew spew.conf \
        tpgp.c tssl.c
   
  @@ -40,7 +41,7 @@
   
   EXTRA_PROGRAMS += tecdsa thkp tpgp trsa tssl
   
  -SUBDIRS = . bson mongoc
  +SUBDIRS = . bson mongoc yajl
   
   AM_CPPFLAGS = \
        -I$(srcdir) \
  @@ -216,17 +217,18 @@
   .PHONY:      check-init
   check-init: macros
        @echo "=== $@ ==="
  +     @mkdir -p ref
        @rm -rf tmp/hrmib tmp/repackage
        @mkdir -p tmp/hrmib/ tmp/repackage/
        @${rpm} -v --version    > tmp/version
  -     @-diff -u tmp/version ref/version || cp tmp/version ref/version
  +     @-diff -u tmp/version $(srcdir)/ref/version || cp tmp/version 
ref/version
        @${rpm} -v --querytags  > tmp/querytags
  -     @-diff -u tmp/querytags ref/querytags || cp tmp/querytags ref/querytags
  +     @-diff -u tmp/querytags $(srcdir)/ref/querytags || cp tmp/querytags 
ref/querytags
        @${rpm} -v --showrc | ${sed} -e "s,$(abs_top_builddir),..,g" > 
tmp/showrc
  -     @-diff -u tmp/showrc ref/showrc || cp tmp/showrc ref/showrc
  -#    @${rpmdigest} --alldigests ref/[^C]* > tmp/.alldigests
  -#    @-diff -u tmp/.alldigests ref/.alldigests || cp tmp/.alldigests 
ref/.alldigests
  -     @-${mtree} -c -p ref | ${mtree} -p ref  # XXX mtime usecs need fixing
  +     @-diff -u tmp/showrc $(srcdir)/ref/showrc || cp tmp/showrc ref/showrc
  +#    @${rpmdigest} --alldigests $(srcdir)/ref/[^C]* > tmp/.alldigests
  +#    @-diff -u tmp/.alldigests $(srcdir)/ref/.alldigests || cp 
tmp/.alldigests ref/.alldigests
  +     @-${mtree} -c -p $(srcdir)/ref | ${mtree} -p $(srcdir)/ref      # XXX 
mtime usecs need fixing
   
   RPMURI =     http://rpm5.org/files/rpm/
   POPTURI =    http://rpm5.org/files/popt/
  @@ -242,17 +244,17 @@
        @echo "=== $@ ==="
        @${rm} -rf tmp/rpmdb
        @${mkdir} -p tmp/rpmdb/log tmp/rpmdb/tmp
  -     @${cp} ref/DB_CONFIG tmp/rpmdb
  +     @${cp} $(srcdir)/ref/DB_CONFIG tmp/rpmdb
        @${rpm} --import tmp/DSA.pubpem
        @${rpm} --import tmp/RSA.pubpem
        @[ -f tmp/ECDSA.pubpem ] && ${rpm} --import tmp/ECDSA.pubpem
        @${echo} -n "--> default: HKP"
        @${thkp} > tmp/hkp || :
  -     @diff -u tmp/hkp ref/hkp || cp tmp/hkp ref/hkp
  +     @diff -u tmp/hkp $(srcdir)/ref/hkp || cp tmp/hkp ref/hkp
        @${tpgp}
        @${echo} -n "--> beecrypt: HKP"
  -     @${thkp} --usecrypto bc > /dev/null || :
  -     @${tpgp} --usecrypto bc
  +     @-${thkp} --usecrypto bc > /dev/null || :
  +     @-${tpgp} --usecrypto bc
   #    @${echo} -n "--> cdsa: HKP"
   #    @-${thkp} --usecrypto cdsa > /dev/null || :
   #    @-${tpgp} --usecrypto cdsa
  @@ -270,7 +272,7 @@
        @-${tpgp} --usecrypto ssl
        @${rpm} --import $(top_srcdir)/pubkeys/JBJ-GPG-KEY
        @${rpm} -Kv $(POPTPKGS) > tmp/popt.Kv
  -     @diff -u tmp/popt.Kv ref/popt.Kv
  +     @diff -u tmp/popt.Kv $(srcdir)/ref/popt.Kv
        @-${rpm} -Kvv --usecrypto bc   $(POPTPKGS) > /dev/null 2>&1
   #    @-${rpm} -Kvv --usecrypto cdsa $(POPTPKGS) > /dev/null 2>&1
        @-${rpm} -Kvv --usecrypto gc   $(POPTPKGS) > /dev/null 2>&1
  @@ -311,9 +313,9 @@
   check-markup: $(POPTPKGS)
        @echo "=== $@ ==="
        @${rpm} -qp --qf '[%{*:yaml}\n]' popt*.rpm > tmp/popt.yaml
  -     @diff -u {tmp,ref}/popt.yaml
  +     @diff -u {tmp,$(srcdir)/ref}/popt.yaml
        @${rpm} -qp --qf '[%{*:xml}\n]' popt*.rpm > tmp/popt.xml
  -     @-diff -u {tmp,ref}/popt.xml
  +     @-diff -u {tmp,$(srcdir)/ref}/popt.xml
   
   .PHONY: check-repo
   check-repo: $(POPTPKGS)
  @@ -325,11 +327,11 @@
        -${rpmrepo} --bzip2 .
        -${rpmrepo} --xz .
        ${rpmrepo} --uncompressed .
  -     @-diff -u repodata/primary.xml ref/primary.xml
  -     @-diff -u repodata/filelists.xml ref/filelists.xml
  -     @-diff -u repodata/other.xml ref/other.xml
  +     @-diff -u repodata/primary.xml $(srcdir)/ref/primary.xml
  +     @-diff -u repodata/filelists.xml $(srcdir)/ref/filelists.xml
  +     @-diff -u repodata/other.xml $(srcdir)/ref/other.xml
   # XXX repomd.xml always differs because st->st_ctime is used.
  -     @-diff -u repodata/repomd.xml ref/repomd.xml > /dev/null 2>&1
  +     @-diff -u repodata/repomd.xml $(srcdir)/ref/repomd.xml > /dev/null 2>&1
   
   .PHONY:      check-macros
   check-macros:
  @@ -384,10 +386,10 @@
   check-build: $(BUILD_DIRS)
        @echo "=== $@ ==="
        @ls -1 */*.rpm | grep -v '^dir2symlink' | grep -v '^sql-test' > 
tmp/manifest
  -     @diff -u {tmp,ref}/manifest || ${cp} {tmp,ref}/manifest
  +     @diff -u {tmp,$(srcdir)/ref}/manifest || ${cp} {tmp,ref}/manifest
        @rm -rf tmp/cachedb
        @${mkdir} -p tmp/cachedb/log tmp/cachedb/tmp
  -     @${cp} ref/DB_CONFIG tmp/cachedb
  +     @${cp} $(srcdir)/ref/DB_CONFIG tmp/cachedb
        @${rpmsolver} --import tmp/DSA.pubpem
        @${rpmsolver} --import tmp/RSA.pubpem
        @[ -f tmp/ECDSA.pubpem ] && ${rpmsolver} --import tmp/ECDSA.pubpem
  @@ -398,26 +400,26 @@
        @${rpm} -U -- edos-test/glass-1-*
        @${rpm} -U -- +car +turbo 
edos-test/{engine-1-*,wheel-2-*,door-1-*,window-0-*}
        @${rpm} -qaT | grep -v gpg-pubkey > tmp/edos.qa.1
  -     @diff -u {tmp,ref}/edos.qa.1 || ${cp} {tmp,ref}/edos.qa.1
  +     @diff -u {tmp,$(srcdir)/ref}/edos.qa.1 || ${cp} {tmp,ref}/edos.qa.1
        @${rpm} -U -- edos-test/engine-2-* -turbo
        @${rpm} -U -- edos-test/{wheel-3,tyre-1}-*
        @${rpm} -F -- edos-test/{door-2,window-1,glass-2}-*
        @${rpm} -qaT | grep -v gpg-pubkey > tmp/edos.qa.2
  -     @diff -u {tmp,ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2
  +     @diff -u {tmp,$(srcdir)/ref}/edos.qa.2 || ${cp} {tmp,ref}/edos.qa.2
        @-${rpm} -e `${rpm} -qa | grep -v gpg-pubkey`
   
   check-depsolver:
        @echo "=== $@ ==="
        @rm -rf tmp/solveA
        @${mkdir} -p tmp/solveA/log tmp/solveA/tmp
  -     @${cp} ref/DB_CONFIG tmp/solveA
  +     @${cp} $(srcdir)/ref/DB_CONFIG tmp/solveA
        @${rpmsolverA} --import tmp/DSA.pubpem
        @${rpmsolverA} --import tmp/RSA.pubpem
        @[ -f tmp/ECDSA.pubpem ] && ${rpmsolverA} --import tmp/ECDSA.pubpem
        @${rpmsolverA} -i --justdb --nodeps edos-test/turbo-1* 
edos-test/wheel-2* edos-test/door-1*
        @rm -rf tmp/solveB
        @${mkdir} -p tmp/solveB/log tmp/solveB/tmp
  -     @${cp} ref/DB_CONFIG tmp/solveB
  +     @${cp} $(srcdir)/ref/DB_CONFIG tmp/solveB
        @${rpmsolverB} --import tmp/DSA.pubpem
        @${rpmsolverB} --import tmp/RSA.pubpem
        @[ -f tmp/ECDSA.pubpem ] && ${rpmsolverB} --import tmp/ECDSA.pubpem
  @@ -449,7 +451,7 @@
        @echo "=== $@ ==="
        @${db_upgrade} Packages > /dev/null 2>&1
        @${db_checkpoint} -1    > /dev/null 2>&1
  -     @${rpm} -U ref/edos.manifest
  +     @${rpm} -U $(srcdir)/ref/edos.manifest
        @${db_dump} Packages | ${db_load} Packages-NEW
        @${db_verify} Packages-NEW > /dev/null 2>&1
        @rm $(rpmdb)/Packages-NEW
  @@ -470,8 +472,8 @@
   
   check-install:
        @echo "=== $@ ==="
  -     ${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps 
devtool-sanity/*.rpm
  -     ${rpm} -U probes-test/probes-2*.rpm
  +     @${rpm} -U --relocate /tmp/=$(testdir)/tmp/root/ --nodeps 
devtool-sanity/*.rpm
  +     @${rpm} -U probes-test/probes-2*.rpm
   
   # AL -- AsianLinux
   # XXX notyet
  @@ -743,7 +745,7 @@
        @rm -f ${@D}/import
        @echo "`${now}` ==> ${@D}: Creating ..." | tee -a ${@D}/import
        @mkdir -p $@/log $@/tmp
  -     @${cp} $(testdir)/ref/DB_CONFIG $@
  +     @${cp} $(srcdir)/ref/DB_CONFIG $@
        @echo "`${now}` <== ${@D}: Created." | tee -a ${@D}/import
        @echo "`${now}` ==> ${@D}: Importing ..." | tee -a ${@D}/import
        @-${rpm} -i -D '_dbpath ${@D}/solve' --justdb --stats \
  @@ -786,7 +788,7 @@
        @${sudo} rm -rf $(<D)/ROOT
        @cat -n $(<D)/todo | sort -R | cut -f2- > $(<D)/todo.random
        @mkdir -p $(<D)/ROOT/var/lib/rpm/log $(<D)/ROOT/var/lib/rpm/tmp
  -     @${cp} $(testdir)/ref/DB_CONFIG $(<D)/ROOT/var/lib/rpm
  +     @${cp} $(srcdir)/ref/DB_CONFIG $(<D)/ROOT/var/lib/rpm
        @-mkdir -p $(<D)/ROOT/proc && sudo mount -o bind /proc $(<D)/ROOT/proc
   #    @-mkdir -p $(<D)/ROOT/sys  && ${sudo} mount -o bind /sys $(<D)/ROOT/sys 
   #    @-mkdir -p $(<D)/ROOT/dev/pts
  @@ -830,7 +832,7 @@
          [ -d $(<D)/VROOT/tmp/.private ] && ${sudo} $(chattr) -a 
$(<D)/VROOT/tmp/.private ; \
          ${sudo} rm -rf $(<D)/VROOT; \
          mkdir -p $(<D)/VROOT/var/lib/rpm/log $(<D)/VROOT/var/lib/rpm/tmp; \
  -       ${cp} $(testdir)/ref/DB_CONFIG $(<D)/VROOT/var/lib/rpm; \
  +       ${cp} $(srcdir)/ref/DB_CONFIG $(<D)/VROOT/var/lib/rpm; \
          echo "-----> " $$F; \
          ${sudo} ${rpm} -Uv --nofdigests --stats \
            -r $(testdir)/$(<D)/VROOT \
  @@ -1119,7 +1121,7 @@
        @rm -f tmp/mongoc.out
        @make -C mongoc check >> tmp/mongoc.out 2>&1 || :
   
  -tgfs =       ${abs_top_builddir}/rpmio//tgfs
  +tgfs =       ${abs_top_builddir}/rpmio/tgfs
   gfsfn =      /tmp/gfsfn
   bsondump = /usr/bin/bsondump
   check-gfs: check-bson check-mongoc
  @@ -1148,6 +1150,11 @@
        @echo "--> list"
        @${tgfs} list           >> tmp/gfs.out 2>&1
   
  +duk =        ${abs_top_builddir}/rpmio/duk
  +check-duk:
  +     @echo "=== $@ ==="
  +     @${duk} fib.js
  +
   check-js:
        @echo "=== $@ ==="
        -../libtool --mode=execute vg ${rpm} -E '%{js:print("yadda-yadda")}'
  @@ -1173,6 +1180,25 @@
        -mkdir -p tmp/cp && ${cp} --rpmiodebug --davdebug -R $(FIOURI) tmp/cp
        -diff -ru tmp/{wget,cp}
   
  +ostamp:
  +     @echo "=== $@ ==="
  +     ${rpm} -E "%{ostamp_publish $$(date --rfc-3339=ns | sha256sum | cut -f1 
-d\ )}"
  +
  +P =  popt/popt-1.14-1.x86_64.rpm
  +foo:
  +     @echo "=== $@ ==="
  +     $(rpm) -qp --qf '%10{name}\n' $(P)
  +     $(rpm) -qp --qf '%-2.2{name}\n' $(P)
  +     $(rpm) -qp --qf '%10.2{name}\n' $(P)
  +     $(rpm) -qp --qf '%-0.10{#name}\n' $(P)
  +     $(rpm) -qp --qf '%-0.20={name}\n' $(P)
  +     $(rpm) -qp --qf '[%10{name}\t%{dirnames}\n]' $(P)
  +     $(rpm) -qp --qf '%|name?{%{name}\n}:{}|' $(P)
  +     $(rpm) -qp --qf '%{#dirnames}\n' $(P)
  +     $(rpm) -qp --qf '%|dirnames?{TRUE}:{FALSE}|\n' $(P)
  +     $(rpm) -qp --qf '%|dirnames?{TRUE}:{FALSE}|\n' $(P)
  +     $(rpm) -qp --qf '%|dirnames=/lib/?{TRUE}:{FALSE}|\n' $(P)
  +
   test:        check-init \
        check-pubkeys \
        check-markup \
  @@ -1190,7 +1216,8 @@
        check-dir2symlink \
        check-lua \
        check-git \
  -     check-gfs
  +     check-duk
  +#    check-gfs
   #    check-convert
   #    check-repo
   
  @@ .
  patch -p0 <<'@@ .'
  Index: rpm/tests/ref/showrc
  ============================================================================
  $ cvs diff -u -r1.37.2.10 -r1.37.2.11 showrc
  --- rpm/tests/ref/showrc      8 May 2012 04:14:41 -0000       1.37.2.10
  +++ rpm/tests/ref/showrc      13 Mar 2016 05:15:48 -0000      1.37.2.11
  @@ -5,20 +5,27 @@
   compatible build os's : linux
   install arch          : x86_64
   install os            : Linux
  -compatible archs      : x86_64 amd64 ia32e pentium4 pentium3 pentium2 i686 
i586 i486 i386 fat noarch
  +compatible archs      :
   compatible os's       : Linux
   optflags              : -O2
   
   LUA MODULES:
  -luafiles              : 
/usr/lib/rpm/init.lua:/usr/lib/rpm/rpmlua:/usr/lib/rpm/x86_64-linux/rpmlua:/etc/rpm/rpmlua.*:/etc/rpm/rpmlua:/etc/rpm/x86_64-linux/rpmlua:~/.rpmlua
  -luapath               : /usr/lib/rpm/lua/?.lua
  +luafiles              : 
/usr/lib/rpm-5.4.16/init.lua:/usr/lib/rpm-5.4.16/rpmlua:/usr/lib/rpm-5.4.16/x86_64-linux/rpmlua:/etc/rpm/5.4.16/rpmlua.*:/etc/rpm/5.4.16/rpmlua:/etc/rpm/5.4.16/x86_64-linux/rpmlua:~/.rpmlua-5.4.16
  +LUA_PATH              : 
/usr/local/share/lua//?.lua;/usr/local/share/lua//?/init.lua;/usr/local/lib/lua//?.lua;/usr/local/lib/lua//?/init.lua;./?.lua/usr/local/share/lua/5.3/?.lua;/usr/local/share/lua/5.3/?/init.lua;/usr/local/lib/lua/5.3/?.lua;/usr/local/lib/lua/5.3/?/init.lua;./?.lua;./?/init.lua
  +LUA_CPATH             : 
/usr/local/lib/lua//?.so;/usr/local/lib/lua//loadall.so;./?.so/usr/local/lib/lua/5.3/?.so;/usr/local/lib/lua/5.3/loadall.so;./?.so
   
   MACRO DEFINITIONS:
   macrofiles            : ../macros/macros:../tests/macros
   Features provided by rpmlib installer:
       rpmlib(BuiltinAugeasScripts) = 5.3-1
  +    rpmlib(BuiltinJVMBeanShell) = 5.4.15-1
       rpmlib(BuiltinLuaScripts) = 4.2.2-1
  +    rpmlib(BuiltinMRubyScripts) = 5.4.15-1
  +    rpmlib(BuiltinPerlScripts) = 5.2-1
  +    rpmlib(BuiltinPythonScripts) = 5.2-1
  +    rpmlib(BuiltinRubyScripts) = 5.2-1
       rpmlib(BuiltinSqlScripts) = 5.3-1
  +    rpmlib(BuiltinSquirrelScripts) = 5.2-1
       rpmlib(BuiltinTclScripts) = 5.2-1
       rpmlib(CompressedFileNames) = 3.0.4-1
       rpmlib(ConcurrentAccess) = 4.1-1
  @@ -37,59 +44,71 @@
       rpmlib(SetVersions) = 4.0.4-alt98
       rpmlib(VersionedDependencies) = 3.0.3-1
   
  -Features provided by current cpuinfo (from libcpuinfo):
  -    cpuinfo(64bit)
  -    cpuinfo([x86])
  -    cpuinfo(ac)
  +Features provided by current cpuinfo (from /proc/cpuinfo):
       cpuinfo(acpi)
  +    cpuinfo(aperfmperf)
       cpuinfo(apic)
  +    cpuinfo(arch_perfmon)
  +    cpuinfo(bogomips) = 4999.74
  +    cpuinfo(bts)
  +    cpuinfo(cache_size) = 6144_KB
       cpuinfo(clflush)
  +    cpuinfo(clflush_size) = 64
       cpuinfo(cmov)
  -    cpuinfo(cpu_MHz) = 2500
  -    cpuinfo(cpu_cores) = 4
  -    cpuinfo(cpu_threads) = 1
  -    cpuinfo(cpuid)
  +    cpuinfo(constant_tsc)
  +    cpuinfo(cpu_MHz) = 750.000
  +    cpuinfo(cpu_family) = 6
       cpuinfo(cx16)
       cpuinfo(cx8)
       cpuinfo(dca)
       cpuinfo(de)
  -    cpuinfo(ds)
       cpuinfo(ds_cpl)
       cpuinfo(dtes64)
  -    cpuinfo(eist)
  -    cpuinfo(endian) = little
  +    cpuinfo(dtherm)
  +    cpuinfo(dts)
  +    cpuinfo(est)
  +    cpuinfo(flexpriority)
       cpuinfo(fpu)
  +    cpuinfo(fpu_exception)
       cpuinfo(fxsr)
  -    cpuinfo(htt)
  +    cpuinfo(ht)
       cpuinfo(lahf_lm)
       cpuinfo(lm)
       cpuinfo(mca)
       cpuinfo(mce)
       cpuinfo(mmx)
  +    cpuinfo(model) = 23
       cpuinfo(monitor)
       cpuinfo(msr)
       cpuinfo(mtrr)
  +    cpuinfo(nopl)
       cpuinfo(nx)
       cpuinfo(pae)
       cpuinfo(pat)
       cpuinfo(pbe)
       cpuinfo(pdcm)
  +    cpuinfo(pebs)
       cpuinfo(pge)
  +    cpuinfo(pni)
       cpuinfo(pse)
       cpuinfo(pse36)
  +    cpuinfo(rep_good)
       cpuinfo(sep)
  -    cpuinfo(simd)
       cpuinfo(ss)
       cpuinfo(sse)
       cpuinfo(sse2)
  -    cpuinfo(sse3)
  -    cpuinfo(sse4.1)
  +    cpuinfo(sse4_1)
       cpuinfo(ssse3)
  +    cpuinfo(stepping) = 6
  +    cpuinfo(syscall)
       cpuinfo(tm)
       cpuinfo(tm2)
  +    cpuinfo(tpr_shadow)
       cpuinfo(tsc)
       cpuinfo(vme)
       cpuinfo(vmx)
  +    cpuinfo(vnmi)
  +    cpuinfo(wp)
       cpuinfo(xtpr)
   
   ========================
  @@ -140,6 +159,7 @@
     %{-C:cd "${_mydir}"; unset _mydir}
   -14: NVR     %{name}-%{version}-%{release}
   -14: NVRA    %{name}-%{version}-%{release}.%{_target_cpu}
  +-14: __7zip  /usr/bin/7za
   -14: ___NVRA 
%%{NAME}-%%{VERSION}-%%{RELEASE}%%|DISTTAG?{-%%{DISTTAG}%%|DISTEPOCH?{%%{DISTEPOCH}}|}|%%|ARCH?{.%%|SOURCERPM?{%%{ARCH}}:{src}|}:{}|
   -14: ___build_args   -e
   -14: ___build_cmd    %{?_sudo:%{_sudo} }%{?_remsh:%{_remsh} %{_remhost} 
}%{?_remsudo:%{_remsudo} }%{?_remchroot:%{_remchroot} %{_remroot} 
}%{___build_shell} %{___build_args}
  @@ -176,37 +196,37 @@
   -14: __autoheader    autoheader
   -14: __automake      automake
   -14: __awk   gawk
  --14: __bash  /bin/bash
  +-14: __bash  /usr/bin/bash
   -14: __bzip2 /usr/bin/bzip2
  --14: __cat   /bin/cat
  +-14: __cat   /usr/bin/cat
   -14: __cc    gcc
   -14: __chattr        /usr/bin/chattr
   -14: __check_files   %{_testdir}/../scripts/check-files %{buildroot}
  --14: __chgrp /bin/chgrp
  --14: __chmod /bin/chmod
  --14: __chown /bin/chown
  +-14: __chgrp /usr/bin/chgrp
  +-14: __chmod /usr/bin/chmod
  +-14: __chown /usr/bin/chown
   -14: __chroot        %{_usrlibrpmbin}/chroot
   -14: __cp    %{_usrlibrpmbin}/cp
  --14: __cpio  /bin/cpio
  +-14: __cpio  /usr/bin/cpio
   -14: __cpp   gcc -E
   -14: __curl  /usr/bin/curl
   -14: __cvs   /usr/bin/cvs
   -14: __cxx   g++
  --14: __db_archive    /usr/bin/db53_archive
  --14: __db_checkpoint /usr/bin/db53_checkpoint
  --14: __db_deadlock   /usr/bin/db53_deadlock
  --14: __db_dump       /usr/bin/db53_dump
  --14: __db_hotbackup  /usr/bin/db53_hotbackup
  --14: __db_load       /usr/bin/db53_load
  --14: __db_log_verify /usr/bin/db53_log_verify
  --14: __db_printlog   /usr/bin/db53_printlog
  --14: __db_recover    /usr/bin/db53_recover
  --14: __db_replicate  /usr/bin/db53_replicate
  --14: __db_sql_codegen        /usr/bin/db53_sql_codegen
  --14: __db_stat       /usr/bin/db53_stat
  --14: __db_tuner      /usr/bin/db53_tuner
  --14: __db_upgrade    /usr/bin/db53_upgrade
  --14: __db_verify     /usr/bin/db53_verify
  +-14: __db_archive    /usr/bin/db61_archive
  +-14: __db_checkpoint /usr/bin/db61_checkpoint
  +-14: __db_deadlock   /usr/bin/db61_deadlock
  +-14: __db_dump       /usr/bin/db61_dump
  +-14: __db_hotbackup  /usr/bin/db61_hotbackup
  +-14: __db_load       /usr/bin/db61_load
  +-14: __db_log_verify /usr/bin/db61_log_verify
  +-14: __db_printlog   /usr/bin/db61_printlog
  +-14: __db_recover    /usr/bin/db61_recover
  +-14: __db_replicate  /usr/bin/db61_replicate
  +-14: __db_sql_codegen        /usr/bin/db61_sql_codegen
  +-14: __db_stat       /usr/bin/db61_stat
  +-14: __db_tuner      /usr/bin/db61_tuner
  +-14: __db_upgrade    /usr/bin/db61_upgrade
  +-14: __db_verify     /usr/bin/db61_verify
   -14: __dbi_btconfig  
     btree              
     %{?__dbi_other}
  @@ -222,8 +242,8 @@
   -14: __dbi_sqlconfig %{?__dbi_perms} %{?__dbi_tmpdir}
   -14: __dbi_tmpdir    tmpdir=%{_dbpath}/tmp
   -14: __dbi_transient %{?__dbi_rebuild} temporary private
  --14: __dbi_txn       create %{?__nofsync:nofsync} lock log mpool txn 
auto_commit thread thread_count=64
  --14: __dbsql %{_bindir}/db53sql
  +-14: __dbi_txn       create %{?__nofsync:nofsync} lock log mpool txn 
multiversion auto_commit thread thread_count=64
  +-14: __dbsql /usr/bin/db61sql
   -14: __debug_install_post    
      %{_rpmhome}/find-debuginfo.sh 
%{?_missing_build_ids_terminate_build:--strict-build-id} 
%{?_find_debuginfo_opts} "%{_builddir}/%{?buildsubdir}"
   %{nil}
  @@ -235,30 +255,34 @@
   -14: __find  %{_usrlibrpmbin}/find
   -14: __find_provides %{_rpmhome}/find-provides
   -14: __find_requires %{_rpmhome}/find-requires
  +-14: __gfs_h localhost
  +-14: __gfs_p 27017
  +-14: __gfs_pw        jasnl
  +-14: __gfs_u luser
   -14: __git   /usr/bin/git
  --14: __gitdir        %{__varlibwdj}/git
   -14: __gpg   /usr/bin/gpg2
   -14: __gpg_check_password_cmd        %{__gpg} 
  -     gpg --batch --no-verbose --passphrase-fd 3 -u "%{_gpg_name}" -so -
  +    gpg --batch --no-verbose --passphrase-fd 3 --no-secmem-warning 
  +    --homedir %{_testdir}/tmp/.gnupg 
  +    -u %{_gpg_name} -so -
   -14: __gpg_sign_cmd  %{__gpg} 
       gpg --batch --no-verbose --no-armor --passphrase-fd 3 
--no-secmem-warning 
       --homedir %{_testdir}/tmp/.gnupg 
  -    -u "%{_gpg_name}" -sbo %{__signature_filename} %{__plaintext_filename}
  +    -u %{_gpg_name} -sbo %{__signature_filename} %{__plaintext_filename}
   -14: __grep  %{_usrlibrpmbin}/grep
   -14: __gsr   %{_bindir}/gsr
  --14: __gzip  /bin/gzip
  +-14: __gzip  /usr/bin/gzip
   -14: __hg    /usr/bin/hg
  --14: __id    /bin/id
  +-14: __id    /usr/bin/id
   -14: __install       /usr/bin/install
  --14: __install_info  /sbin/install-info
  --14: __l10ndir       %{__varlibwdj}/l10n
  +-14: __install_info  /usr/sbin/install-info
   -14: __ld    /usr/bin/ld
  --14: __ldconfig      /sbin/ldconfig
  +-14: __ldconfig      /usr/sbin/ldconfig
   -14: __libext        a
   -14: __libtool_provides      %{nil}
   -14: __libtool_requires      %{nil}
   -14: __libtoolize    libtoolize
  --14: __ln    /bin/ln
  +-14: __ln    /usr/bin/ln
   -14: __ln_s  ln -s
   -14: __lrzip /usr/bin/lrzip
   -14: __lsattr        /usr/bin/lsattr
  @@ -267,24 +291,18 @@
   -14: __lzma  /usr/bin/lzma
   -14: __lzop  /usr/bin/lzop
   -14: __make  /usr/bin/make
  --14: __mkdir /bin/mkdir
  --14: __mkdir_p       /bin/mkdir -p
  --14: __mongo %{_bindir}/mongo
  --14: __mongodb_collection    packages
  --14: __mongodb_database      cooker
  --14: __mongodb_host  tempest.mongohq.com
  --14: __mongodb_password      %{nil}
  --14: __mongodb_port  10017
  --14: __mongodb_user  luser
  +-14: __mkdir /usr/bin/mkdir
  +-14: __mkdir_p       /usr/bin/mkdir -p
  +-14: __mongo /usr/bin/mongo
   -14: __mtree %{_usrlibrpmbin}/mtree
  --14: __mv    /bin/mv
  +-14: __mv    /usr/bin/mv
   -14: __nm    /usr/bin/nm
   -14: __objcopy       /usr/bin/objcopy
   -14: __objdump       /usr/bin/objdump
   -14: __objext        o
   -14: __os_install_post       %{___build_post}
   -14: __patch /usr/bin/patch
  --14: __pax   %{_bindir}/pax
  +-14: __pax   /usr/bin/pax
   -14: __pgp   %{_bindir}/pgp
   -14: __pkgconfig_provides    %{nil}
   -14: __pkgconfig_requires    %{nil}
  @@ -292,12 +310,12 @@
   -14: __ranlib        ranlib
   -14: __rc    %{_usrlibrpmbin}/rc
   -14: __remsh %{__rsh}
  --14: __rm    /bin/rm
  --14: __rmdir /bin/rmdir
  --14: __rsh   %{_bindir}/rsh
  +-14: __rm    /usr/bin/rm
  +-14: __rmdir /usr/bin/rmdir
  +-14: __rsh   /usr/bin/rsh
   -14: __scriptlet_requires    %{nil}
  --14: __sed   /bin/sed
  --14: __sh    /bin/sh
  +-14: __sed   /usr/bin/sed
  +-14: __sh    /usr/bin/sh
   -14: __shlibext      so
   -14: __spec_build_args       %{___build_args}
   -14: __spec_build_body       %{___build_body}
  @@ -380,16 +398,13 @@
   -14: __spec_track_template   #!%{__spec_track_shell}
   %{__spec_track_pre}
   %{nil}
  --14: __sqldir        %{__varlibwdj}/sql
  --14: __sqlite3       %{_bindir}/sqlite3
  +-14: __sqlite3       /usr/bin/sqlite3
   -14: __ssh   /usr/bin/ssh
   -14: __strip /usr/bin/strip
   -14: __svn   /usr/bin/svn
  --14: __svndir        %{__varlibwdj}/svn
  --14: __tar   /bin/tar
  +-14: __tar   /usr/bin/tar
   -14: __unzip /usr/bin/unzip
  --14: __varcacherpm   %{_var}/cache/rpm
  --14: __varcachewdj   %{_var}/cache/wdj
  +-14: __varcacherpm   %{_var}/cache/rpm-5.4.16
   -14: __varlibwdj     %{_topdir}/tmp/wdj/
   -14: __vcheck        %{__perl} %{_rpmhome}/vcheck
   -14: __vsflags       0xf0000
  @@ -412,11 +427,12 @@
   -14: _build_binary_file_digest_algo  %{_build_file_digest_algo}
   -14: _build_cpu      %{_host_cpu}
   -14: _build_file_context_path        %{nil}
  --14: _build_file_digest_algo 1
  +-14: _build_file_digest_algo 189
   -14: _build_iconsize 2048
   -14: _build_name_fmt %%{ARCH}/%{___NVRA}.rpm
   -14: _build_os       %{_host_os}
  --14: _build_platform %{_build_cpu}-%{_build_vendor}-%{_build_os}%{?_gnu}
  +-14: _build_platform 
%{_build_cpu}-%{_build_vendor}-%{_build_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}
  +-14: _build_sign     ECDSA/SHA256
   -14: _build_source_file_digest_algo  %{_build_file_digest_algo}
   -14: _build_vendor   %{_host_vendor}
   -14: _builddir       %{_ntopdir}
  @@ -431,41 +447,41 @@
   -14: _dbi_btconfig   %{__dbi_btconfig}
   -14: _dbi_config     %{expand:%%{_dbi_config_%{_dbapi_used}}}
   -14: _dbi_config_3   %{_dbi_btconfig}
  --14: _dbi_config_3_Arch      %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Basenames %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Arch      %{_dbi_btconfig} %{?_bt_dupsort} pagesize=512
  +-14: _dbi_config_3_Basenames %{_dbi_btconfig} %{?_bt_dupsort} pagesize=16384
   -14: _dbi_config_3_Btree     btree %{?__dbi_perms} debug
  --14: _dbi_config_3_Conflictname      %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Conflictname      %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=512
   -14: _dbi_config_3_Conflictyamlentry %{_dbi_btconfig} %{?_bt_dupsort}
   -14: _dbi_config_3_Depcache  %{_dbi_btconfig} temporary private
  --14: _dbi_config_3_Dirnames  %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Dirnames  %{_dbi_btconfig} %{?_bt_dupsort} pagesize=1024
   -14: _dbi_config_3_Filedigests       %{_dbi_htconfig} %{?_h_dupsort}
  --14: _dbi_config_3_Filepaths %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Group     %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Filepaths %{_dbi_btconfig} %{?_bt_dupsort} pagesize=1024
  +-14: _dbi_config_3_Group     %{_dbi_btconfig} %{?_bt_dupsort} pagesize=32768
   -14: _dbi_config_3_Hash      hash  %{?__dbi_perms} debug
   -14: _dbi_config_3_Heap      heap %{?__dbi_perms} debug
  --14: _dbi_config_3_Installtid        %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Name      %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Nvra      %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Obsoletename      %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Installtid        %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=32768
  +-14: _dbi_config_3_Name      %{_dbi_btconfig} %{?_bt_dupsort} pagesize=1024
  +-14: _dbi_config_3_Nvra      %{_dbi_btconfig} %{?_bt_dupsort} pagesize=2048
  +-14: _dbi_config_3_Obsoletename      %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=8192
   -14: _dbi_config_3_Obsoleteyamlentry %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Os        %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Os        %{_dbi_btconfig} %{?_bt_dupsort} pagesize=512
   -14: _dbi_config_3_Packagecolor      %{_dbi_htconfig} %{?_h_dupsort}
  --14: _dbi_config_3_Packages  %{_dbi_btconfig}
  --14: _dbi_config_3_Providename       %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Packages  %{_dbi_btconfig} pagesize=65536
  +-14: _dbi_config_3_Providename       %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=8192
   -14: _dbi_config_3_Provideyamlentry  %{_dbi_btconfig} %{?_bt_dupsort}
   -14: _dbi_config_3_Pubkeys   %{_dbi_htconfig} %{?_h_dupsort}
   -14: _dbi_config_3_Queue     queue %{?__dbi_perms} debug
   -14: _dbi_config_3_Recno     recno %{?__dbi_perms} debug
  --14: _dbi_config_3_Release   %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Release   %{_dbi_btconfig} %{?_bt_dupsort} pagesize=8192
   -14: _dbi_config_3_Removetid %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Requirename       %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Requirename       %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=65536
   -14: _dbi_config_3_Requireyamlentry  %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Seqno     %{_dbi_btconfig} seq_id=0
  +-14: _dbi_config_3_Seqno     %{_dbi_btconfig} seq_id=0 pagesize=512
   -14: _dbi_config_3_Sha1header        %{_dbi_htconfig} %{?_h_dupsort}
   -14: _dbi_config_3_Sigmd5    %{_dbi_htconfig} %{?_h_dupsort}
  --14: _dbi_config_3_Sourcepkgid       %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Triggername       %{_dbi_btconfig} %{?_bt_dupsort}
  --14: _dbi_config_3_Version   %{_dbi_btconfig} %{?_bt_dupsort}
  +-14: _dbi_config_3_Sourcepkgid       %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=2048
  +-14: _dbi_config_3_Triggername       %{_dbi_btconfig} %{?_bt_dupsort} 
pagesize=512
  +-14: _dbi_config_3_Version   %{_dbi_btconfig} %{?_bt_dupsort} pagesize=2048
   -14: _dbi_config_4   %{_dbi_sqlconfig}
   -14: _dbi_config_4_Arch      %{_dbi_sqlconfig} %{?_bt_dupsort}
   -14: _dbi_config_4_Basenames %{_dbi_sqlconfig} %{?_bt_dupsort}
  @@ -483,7 +499,7 @@
   -14: _dbi_config_4_Obsoleteyamlentry %{_dbi_sqlconfig} %{?_bt_dupsort}
   -14: _dbi_config_4_Os        %{_dbi_sqlconfig} %{?_bt_dupsort}
   -14: _dbi_config_4_Packagecolor      %{_dbi_sqlconfig} %{?_bt_dupsort}
  --14: _dbi_config_4_Packages  %{_dbi_sqlconfig}
  +-14: _dbi_config_4_Packages  %{_dbi_sqlconfig} debug
   -14: _dbi_config_4_Providename       %{_dbi_sqlconfig} %{?_bt_dupsort}
   -14: _dbi_config_4_Provideyamlentry  %{_dbi_sqlconfig} %{?_bt_dupsort}
   -14: _dbi_config_4_Pubkeys   %{_dbi_sqlconfig} %{?_bt_dupsort} debug
  @@ -536,16 +552,10 @@
   -14: _default_patch_flags    -s
   -14: _defaultdocdir  %{_usr}/doc
   -14: _dependency_whiteout    
  +     %{?_dependency_whiteout_OWL31}  
        %{?_dependency_whiteout_system} 
        %{nil}
  --14: _dependency_whiteout_caos_core  
  -     perl>perl-Filter                
  -     pam>coreutils                   
  -     pam>initscripts                 
  -     glibc-common>glibc              
  -     glibc>nscd                      
  -     filesystem>setup
  --14: _dependency_whiteout_idms       
  +-14: _dependency_whiteout_IDMS       
        cracklib>cracklib-dicts         
        perl>perl-Term-ReadKey          
        openssl>openssl-perl            
  @@ -554,21 +564,50 @@
        smart>idms-package-config-smart 
        iptables>iptables-ipv6          
        krb5-server>krb5-workstation
  +-14: _dependency_whiteout_OWL31      
  +     dhcp-server>coreutils           
  +     pciutils->zlib                  
  +     acct->info                      
  +     info->libtermcap                
  +     logrotate>popt                  
  +     vixie-cron>grep                 
  +     owl-startup>e2fsprogs           
  +     acct>sed                        
  +     acct>grep                       
  +     dhcp-server>dhcp                
  +     libtermcap>bash
  +-14: _dependency_whiteout_caos_core  
  +     perl>perl-Filter                
  +     pam>coreutils                   
  +     pam>initscripts                 
  +     glibc-common>glibc              
  +     glibc>nscd                      
  +     filesystem>setup
   -14: _disable_shell_interpreter_deps 0
   -14: _etcrpm %{_testdir}
   -14: _exec_prefix    %{_prefix}
   -14: _filter_GLIBC_PRIVATE   0
  +-14: _gfs_coll       fs
  +-14: _gfs_db gfs
  +-14: _gfs_host       
%{?_gfs_user:%{_gfs_user}@}%{__gfs_h}%{?__gfs_p::%{__gfs_p}}
  +-14: _gfs_opts       ?ssl=false
  +-14: _gfs_scheme     mongodb
  +-14: _gfs_uri        %{_gfs_scheme}://%{_gfs_host}/%{_gfs_db}
  +-14: _gfs_user       %{__gfs_u}%{?__gfs_pw::%{__gfs_pw}}
   -14: _gnu    -gnu
  +-14: _gpg_name       Ronald
  +-14: _gpg_path       %{_testdir}/tmp/.gnupg
   -14: _h_dupsort      h_dupsort primary=Packages
   -14: _helperpath     %{?_install_helpers:%{_install_helpers}:}
  --14: _hkp_keyserver  hkp://pool.sks-keyservers.net
  +-14: _hkp_keyserver  hkp://localhost
   -14: _hkp_keyserver_query    %{_hkp_keyserver}/pks/lookup?op=get&search=
   -14: _host   x86_64-unknown-linux-gnu
   -14: _host_alias     %{nil}
  --14: _host_cpu       x86_64
  --14: _host_os        linux-gnu
  --14: _host_platform  %{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_gnu}
  --14: _host_vendor    unknown
  +-14: _host_cpu       %{?_platform_cpu}%{!?_platform_cpu:%{_arch}}
  +-14: _host_gnu       %{?_platform_gnu}%{!?_platform_gnu:%{_gnu}}
  +-14: _host_os        %{?_platform_os}%{!?_platform_os:%{_os}}
  +-14: _host_platform  
%{_host_cpu}-%{_host_vendor}-%{_host_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}
  +-14: _host_vendor    %{?_platform_vendor}%{!?_platform_vendor:%{_vendor}}
   -14: _hrmib_path     %{_tmppath}/hrmib/%{___NVRA}
   -14: _icondir        %{_sourcedir}
   -14: _includedir     %{_prefix}/include
  @@ -579,8 +618,18 @@
   -14: _install_helpers        %{rpmhome}/helpers
   -14: _install_langs  all
   -14: _install_script_path    
%{_helperpath}/sbin:/bin:/usr/sbin:/usr/bin:/usr/X11R6/bin
  +-14: _jvm_options    
  +     -Xms2m          
  +     -Xmx128m        
  +     -Xcheck:jni     
  +     -verbose:class  
  +     -verbose:gc     
  +     -verbose:jni    
  +     vfprintf        
  +     exit            
  +     abort
   -14: _keyutils_keyring       session
  --14: _legion %{expand:%%global ._legion %{name}}%{_legion}
  +-14: _legion %{expand:%%global _legion %{name}}%{_legion}
   -14: _lib    lib
   -14: _libdir %{_exec_prefix}/%{_lib}
   -14: _libexecdir     %{_exec_prefix}/libexec
  @@ -590,9 +639,12 @@
   -14: _luaI_init      %{nil}
   -14: _mandir %{_datarootdir}/man
   -14: _missing_doc_files_terminate_build      1
  --14: _mongodb        
mongodb://%{__mongodb_user}:%{__mongodb_password}@%{__mongodb_host}:%{__mongodb_port}/%{__mongodb_database}
   -14: _multilibpatt   
(/%{_lib}|/usr/%{_lib}(|/gconv)|/usr/local/%{_lib}|/usr/X11R6/%{_lib}|/opt/%{_lib})/[^/]*\.([oa]|la|so[0-9.]*)$
  --14: _nssdb_path     /etc/pki/nssdb
  +-14: _nssdb_certprefix       rpm-
  +-14: _nssdb_flags    0
  +-14: _nssdb_keyprefix        rpm-
  +-14: _nssdb_path     /etc/pki/rpm
  +-14: _nssdb_secmodname       rpm-secmod.db
   -14: _ntopdir        %{_topdir}/%{_legion}
   -14: _oldincludedir  /usr/include
   -14: _os     linux
  @@ -604,7 +656,6 @@
   use RPM;
   %{nil}
   -14: _pgpbin %{__pgp}
  --14: _prefer_target_cpu      x86_64 i586
   -14: _prefix /usr
   -14: _pythonI_init   
   sys.path.insert(1,'../python/.libs')
  @@ -627,13 +678,13 @@
   -14: _rpmds_ldconfig_cmd     /sbin/ldconfig -p
   -14: _rpmds_perldeps_cmd     %{__find} %{_libdir}/perl5 | 
%{_rpmhome}/perl.prov
   -14: _rpmds_sysinfo_path     %{_topdir}/sysinfo/
  --14: _rpmfc_magic_path       /usr/share/misc/magic
  +-14: _rpmfc_magic_path       /usr/share/file/magic
   -14: _rpmfilename    %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm
   -14: _rpmgi_pattern_glob     file://%{_testdir}/edos-test/
   -14: _rpmgi_pattern_regex    ^.+/%1-[^-]+-[^-]+\.[^.]+\.rpm$
   -14: _rpmgio .ufdio
   -14: _rpmhome        %{_usrlibrpm}
  --14: _rpmversion     5.4.9
  +-14: _rpmversion     5.4.16
   -14: _rubyI_init     %{nil}
   -14: _sbindir        %{_exec_prefix}/sbin
   -14: _sharedstatedir %{_prefix}/com
  @@ -654,7 +705,7 @@
   -14: _target_alias   %{_host_alias}
   -11= _target_cpu     x86_64
   -11= _target_os      linux
  --14: _target_platform        
%{_target_cpu}-%{_target_vendor}-%{_target_os}%{?_gnu}
  +-14: _target_platform        
%{_target_cpu}-%{_target_vendor}-%{_target_os}%{?_host_gnu}%{!?_host_gnu:%{?_gnu}}
   -14: _target_vendor  %{_host_vendor}
   -14: _tclI_init      %{nil}
   -14= _testdir        ../tests
  @@ -665,14 +716,14 @@
   -14: _unsafe_rollbacks       0
   -14: _use_internal_dependency_generator      2
   -14: _usr    /usr
  --14= _usrlibrpm      /usr/lib/rpm
  +-14= _usrlibrpm      /usr/lib/rpm-5.4.16
   -14: _usrlibrpmbin   %{_usrlibrpm}/bin
   -14: _usrsrc %{_usr}/src
   -14: _uuid_auth      http://rpm5.org/
   -14: _uuid_path      /package
   -14: _var    /var
   -14: _varrun /var/run
  --14: _vendor mandriva
  +-14: _vendor fedora
   -14: _verify_file_context_path       %{__file_context_path}
   -14: _vsflags_build  %{__vsflags}
   -14: _vsflags_erase  %{__vsflags}
  @@ -721,9 +772,9 @@
   %{nil}
   -14: defined %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
   -14: efi     %{ix86} x86_64 ia64
  --14: evr_tuple_match ^(?:([^:-]+):)?([^:-]+)(?:-([^:-]+))?(?::([^:-]+))?$
  +-14: evr_tuple_match 
^(?:([^:-]+):)?([^:~-]+)(?:~([^:-]+))?(?:-([^:-]+))?(?::([^:-]+))?$
   -14: evr_tuple_order EVR
  --14: evr_tuple_select        123_
  +-14: evr_tuple_select        12_4_
   -14: find_lang       %{_testdir}/../scripts/find-lang.sh %{buildroot}
   -14: ix86    i386 i486 i586 i686 pentium3 pentium4 athlon
   -14: leg     leg legv3 legv3l legv3b legv4 legv4l legv4b legv5 legv5l legv5b 
legv5te legv5tel legv5teb xscale legv6 legv6l legv7l legv7hl legv7lh legv7hln 
legv7hnl legv7lhn legv7lnh legv7nhl legv7nlh
  @@ -750,6 +801,31 @@
   -14: mipsx   %mips %mipsel mips64 mips64el
   -14: nil     %{!?nil}
   -14: optflags        -O2
  +-14: ostamp_api      9764b1ebd8b01e9d631ce566cdf9f4b5
  +-14: ostamp_hash     %(date --rfc-3339=ns | sha256sum | cut -f1 -d\ )
  +-14: ostamp_json     {
  +%{?ostamp_sender:    "sender":       "%{ostamp_sender}",}
  +%{?ostamp_send_back: "send_back":    %{ostamp_send_back},}
  +%{?ostamp_title:     "title":        "%{ostamp_title}",}
  +     "hash_sha256":  "%1"
  +}
  +-14: ostamp_publish  %(
  +%{__curl} -sS -X POST\
  +     -H "Content-Type: application/json"\
  +     -H "Authorization: Token token=%{ostamp_api}"\
  +     -d '
  +{
  +%{?ostamp_sender:    "sender":       "%{ostamp_sender}",}
  +%{?ostamp_send_back: "send_back":    %{ostamp_send_back},}
  +%{?ostamp_title:     "title":        "%{ostamp_title}",}
  +     "hash_sha256":  "%1"
  +}'\
  +     %{ostamp_uri}/api/stamps
  +)%{nil}
  +-14: ostamp_send_back        1
  +-14: ostamp_sender   j...@rpm5.org
  +-14: ostamp_title    rpm-5.4.17
  +-14: ostamp_uri      http://www.originstamp.org
   -14: patch(b:p:P:REz:F:d:)   %{shrink:
   %define __patch_number  %{-P:%{-P*}}%{!-P:0} 
   %define __patch_file    %{P:%{__patch_number}} 
  @@ -765,7 +841,7 @@
   -14: pattern_Name    ^[A-Za-z0-9][A-Za-z0-9+._-]*$
   -14: pattern_Release ^[A-Za-z0-9+._]+$
   -14: pattern_Repotag ^[A-Za-z0-9]+$
  --14: pattern_Version ^[A-Za-z0-9+._]+$
  +-14: pattern_Version ^[A-Za-z0-9+._~]+$
   -14: post    %%post %*
     echo "--- post(%NVRA)          arg $1 ..."
   %nil
  @@ -811,4 +887,4 @@
   %nil
   -14: with    %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
   -14: without %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
  -======================== active 509 empty 0
  +======================== active 526 empty 0
  @@ .
______________________________________________________________________
RPM Package Manager                                    http://rpm5.org
CVS Sources Repository                                rpm-cvs@rpm5.org

Reply via email to