[CVS] RPM: rpm/ CHANGES rpm/lib/auto/ .cvsignore Makefile.am desc.in t...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 16:13:03
  Branch: HEAD Handle: 2010122715130201

  Modified files:
rpm CHANGES
rpm/lib/auto.cvsignore Makefile.am desc.in types.in

  Log:
- rpmlib: rescusictate the ISPRAS markup.

  Summary:
RevisionChanges Path
1.3525  +1  -0  rpm/CHANGES
1.2 +2  -0  rpm/lib/auto/.cvsignore
1.3 +5  -1  rpm/lib/auto/Makefile.am
1.3 +28 -7  rpm/lib/auto/desc.in
1.4 +23 -1  rpm/lib/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3524 -r1.3525 CHANGES
  --- rpm/CHANGES   27 Dec 2010 03:49:42 -  1.3524
  +++ rpm/CHANGES   27 Dec 2010 15:13:02 -  1.3525
  @@ -1,4 +1,5 @@
   5.3.7 - 5.4a1:
  +- jbj: rpmlib: rescusictate the ISPRAS markup.
   - jbj: rpmdb: rescusictate the ISPRAS markup.
   - jbj: rpmio: add a queue link pointer to all rpm objects.
   - jbj: i18n: update po files (Translation Project).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/.cvsignore
  
  $ cvs diff -u -r1.1 -r1.2 .cvsignore
  --- rpm/lib/auto/.cvsignore   5 Mar 2010 20:12:26 -   1.1
  +++ rpm/lib/auto/.cvsignore   27 Dec 2010 15:13:03 -  1.2
  @@ -1,8 +1,10 @@
  +compat_reports
   descriptors_storage
   header_compile_errors
   Makefile
   Makefile.in
   desc
  +logs
   types
   test_results
   tests
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/Makefile.am
  
  $ cvs diff -u -r1.2 -r1.3 Makefile.am
  --- rpm/lib/auto/Makefile.am  2 Nov 2010 16:55:55 -   1.2
  +++ rpm/lib/auto/Makefile.am  27 Dec 2010 15:13:03 -  1.3
  @@ -2,6 +2,9 @@
   
   EXTRA_DIST = types desc
   
  +# http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
  +ABITEST =   @abs_top_srcdir@/scripts/abi-compliance-checker.pl
  +# http://ispras.linuxfoundation.org/index.php/API_Sanity_Autotest
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ -11,4 +14,5 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l lib -d desc -clean
  - -${AUTOTEST} -l lib -d desc -st types -gen -build -run
  + -${AUTOTEST} -l lib -d desc -st types -td test_data \
  + -gen -splint-specs -build -run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/desc.in
  
  $ cvs diff -u -r1.2 -r1.3 desc.in
  --- rpm/lib/auto/desc.in  6 Mar 2010 01:06:08 -   1.2
  +++ rpm/lib/auto/desc.in  27 Dec 2010 15:13:03 -  1.3
  @@ -8,6 +8,8 @@
 manifest.h
 misc.h
   !-- psm.h --
  +!-- rpm46compat.h --
  +!-- rpm4compat.h --
 rpmal.h
 rpmcli.h
 rpmds.h
  @@ -27,9 +29,6 @@

   libs
 @abs_top_builddir@/lib/.libs/librpm.so
  -  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  -  @abs_top_builddir@/rpmio/.libs/librpmio.so
  -  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs
   
   include_paths
  @@ -42,10 +41,6 @@
 @CFLAGS@
   /gcc_options
   
  -opaque_types
  -/opaque_types
  -skip_interfaces
  -/skip_interfaces
   include_preamble
 stdint.h
 stdio.h
  @@ -58,5 +53,31 @@
 rpmevr.h
 rpmtag.h
   /include_preamble
  +
   libs_depend
  +  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  +  @abs_top_builddir@/rpmio/.libs/librpmio.so
  +  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs_depend
  +
  +opaque_types
  +/opaque_types
  +
  +skip_interfaces
  +/skip_interfaces
  +
  +skip_headers
  +  /usr/include/rpm/*.h
  +/skip_headers
  +
  +skip_libs
  +/skip_libs
  +
  +libgroup
  +/libgroup
  +
  +out_params
  +/out_params
  +
  +skip_warnings
  +/skip_warnings
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/types.in
  
  $ cvs diff -u -r1.3 -r1.4 types.in
  --- rpm/lib/auto/types.in 6 Mar 2010 15:30:12 -   1.3
  +++ rpm/lib/auto/types.in 27 Dec 2010 15:13:03 -  1.4
  @@ -1,6 +1,27 @@
   ?xml version=1.0 encoding=UTF-8?
   collection
   
  +spec_type
  +  kind common_env /kind
  +  global_code
  +#include rpmcli.h
  +#include poptALL.h
  +#include assert.h
  +static struct poptOption optionsTable[] = {
  +  { NULL, '\0',

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/lib/auto/ .cvsignore Makefile.am ...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 16:13:33
  Branch: rpm-5_4  Handle: 2010122715133201

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/lib/auto.cvsignore Makefile.am desc.in types.in

  Log:
- rpmlib: rescusictate the ISPRAS markup.

  Summary:
RevisionChanges Path
1.3501.2.26 +1  -0  rpm/CHANGES
1.1.4.1 +2  -0  rpm/lib/auto/.cvsignore
1.2.2.1 +5  -1  rpm/lib/auto/Makefile.am
1.2.4.1 +28 -7  rpm/lib/auto/desc.in
1.3.4.1 +23 -1  rpm/lib/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.25 -r1.3501.2.26 CHANGES
  --- rpm/CHANGES   27 Dec 2010 03:50:22 -  1.3501.2.25
  +++ rpm/CHANGES   27 Dec 2010 15:13:32 -  1.3501.2.26
  @@ -1,4 +1,5 @@
   5.3.7 - 5.4.0:
  +- jbj: rpmlib: rescusictate the ISPRAS markup.
   - jbj: rpmdb: rescusictate the ISPRAS markup.
   - jbj: rpmio: add a queue link pointer to all rpm objects.
   - jbj: i18n: update po files (Translation Project).
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/.cvsignore
  
  $ cvs diff -u -r1.1 -r1.1.4.1 .cvsignore
  --- rpm/lib/auto/.cvsignore   5 Mar 2010 20:12:26 -   1.1
  +++ rpm/lib/auto/.cvsignore   27 Dec 2010 15:13:33 -  1.1.4.1
  @@ -1,8 +1,10 @@
  +compat_reports
   descriptors_storage
   header_compile_errors
   Makefile
   Makefile.in
   desc
  +logs
   types
   test_results
   tests
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/Makefile.am
  
  $ cvs diff -u -r1.2 -r1.2.2.1 Makefile.am
  --- rpm/lib/auto/Makefile.am  2 Nov 2010 16:55:55 -   1.2
  +++ rpm/lib/auto/Makefile.am  27 Dec 2010 15:13:33 -  1.2.2.1
  @@ -2,6 +2,9 @@
   
   EXTRA_DIST = types desc
   
  +# http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
  +ABITEST =   @abs_top_srcdir@/scripts/abi-compliance-checker.pl
  +# http://ispras.linuxfoundation.org/index.php/API_Sanity_Autotest
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ -11,4 +14,5 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l lib -d desc -clean
  - -${AUTOTEST} -l lib -d desc -st types -gen -build -run
  + -${AUTOTEST} -l lib -d desc -st types -td test_data \
  + -gen -splint-specs -build -run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/desc.in
  
  $ cvs diff -u -r1.2 -r1.2.4.1 desc.in
  --- rpm/lib/auto/desc.in  6 Mar 2010 01:06:08 -   1.2
  +++ rpm/lib/auto/desc.in  27 Dec 2010 15:13:33 -  1.2.4.1
  @@ -8,6 +8,8 @@
 manifest.h
 misc.h
   !-- psm.h --
  +!-- rpm46compat.h --
  +!-- rpm4compat.h --
 rpmal.h
 rpmcli.h
 rpmds.h
  @@ -27,9 +29,6 @@

   libs
 @abs_top_builddir@/lib/.libs/librpm.so
  -  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  -  @abs_top_builddir@/rpmio/.libs/librpmio.so
  -  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs
   
   include_paths
  @@ -42,10 +41,6 @@
 @CFLAGS@
   /gcc_options
   
  -opaque_types
  -/opaque_types
  -skip_interfaces
  -/skip_interfaces
   include_preamble
 stdint.h
 stdio.h
  @@ -58,5 +53,31 @@
 rpmevr.h
 rpmtag.h
   /include_preamble
  +
   libs_depend
  +  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  +  @abs_top_builddir@/rpmio/.libs/librpmio.so
  +  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs_depend
  +
  +opaque_types
  +/opaque_types
  +
  +skip_interfaces
  +/skip_interfaces
  +
  +skip_headers
  +  /usr/include/rpm/*.h
  +/skip_headers
  +
  +skip_libs
  +/skip_libs
  +
  +libgroup
  +/libgroup
  +
  +out_params
  +/out_params
  +
  +skip_warnings
  +/skip_warnings
  @@ .
  patch -p0 '@@ .'
  Index: rpm/lib/auto/types.in
  
  $ cvs diff -u -r1.3 -r1.3.4.1 types.in
  --- rpm/lib/auto/types.in 6 Mar 2010 15:30:12 -   1.3
  +++ rpm/lib/auto/types.in 27 Dec 2010 15:13:33 -  1.3.4.1
  @@ -1,6 +1,27 @@
   ?xml version=1.0 encoding=UTF-8?
   collection
   
  +spec_type
  +  kind common_env /kind
  +  global_code
  +#include rpmcli.h
  +#include poptALL.h
  +#include assert.h
  +

[CVS] RPM: rpm/ CHANGES rpm/build/auto/ .cvsignore Makefile.am desc.in...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 17:01:25
  Branch: HEAD Handle: 2010122716012003

  Modified files:
rpm CHANGES
rpm/build/auto  .cvsignore Makefile.am desc.in types.in

  Log:
- build: rescusictate the ISPRAS markup.

  Summary:
RevisionChanges Path
1.3526  +1  -0  rpm/CHANGES
1.2 +2  -0  rpm/build/auto/.cvsignore
1.3 +6  -1  rpm/build/auto/Makefile.am
1.2 +28 -4  rpm/build/auto/desc.in
1.2 +23 -1  rpm/build/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3525 -r1.3526 CHANGES
  --- rpm/CHANGES   27 Dec 2010 15:13:02 -  1.3525
  +++ rpm/CHANGES   27 Dec 2010 16:01:20 -  1.3526
  @@ -1,4 +1,5 @@
   5.3.7 - 5.4a1:
  +- jbj: build: rescusictate the ISPRAS markup.
   - jbj: rpmlib: rescusictate the ISPRAS markup.
   - jbj: rpmdb: rescusictate the ISPRAS markup.
   - jbj: rpmio: add a queue link pointer to all rpm objects.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/.cvsignore
  
  $ cvs diff -u -r1.1 -r1.2 .cvsignore
  --- rpm/build/auto/.cvsignore 6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/.cvsignore 27 Dec 2010 16:01:23 -  1.2
  @@ -1,8 +1,10 @@
  +compat_reports
   descriptors_storage
   header_compile_errors
   Makefile
   Makefile.in
   desc
  +logs
   types
   test_results
   tests
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/Makefile.am
  
  $ cvs diff -u -r1.2 -r1.3 Makefile.am
  --- rpm/build/auto/Makefile.am2 Nov 2010 16:55:55 -   1.2
  +++ rpm/build/auto/Makefile.am27 Dec 2010 16:01:23 -  1.3
  @@ -2,6 +2,9 @@
   
   EXTRA_DIST = types desc
   
  +# http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
  +ABITEST =   @abs_top_srcdir@/scripts/abi-compliance-checker.pl
  +# http://ispras.linuxfoundation.org/index.php/API_Sanity_Autotest
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ -11,4 +14,6 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l build -d desc -clean
  - -${AUTOTEST} -l build -d desc -st types -gen -build -run
  + -${AUTOTEST} -l build -d desc -st types -td test_data \
  + -gen -splint-specs -build -run
  +
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/desc.in
  
  $ cvs diff -u -r1.1 -r1.2 desc.in
  --- rpm/build/auto/desc.in6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/desc.in27 Dec 2010 16:01:23 -  1.2
  @@ -10,10 +10,6 @@

   libs
 @abs_top_builddir@/build/.libs/librpmbuild.so
  -  @abs_top_builddir@/lib/.libs/librpm.so
  -  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  -  @abs_top_builddir@/rpmio/.libs/librpmio.so
  -  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs
   
   include_paths
  @@ -43,5 +39,33 @@
 rpmevr.h
 rpmtag.h
   /include_preamble
  +
   libs_depend
  +  @abs_top_builddir@/lib/.libs/librpm.so
  +  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  +  @abs_top_builddir@/rpmio/.libs/librpmio.so
  +  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs_depend
  +
  +opaque_types
  +/opaque_types
  +
  +skip_interfaces
  +/skip_interfaces
  +
  +skip_headers
  +  /usr/include/rpm/*.h
  +/skip_headers
  +
  +skip_libs
  +/skip_libs
  +
  +libgroup
  +/libgroup
  +
  +out_params
  +/out_params
  +
  +skip_warnings
  +/skip_warnings
  +
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/types.in
  
  $ cvs diff -u -r1.1 -r1.2 types.in
  --- rpm/build/auto/types.in   6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/types.in   27 Dec 2010 16:01:23 -  1.2
  @@ -1,7 +1,28 @@
   ?xml version=1.0 encoding=UTF-8?
   collection
   
  -!-- rpmio/rpmhash.h --
  +spec_type
  +  kind common_env /kind
  +  global_code
  +#include rpmcli.h  /* XXX rpmioItem */
  +#include poptALL.h
  +#include assert.h
  +static struct poptOption optionsTable[] = {
  +  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
  +   Common options for all rpmio executables:, NULL },
  +  POPT_AUTOHELP
  +

[CVS] RPM: rpm-5_4: rpm/ CHANGES rpm/build/auto/ .cvsignore Makefile.a...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 17:01:57
  Branch: rpm-5_4  Handle: 2010122716014903

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES
rpm/build/auto  .cvsignore Makefile.am desc.in types.in

  Log:
- build: rescusictate the ISPRAS markup.

  Summary:
RevisionChanges Path
1.3501.2.27 +1  -0  rpm/CHANGES
1.1.4.1 +2  -0  rpm/build/auto/.cvsignore
1.2.2.1 +6  -1  rpm/build/auto/Makefile.am
1.1.4.1 +28 -4  rpm/build/auto/desc.in
1.1.4.1 +23 -1  rpm/build/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.26 -r1.3501.2.27 CHANGES
  --- rpm/CHANGES   27 Dec 2010 15:13:32 -  1.3501.2.26
  +++ rpm/CHANGES   27 Dec 2010 16:01:49 -  1.3501.2.27
  @@ -1,4 +1,5 @@
   5.3.7 - 5.4.0:
  +- jbj: build: rescusictate the ISPRAS markup.
   - jbj: rpmlib: rescusictate the ISPRAS markup.
   - jbj: rpmdb: rescusictate the ISPRAS markup.
   - jbj: rpmio: add a queue link pointer to all rpm objects.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/.cvsignore
  
  $ cvs diff -u -r1.1 -r1.1.4.1 .cvsignore
  --- rpm/build/auto/.cvsignore 6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/.cvsignore 27 Dec 2010 16:01:52 -  1.1.4.1
  @@ -1,8 +1,10 @@
  +compat_reports
   descriptors_storage
   header_compile_errors
   Makefile
   Makefile.in
   desc
  +logs
   types
   test_results
   tests
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/Makefile.am
  
  $ cvs diff -u -r1.2 -r1.2.2.1 Makefile.am
  --- rpm/build/auto/Makefile.am2 Nov 2010 16:55:55 -   1.2
  +++ rpm/build/auto/Makefile.am27 Dec 2010 16:01:52 -  1.2.2.1
  @@ -2,6 +2,9 @@
   
   EXTRA_DIST = types desc
   
  +# http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
  +ABITEST =   @abs_top_srcdir@/scripts/abi-compliance-checker.pl
  +# http://ispras.linuxfoundation.org/index.php/API_Sanity_Autotest
   AUTOTEST =  @abs_top_srcdir@/scripts/api-sanity-autotest.pl
   
   TDIRS =  descriptors_storage header_compile_errors test_results 
tests
  @@ -11,4 +14,6 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l build -d desc -clean
  - -${AUTOTEST} -l build -d desc -st types -gen -build -run
  + -${AUTOTEST} -l build -d desc -st types -td test_data \
  + -gen -splint-specs -build -run
  +
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/desc.in
  
  $ cvs diff -u -r1.1 -r1.1.4.1 desc.in
  --- rpm/build/auto/desc.in6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/desc.in27 Dec 2010 16:01:52 -  1.1.4.1
  @@ -10,10 +10,6 @@

   libs
 @abs_top_builddir@/build/.libs/librpmbuild.so
  -  @abs_top_builddir@/lib/.libs/librpm.so
  -  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  -  @abs_top_builddir@/rpmio/.libs/librpmio.so
  -  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs
   
   include_paths
  @@ -43,5 +39,33 @@
 rpmevr.h
 rpmtag.h
   /include_preamble
  +
   libs_depend
  +  @abs_top_builddir@/lib/.libs/librpm.so
  +  @abs_top_builddir@/rpmdb/.libs/librpmdb.so
  +  @abs_top_builddir@/rpmio/.libs/librpmio.so
  +  @abs_top_builddir@/misc/.libs/librpmmisc.so
   /libs_depend
  +
  +opaque_types
  +/opaque_types
  +
  +skip_interfaces
  +/skip_interfaces
  +
  +skip_headers
  +  /usr/include/rpm/*.h
  +/skip_headers
  +
  +skip_libs
  +/skip_libs
  +
  +libgroup
  +/libgroup
  +
  +out_params
  +/out_params
  +
  +skip_warnings
  +/skip_warnings
  +
  @@ .
  patch -p0 '@@ .'
  Index: rpm/build/auto/types.in
  
  $ cvs diff -u -r1.1 -r1.1.4.1 types.in
  --- rpm/build/auto/types.in   6 Mar 2010 03:29:14 -   1.1
  +++ rpm/build/auto/types.in   27 Dec 2010 16:01:52 -  1.1.4.1
  @@ -1,7 +1,28 @@
   ?xml version=1.0 encoding=UTF-8?
   collection
   
  -!-- rpmio/rpmhash.h --
  +spec_type
  +  kind common_env /kind
  +  global_code
  +#include rpmcli.h  /* XXX rpmioItem */
  +#include poptALL.h
  +#include assert.h
  +static struct poptOption optionsTable[] = {
  +  { NULL, '\0', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
  +   Common

[CVS] RPM: rpm-5_4: rpm/tests/ref/ manifest showrc version

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 17:52:15
  Branch: rpm-5_4  Handle: 2010122716521500

  Modified files:   (Branch: rpm-5_4)
rpm/tests/ref   manifest showrc version

  Log:
- tests: sanity.

  Summary:
RevisionChanges Path
1.17.2.1+4  -0  rpm/tests/ref/manifest
1.37.2.1+104 -35rpm/tests/ref/showrc
1.5.2.1 +2  -2  rpm/tests/ref/version
  

  patch -p0 '@@ .'
  Index: rpm/tests/ref/manifest
  
  $ cvs diff -u -r1.17 -r1.17.2.1 manifest
  --- rpm/tests/ref/manifest27 Sep 2010 21:52:09 -  1.17
  +++ rpm/tests/ref/manifest27 Dec 2010 16:52:15 -  1.17.2.1
  @@ -1,4 +1,6 @@
  +arbitrarytag/arbitrarytag-1.0-1.noarch.rpm
   cAos2-stub/cAos2-stub-1-0.noarch.rpm
  +config-test/config-test-1.2-0.1.noarch.rpm
   cudf-test/battery-3-0.noarch.rpm
   cudf-test/bicycle-7-0.noarch.rpm
   cudf-test/car-1-0.noarch.rpm
  @@ -35,6 +37,8 @@
   edos-test/window-0-0.noarch.rpm
   edos-test/window-1-0.noarch.rpm
   edos-test/window-2-0.noarch.rpm
  +order-test/orderA-1.2-0.1.noarch.rpm
  +order-test/orderB-1.2-0.1.noarch.rpm
   popt/popt-1.14-1.i686.rpm
   probes-test/probes-1-0.noarch.rpm
   probes-test/probes-2-0.noarch.rpm
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/showrc
  
  $ cvs diff -u -r1.37 -r1.37.2.1 showrc
  --- rpm/tests/ref/showrc  3 Dec 2010 18:22:42 -   1.37
  +++ rpm/tests/ref/showrc  27 Dec 2010 16:52:15 -  1.37.2.1
  @@ -16,11 +16,8 @@
   MACRO DEFINITIONS:
   macrofiles: ../macros/macros:../tests/macros
   Features provided by rpmlib installer:
  -rpmlib(BuiltinJavaScript) = 5.2-1
   rpmlib(BuiltinLuaScripts) = 4.2.2-1
  -rpmlib(BuiltinPerlScripts) = 5.2-1
   rpmlib(BuiltinPythonScripts) = 5.2-1
  -rpmlib(BuiltinSpookScripts) = 5.3-1
   rpmlib(BuiltinSqlScripts) = 5.3-1
   rpmlib(BuiltinTclScripts) = 5.2-1
   rpmlib(CompressedFileNames) = 3.0.4-1
  @@ -41,51 +38,36 @@
   
   Features provided by current cpuinfo (from /proc/cpuinfo):
   cpuinfo(acpi)
  -cpuinfo(aperfmperf)
   cpuinfo(apic)
  -cpuinfo(arch_perfmon)
  -cpuinfo(bogomips) = 5985.70
  -cpuinfo(bts)
  -cpuinfo(cache_size) = 4096_KB
  +cpuinfo(bogomips) = 6676.32
  +cpuinfo(cache_size) = 6144_KB
   cpuinfo(clflush)
  -cpuinfo(clflush_size) = 64
   cpuinfo(cmov)
   cpuinfo(constant_tsc)
  -cpuinfo(cpu_MHz) = 2992.853
  +cpuinfo(cpu_MHz) = 2666.760
   cpuinfo(cpu_family) = 6
  -cpuinfo(cx16)
   cpuinfo(cx8)
  -cpuinfo(de)
  -cpuinfo(dts)
  +cpuinfo(est)
   cpuinfo(fpu)
   cpuinfo(fpu_exception)
   cpuinfo(fxsr)
  -cpuinfo(hypervisor)
  -cpuinfo(lahf_lm)
  -cpuinfo(lm)
  -cpuinfo(mca)
  -cpuinfo(mce)
  +cpuinfo(ht)
   cpuinfo(mmx)
  -cpuinfo(model) = 15
  +cpuinfo(model) = 23
   cpuinfo(msr)
  -cpuinfo(mtrr)
   cpuinfo(nx)
   cpuinfo(pae)
   cpuinfo(pat)
  -cpuinfo(pebs)
  -cpuinfo(pge)
   cpuinfo(pni)
  -cpuinfo(pse)
  -cpuinfo(pse36)
  -cpuinfo(sep)
   cpuinfo(ss)
   cpuinfo(sse)
   cpuinfo(sse2)
  +cpuinfo(sse4_1)
   cpuinfo(ssse3)
  -cpuinfo(stepping) = 6
  +cpuinfo(stepping) = 10
   cpuinfo(tsc)
  -cpuinfo(tsc_reliable)
  -cpuinfo(vme)
  +cpuinfo(up)
  +cpuinfo(vmx)
   cpuinfo(wp)
   
   
  @@ -191,6 +173,7 @@
   -14: __chmod /bin/chmod
   -14: __chown /bin/chown
   -14: __chroot%{_usrlibrpmbin}/chroot
  +-14: __cmake %{_bindir}/cmake
   -14: __cp%{_usrlibrpmbin}/cp
   -14: __cpio  /bin/cpio
   -14: __cpp   gcc -E
  @@ -233,6 +216,7 @@
   -14: __find  %{_usrlibrpmbin}/find
   -14: __find_provides %{_rpmhome}/find-provides
   -14: __find_requires %{_rpmhome}/find-requires
  +-14: __gem_helper%{_usrlibrpm}/gem_helper.rb
   -14: __git   /usr/bin/git
   -14: __gpg   /usr/bin/gpg2
   -14: __gpg_check_password_cmd%{__gpg} 
  @@ -248,6 +232,8 @@
   -14: __id/usr/bin/id
   -14: __install   /usr/bin/install
   -14: __install_info  /sbin/install-info
  +-14: __java_provides %{_rpmhome}/javadeps.sh --provides
  +-14: __java_requires %{_rpmhome}/javadeps.sh --requires
   -14: __ld/usr/bin/ld
   -14: __ldconfig  /sbin/ldconfig
   -14: __libexta
  @@ -257,12 +243,14 @@
   -14: __ln/bin/ln
   -14: __ln_s  ln -s
   -14: __lua   %{_usrlibrpmbin}/lua
  --14:

[CVS] RPM: rpm/rpmdb/auto/ desc.in rpm/rpmdb/ pkgio.c rpm/rpmio/auto/ ...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 18:01:46
  Branch: HEAD Handle: 2010122717014104

  Modified files:
rpm/rpmdb   pkgio.c
rpm/rpmdb/auto  desc.in
rpm/rpmio/auto  Makefile.am desc.in types.in

  Log:
- cosmetic sanity.

  Summary:
RevisionChanges Path
1.4 +0  -1  rpm/rpmdb/auto/desc.in
1.122   +4  -4  rpm/rpmdb/pkgio.c
1.6 +2  -1  rpm/rpmio/auto/Makefile.am
1.3 +45 -9  rpm/rpmio/auto/desc.in
1.4 +13 -11 rpm/rpmio/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/auto/desc.in
  
  $ cvs diff -u -r1.3 -r1.4 desc.in
  --- rpm/rpmdb/auto/desc.in27 Dec 2010 03:49:43 -  1.3
  +++ rpm/rpmdb/auto/desc.in27 Dec 2010 17:01:45 -  1.4
  @@ -77,4 +77,3 @@
   
   skip_warnings
   /skip_warnings
  -
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.121 -r1.122 pkgio.c
  --- rpm/rpmdb/pkgio.c 18 Oct 2010 06:53:37 -  1.121
  +++ rpm/rpmdb/pkgio.c 27 Dec 2010 17:01:41 -  1.122
  @@ -1170,7 +1170,7 @@
buf[sizeof(buf)-1] = '\0';
if (msg) *msg = xstrdup(buf);
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #1: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #1: rc %d \%s\\n, rc, (msg ? *msg: ));
return rc;
   }
   
  @@ -1190,7 +1190,7 @@
buf[sizeof(buf)-1] = '\0';
if (msg) *msg = xstrdup(buf);
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #2: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #2: rc %d \%s\\n, rc, (msg ? *msg: ));
return rc;
   }
   
  @@ -1315,7 +1315,7 @@
   if (msg) *msg = xstrdup(buf);
   
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #3: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #3: rc %d \%s\\n, rc, (msg ? *msg: ));
   return rc;
   }
   
  @@ -1547,7 +1547,7 @@
   }
   
   if (_pkgio_debug)
  -fprintf(stderr, -- rpmReadHeader: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- rpmReadHeader: rc %d \%s\\n, rc, (msg ? *msg: ));
   return rc;
   }
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/Makefile.am
  
  $ cvs diff -u -r1.5 -r1.6 Makefile.am
  --- rpm/rpmio/auto/Makefile.am2 Nov 2010 16:55:56 -   1.5
  +++ rpm/rpmio/auto/Makefile.am27 Dec 2010 17:01:44 -  1.6
  @@ -14,4 +14,5 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l rpmio -d desc -clean
  - -${AUTOTEST} -l rpmio -d desc -st types -td test_data -gen -build -run
  + -${AUTOTEST} -l rpmio -d desc -st types -td test_data \
  + -gen -splint-specs -build -run
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/desc.in
  
  $ cvs diff -u -r1.2 -r1.3 desc.in
  --- rpm/rpmio/auto/desc.in8 Mar 2010 22:15:58 -   1.2
  +++ rpm/rpmio/auto/desc.in27 Dec 2010 17:01:44 -  1.3
  @@ -10,7 +10,6 @@
   !-- cubehash.h --
   !-- echo.h --
   !-- edon-r.h --
  -!-- envvar.h --
   !-- fugue.h --
   !-- groestl.h --
   !-- hamsi.h --
  @@ -34,8 +33,12 @@
 cpio.h
 tar.h
   
  +!-- bson.h FIXME: bson_malloc gets used. --
  +  mongo.h
  +
 argv.h
 crc.h
  +!-- envvar.h --
   !-- fnmatch.h --
 fts.h
   !-- glob.h --
  @@ -43,29 +46,39 @@
   !-- mire.h FIXME! --
   !-- poptIO.h --
 rpmacl.h
  +!-- rpmasn.h --
 rpmaug.h
  +!-- rpmbag.h --
 rpmbc.h
 rpmbf.h
 rpmbz.h
 rpmcb.h
  +
  +!-- rpmcdsa.h --
   !-- rpmcpio.h --
   !-- rpmcudf.h --
  +!-- rpmcvs.h --
   !-- rpmdav.h --
 rpmdir.h
 rpmficl.h
 rpmgc.h
  +!-- rpmgit.h --
 rpmhash.h
  +  rpmhkp.h
   !-- rpmhook.h --
 rpmio.h
   !-- rpmio_internal.h --
 rpmiotypes.h
 rpmjs.h
  +!-- rpmjsio.h DELETE --
   !-- rpmkeyring.h --
   !-- rpmku.h FIXME: 1 --
 rpmlog.h
  +  rpmltc.h
 rpmlua.h
 rpmmacro.h
 rpmmg.h
  +!-- rpmnix.h --
 rpmnss.h
 rpmperl.h
 rpmpgp.h
  @@ -74,46 +87,69 @@
 rpmsm.h
 rpmsp.h
   !-- rpmsq.h FIXME: logout from stdin sighup?--
  +  rpmsql.h
 rpmsquirrel.h
 rpmssl.h
  +!-- rpmsvn.h --
 rpmsw.h
   !-- rpmsx.h --
 rpmsyck.h
  +!-- rpmtar.h --
 rpmtcl.h
  +!-- rpmtpm.h --
 rpmurl.h
 rpmuuid.h
   !-- rpmxar.h --
  +!-- rpmz.h --

[CVS] RPM: rpm-5_4: rpm/rpmdb/auto/ desc.in rpm/rpmdb/ pkgio.c rpm/rpm...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 18:03:15
  Branch: rpm-5_4  Handle: 2010122717031301

  Modified files:   (Branch: rpm-5_4)
rpm/rpmdb   pkgio.c
rpm/rpmdb/auto  desc.in
rpm/rpmio/auto  Makefile.am

  Log:
- cosmetic sanity.

  Summary:
RevisionChanges Path
1.2.4.2 +0  -1  rpm/rpmdb/auto/desc.in
1.121.2.1   +4  -4  rpm/rpmdb/pkgio.c
1.5.2.2 +1  -1  rpm/rpmio/auto/Makefile.am
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/auto/desc.in
  
  $ cvs diff -u -r1.2.4.1 -r1.2.4.2 desc.in
  --- rpm/rpmdb/auto/desc.in27 Dec 2010 03:50:23 -  1.2.4.1
  +++ rpm/rpmdb/auto/desc.in27 Dec 2010 17:03:14 -  1.2.4.2
  @@ -77,4 +77,3 @@
   
   skip_warnings
   /skip_warnings
  -
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmdb/pkgio.c
  
  $ cvs diff -u -r1.121 -r1.121.2.1 pkgio.c
  --- rpm/rpmdb/pkgio.c 18 Oct 2010 06:53:37 -  1.121
  +++ rpm/rpmdb/pkgio.c 27 Dec 2010 17:03:13 -  1.121.2.1
  @@ -1170,7 +1170,7 @@
buf[sizeof(buf)-1] = '\0';
if (msg) *msg = xstrdup(buf);
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #1: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #1: rc %d \%s\\n, rc, (msg ? *msg: ));
return rc;
   }
   
  @@ -1190,7 +1190,7 @@
buf[sizeof(buf)-1] = '\0';
if (msg) *msg = xstrdup(buf);
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #2: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #2: rc %d \%s\\n, rc, (msg ? *msg: ));
return rc;
   }
   
  @@ -1315,7 +1315,7 @@
   if (msg) *msg = xstrdup(buf);
   
   if (_pkgio_debug)
  -fprintf(stderr, -- headerCheck #3: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- headerCheck #3: rc %d \%s\\n, rc, (msg ? *msg: ));
   return rc;
   }
   
  @@ -1547,7 +1547,7 @@
   }
   
   if (_pkgio_debug)
  -fprintf(stderr, -- rpmReadHeader: rc %d \%s\\n, rc, (msg ? *msg: ));
  +fprintf(stderr, -- rpmReadHeader: rc %d \%s\\n, rc, (msg ? *msg: ));
   return rc;
   }
   
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/Makefile.am
  
  $ cvs diff -u -r1.5.2.1 -r1.5.2.2 Makefile.am
  --- rpm/rpmio/auto/Makefile.am25 Dec 2010 21:30:54 -  1.5.2.1
  +++ rpm/rpmio/auto/Makefile.am27 Dec 2010 17:03:14 -  1.5.2.2
  @@ -14,5 +14,5 @@
   
   check-local:
-[ -d tests ]  ${AUTOTEST} -l rpmio -d desc -clean
  - ${AUTOTEST} -l rpmio -d desc -st types -td test_data \
  + -${AUTOTEST} -l rpmio -d desc -st types -td test_data \
-gen -splint-specs -build -run
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmdb/ rpmdb.c

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 18:06:48
  Branch: HEAD Handle: 2010122717064800

  Modified files:
rpm/rpmdb   rpmdb.c

  Log:
- cosmetic sanity.

  Summary:
RevisionChanges Path
1.395   +1  -1  rpm/rpmdb/rpmdb.c
  

  patch -p0 '@@ .'
  Index: rpm/rpmdb/rpmdb.c
  
  $ cvs diff -u -r1.394 -r1.395 rpmdb.c
  --- rpm/rpmdb/rpmdb.c 24 Dec 2010 14:31:06 -  1.394
  +++ rpm/rpmdb/rpmdb.c 27 Dec 2010 17:06:48 -  1.395
  @@ -2452,7 +2452,7 @@
}
   }
   else if (dbi  dbi-dbi_primary != NULL) {
  - /* XXX Special case #5: secondary ndex associated with primary table. */
  + /* XXX Special case #5: secondary index associated w primary table. */
   }
   else {
/* Common case: retrieve join keys. */
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_4: rpm/ devtool.conf

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 18:13:29
  Branch: rpm-5_4  Handle: 2010122717132800

  Modified files:   (Branch: rpm-5_4)
rpm devtool.conf

  Log:
- devtool: use popt external for now.

  Summary:
RevisionChanges Path
2.365.2.2   +1  -1  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.365.2.1 -r2.365.2.2 devtool.conf
  --- rpm/devtool.conf  6 Dec 2010 23:04:47 -   2.365.2.1
  +++ rpm/devtool.conf  27 Dec 2010 17:13:28 -  2.365.2.2
  @@ -116,7 +116,7 @@
   --with-attr \
   --with-acl \
   --without-xar \
  ---with-popt \
  +--with-popt=external \
   --with-keyutils \
   --with-pthreads \
   --with-libelf \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/ devtool.conf

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 18:14:00
  Branch: HEAD Handle: 2010122717135900

  Modified files:
rpm devtool.conf

  Log:
- devtool: use popt external for now.

  Summary:
RevisionChanges Path
2.368   +1  -1  rpm/devtool.conf
  

  patch -p0 '@@ .'
  Index: rpm/devtool.conf
  
  $ cvs diff -u -r2.367 -r2.368 devtool.conf
  --- rpm/devtool.conf  24 Dec 2010 14:22:25 -  2.367
  +++ rpm/devtool.conf  27 Dec 2010 17:13:59 -  2.368
  @@ -116,7 +116,7 @@
   --with-attr \
   --with-acl \
   --without-xar \
  ---with-popt \
  +--with-popt=external \
   --with-keyutils \
   --with-pthreads \
   --with-libelf \
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm-5_3: rpm/tests/ Makefile.am rpm/tests/ref/ manifest sho...

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 19:24:17
  Branch: rpm-5_3  Handle: 2010122718241601

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

  Log:
- tests: sanity.

  Summary:
RevisionChanges Path
1.63.2.53   +0  -2  rpm/tests/Makefile.am
1.14.2.4+3  -0  rpm/tests/ref/manifest
1.23.2.21   +88 -1  rpm/tests/ref/showrc
  

  patch -p0 '@@ .'
  Index: rpm/tests/Makefile.am
  
  $ cvs diff -u -r1.63.2.52 -r1.63.2.53 Makefile.am
  --- rpm/tests/Makefile.am 6 Nov 2010 00:50:22 -   1.63.2.52
  +++ rpm/tests/Makefile.am 27 Dec 2010 18:24:16 -  1.63.2.53
  @@ -776,8 +776,6 @@
@-${gsr} -c 'print(--   js: Use GPSEE!)'
@-${gsr} -f gpsee/gffi.js
   
  -#
  -
   check-convert:
@echo === $@ ===
case `rpm --version` in \
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/manifest
  
  $ cvs diff -u -r1.14.2.3 -r1.14.2.4 manifest
  --- rpm/tests/ref/manifest28 Apr 2010 13:29:11 -  1.14.2.3
  +++ rpm/tests/ref/manifest27 Dec 2010 18:24:17 -  1.14.2.4
  @@ -1,4 +1,5 @@
   cAos2-stub/cAos2-stub-1-0.noarch.rpm
  +config-test/config-test-1.2-0.1.noarch.rpm
   cudf-test/battery-3-0.noarch.rpm
   cudf-test/bicycle-7-0.noarch.rpm
   cudf-test/car-1-0.noarch.rpm
  @@ -35,6 +36,8 @@
   edos-test/window-0-0.noarch.rpm
   edos-test/window-1-0.noarch.rpm
   edos-test/window-2-0.noarch.rpm
  +order-test/orderA-1.2-0.1.noarch.rpm
  +order-test/orderB-1.2-0.1.noarch.rpm
   popt/popt-1.14-1.i686.rpm
   probes-test/probes-1-0.noarch.rpm
   probes-test/probes-2-0.noarch.rpm
  @@ .
  patch -p0 '@@ .'
  Index: rpm/tests/ref/showrc
  
  $ cvs diff -u -r1.23.2.20 -r1.23.2.21 showrc
  --- rpm/tests/ref/showrc  3 Dec 2010 15:03:44 -   1.23.2.20
  +++ rpm/tests/ref/showrc  27 Dec 2010 18:24:17 -  1.23.2.21
  @@ -189,6 +189,7 @@
   -14: __chmod /bin/chmod
   -14: __chown /bin/chown
   -14: __chroot%{_usrlibrpmbin}/chroot
  +-14: __cmake /usr/bin/cmake
   -14: __cp%{_usrlibrpmbin}/cp
   -14: __cpio  /bin/cpio
   -14: __cpp   gcc -E
  @@ -231,6 +232,7 @@
   -14: __find  %{_usrlibrpmbin}/find
   -14: __find_provides %{_rpmhome}/find-provides
   -14: __find_requires %{_rpmhome}/find-requires
  +-14: __gem_helper%{_usrlibrpm}/gem_helper.rb
   -14: __git   /usr/bin/git
   -14: __gpg   /usr/bin/gpg2
   -14: __gpg_check_password_cmd%{__gpg} 
  @@ -246,6 +248,8 @@
   -14: __id/usr/bin/id
   -14: __install   /usr/bin/install
   -14: __install_info  /sbin/install-info
  +-14: __java_provides %{_rpmhome}/javadeps.sh --provides
  +-14: __java_requires %{_rpmhome}/javadeps.sh --requires
   -14: __ld/usr/bin/ld
   -14: __ldconfig  /sbin/ldconfig
   -14: __libexta
  @@ -261,6 +265,8 @@
   -14: __mkdir /bin/mkdir
   -14: __mkdir_p   /bin/mkdir -p
   -14: __mongo /usr/bin/mongo
  +-14: __mono_provides %{_rpmhome}/mono-find-provides
  +-14: __mono_requires %{_rpmhome}/mono-find-requires
   -14: __mtree %{_usrlibrpmbin}/mtree
   -14: __mv/bin/mv
   -14: __nm/usr/bin/nm
  @@ -270,7 +276,11 @@
   -14: __os_install_post   %{___build_post}
   -14: __patch /usr/bin/patch
   -14: __pax   /usr/bin/pax
  +-14: __perl  /usr/bin/perl
  +-14: __perl_provides %{_rpmhome}/perl.prov
  +-14: __perl_requires %{_rpmhome}/perl.req
   -14: __pgp   %{_bindir}/pgp
  +-14: __php   /usr/bin/php
   -14: __pkgconfig_provides%{nil}
   -14: __pkgconfig_requires%{nil}
   -14: __policy_tree   %{expand:%%global __policy_tree %{lua:
  @@ -284,11 +294,15 @@
   end
   print (t)
   }}%{__policy_tree}
  +-14: __python/usr/bin/python
  +-14: __python_provides   %{_rpmhome}/pythondeps.sh --provides
  +-14: __python_requires   %{_rpmhome}/pythondeps.sh --requires
   -14: __ranlibranlib
   -14: __rc%{_usrlibrpmbin}/rc
   -14: __remsh %{__rsh}
   -14: __rm/bin/rm
   -14: __rsh   /usr/bin/rsh
  +-14: __ruby  /usr/lib/rpm/bin/ruby
   -14: __scriptlet_requires%{nil}
   -14: __sed   /bin/sed
   -14: __sh/bin/sh
  @@ -379,6 +393,7 @@
   -14: __strip /usr/bin/strip
   -14: __svn   /usr/bin/svn
   -14: __tar   /bin/tar
  +-14: __tclsh /usr/bin/tclsh
   -14: __unzip /usr/bin/unzip
   -14: __vcheck%{__perl} %{_rpmhome}/vcheck
   -14: __vsflags   0xf

[CVS] RPM: rpm-5_3: rpm/ rpm.spec.in

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 19:35:41
  Branch: rpm-5_3  Handle: 2010122718354100

  Modified files:   (Branch: rpm-5_3)
rpm rpm.spec.in

  Log:
- sanity.

  Summary:
RevisionChanges Path
2.456.4.5   +5  -12 rpm/rpm.spec.in
  

  patch -p0 '@@ .'
  Index: rpm/rpm.spec.in
  
  $ cvs diff -u -r2.456.4.4 -r2.456.4.5 rpm.spec.in
  --- rpm/rpm.spec.in   31 Oct 2010 18:54:56 -  2.456.4.4
  +++ rpm/rpm.spec.in   27 Dec 2010 18:35:41 -  2.456.4.5
  @@ -22,20 +22,14 @@
   Source0: http://rpm5.org/files/rpm/rpm-5.3/rpm-%{version}.tar.gz
   Source1: cpu-os-macros.tar.gz
   License: LGPL
  -Requires: fileutils shadow-utils
  +Requires: fileutils
  +Requires: shadow-utils
   Requires: getconf(GNU_LIBPTHREAD_VERSION) = NPTL
   
   # XXX necessary only to drag in /usr/lib/libelf.a, otherwise internal 
elfutils.
   BuildRequires: elfutils-libelf
   BuildRequires: elfutils-devel
   BuildRequires: zlib-devel
  -#BuildRequires: popt-devel = 1.15
  -
  -BuildRequires: beecrypt-devel = 4.1.2
  -Requires: beecrypt = 4.1.2
  -
  -BuildRequires: neon-devel
  -BuildRequires: sqlite-devel
   
   %if %{with_bzip2} == yes
   BuildRequires: bzip2-devel = 1.0
  @@ -237,7 +231,7 @@
   --with-attr \
   --with-acl \
   --without-xar \
  ---with-popt=internal \
  +--with-popt=external \
   $WITH_KEYUTILS \
   --with-pthreads \
   $WITH_LIBELF \
  @@ -331,7 +325,7 @@
   %endif
   
   # Get rid of unpackaged files
  -{ cd $RPM_BUILD_ROOT
  +cd $RPM_BUILD_ROOT
   
 rm -f 
.%{_rpmhome}/{Specfile.pm,cpanflute,cpanflute2,rpmdiff,rpmdiff.cgi,sql.prov,sql.req,tcl.req,trpm}
   
  @@ -372,7 +366,6 @@
   -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
 find .%{_libdir}/perl5 -type d -depth -exec rmdir {} 2/dev/null ';'
   %endif
  -}
   
   %clean
   rm -rf $RPM_BUILD_ROOT
  @@ -571,7 +564,7 @@
   %rpmattr %{_rpmhome}/pkgconfigdeps.sh
   %rpmattr %{_rpmhome}/pythondeps.sh
   
  -%rpmattr %{_rpmhome}/gem_helper.rb
  +#%rpmattr%{_rpmhome}/gem_helper.rb
   
   %rpmattr %{_rpmhome}/bin/debugedit
   %rpmattr %{_rpmhome}/bin/rpmcache
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org

[CVS] RPM: rpm/rpmio/auto/ desc.in types.in

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 23:04:36
  Branch: HEAD Handle: 2010122722043600

  Modified files:
rpm/rpmio/auto  desc.in types.in

  Log:
- ispras: rpmio: stub-in several additional objects.

  Summary:
RevisionChanges Path
1.4 +4  -4  rpm/rpmio/auto/desc.in
1.5 +84 -3  rpm/rpmio/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/desc.in
  
  $ cvs diff -u -r1.3 -r1.4 desc.in
  --- rpm/rpmio/auto/desc.in27 Dec 2010 17:01:44 -  1.3
  +++ rpm/rpmio/auto/desc.in27 Dec 2010 22:04:36 -  1.4
  @@ -34,7 +34,7 @@
 tar.h
   
   !-- bson.h FIXME: bson_malloc gets used. --
  -  mongo.h
  +!-- mongo.h --
   
 argv.h
 crc.h
  @@ -57,12 +57,12 @@
   !-- rpmcdsa.h --
   !-- rpmcpio.h --
   !-- rpmcudf.h --
  -!-- rpmcvs.h --
  +  rpmcvs.h
   !-- rpmdav.h --
 rpmdir.h
 rpmficl.h
 rpmgc.h
  -!-- rpmgit.h --
  +  rpmgit.h
 rpmhash.h
 rpmhkp.h
   !-- rpmhook.h --
  @@ -90,7 +90,7 @@
 rpmsql.h
 rpmsquirrel.h
 rpmssl.h
  -!-- rpmsvn.h --
  +  rpmsvn.h
 rpmsw.h
   !-- rpmsx.h --
 rpmsyck.h
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/types.in
  
  $ cvs diff -u -r1.4 -r1.5 types.in
  --- rpm/rpmio/auto/types.in   27 Dec 2010 17:01:44 -  1.4
  +++ rpm/rpmio/auto/types.in   27 Dec 2010 22:04:36 -  1.5
  @@ -15,10 +15,10 @@
   };
 /global_code
 init_code
  -poptContext optCon = rpmioInit(argc, argv, optionsTable);
  +poptContext con = rpmioInit(argc, argv, optionsTable);
 /init_code
 final_code
  -optCon = rpmioFini(optCon);
  +con = rpmioFini(con);
 /final_code
   /spec_type
   
  @@ -155,6 +155,9 @@
 /associating
   /spec_type
   
  +!-- bson.h FIXME: bson_malloc gets used. --
  +!-- mongo.h --
  +
   !-- ar.h --
   !-- cpio.h --
   !-- tar.h --
  @@ -663,6 +666,22 @@
   /spec_type
   --
   
  +!-- rpmcvs.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmcvs /data_type
  +  value rpmcvsNew(argv, 0) /value
  +  final_code $0 = rpmcvsFree($0); /final_code
  +  associating
  +except rpmcvsFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmcvs /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmdav.h --
   
   !-- rpmdir.h --
  @@ -746,12 +765,28 @@
   /spec_type
   spec_type
 kind common_retval /kind
  -  data_type hashTable /data_type
  +  data_type rpmficl /data_type
 constraint $0 != NULL /constraint
   /spec_type
   
   !-- rpmgc.h --
   
  +!-- rpmgit.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmgit /data_type
  +  value rpmgitNew(argv, 0) /value
  +  final_code $0 = rpmgitFree($0); /final_code
  +  associating
  +except rpmgitFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmgit /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmhash.h --
   spec_type
 kind common_param /kind
  @@ -1563,6 +1598,22 @@
   
   !-- rpmsq.h --
   
  +!-- rpmsql.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsql /data_type
  +  value rpmsqlNew(argv, 0) /value
  +  final_code $0 = rpmsqlFree($0); /final_code
  +  associating
  +except rpmsqlFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmsql /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmsquirrel.h --
   spec_type
 kind common_param /kind
  @@ -1581,6 +1632,22 @@
   
   !-- rpmssl.h --
   
  +!-- rpmsvn.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsvn /data_type
  +  value rpmsvnNew(argv, 0) /value
  +  final_code $0 = rpmsvnFree($0); /final_code
  +  associating
  +except rpmsvnFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmsvn /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmsw.h --
   spec_type
 kind common_param /kind
  @@ -1613,6 +1680,20 @@
   --
   
   !-- rpmsyck.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsyck /data_type
  +  value rpmsyckCreate() /value
  +  final_code $0 = rpmsyckFree($0); /final_code
  +  associating
  +except rpmsyckFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmsyck /data_type
  +

[CVS] RPM: rpm-5_4: rpm/rpmio/auto/ desc.in types.in

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 23:04:52
  Branch: rpm-5_4  Handle: 2010122722045200

  Modified files:   (Branch: rpm-5_4)
rpm/rpmio/auto  desc.in types.in

  Log:
- ispras: rpmio: stub-in several additional objects.

  Summary:
RevisionChanges Path
1.2.4.2 +4  -4  rpm/rpmio/auto/desc.in
1.3.4.2 +84 -3  rpm/rpmio/auto/types.in
  

  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/desc.in
  
  $ cvs diff -u -r1.2.4.1 -r1.2.4.2 desc.in
  --- rpm/rpmio/auto/desc.in25 Dec 2010 21:30:55 -  1.2.4.1
  +++ rpm/rpmio/auto/desc.in27 Dec 2010 22:04:52 -  1.2.4.2
  @@ -34,7 +34,7 @@
 tar.h
   
   !-- bson.h FIXME: bson_malloc gets used. --
  -  mongo.h
  +!-- mongo.h --
   
 argv.h
 crc.h
  @@ -57,12 +57,12 @@
   !-- rpmcdsa.h --
   !-- rpmcpio.h --
   !-- rpmcudf.h --
  -!-- rpmcvs.h --
  +  rpmcvs.h
   !-- rpmdav.h --
 rpmdir.h
 rpmficl.h
 rpmgc.h
  -!-- rpmgit.h --
  +  rpmgit.h
 rpmhash.h
 rpmhkp.h
   !-- rpmhook.h --
  @@ -90,7 +90,7 @@
 rpmsql.h
 rpmsquirrel.h
 rpmssl.h
  -!-- rpmsvn.h --
  +  rpmsvn.h
 rpmsw.h
   !-- rpmsx.h --
 rpmsyck.h
  @@ .
  patch -p0 '@@ .'
  Index: rpm/rpmio/auto/types.in
  
  $ cvs diff -u -r1.3.4.1 -r1.3.4.2 types.in
  --- rpm/rpmio/auto/types.in   25 Dec 2010 21:30:55 -  1.3.4.1
  +++ rpm/rpmio/auto/types.in   27 Dec 2010 22:04:52 -  1.3.4.2
  @@ -15,10 +15,10 @@
   };
 /global_code
 init_code
  -poptContext optCon = rpmioInit(argc, argv, optionsTable);
  +poptContext con = rpmioInit(argc, argv, optionsTable);
 /init_code
 final_code
  -optCon = rpmioFini(optCon);
  +con = rpmioFini(con);
 /final_code
   /spec_type
   
  @@ -155,6 +155,9 @@
 /associating
   /spec_type
   
  +!-- bson.h FIXME: bson_malloc gets used. --
  +!-- mongo.h --
  +
   !-- ar.h --
   !-- cpio.h --
   !-- tar.h --
  @@ -663,6 +666,22 @@
   /spec_type
   --
   
  +!-- rpmcvs.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmcvs /data_type
  +  value rpmcvsNew(argv, 0) /value
  +  final_code $0 = rpmcvsFree($0); /final_code
  +  associating
  +except rpmcvsFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmcvs /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmdav.h --
   
   !-- rpmdir.h --
  @@ -746,12 +765,28 @@
   /spec_type
   spec_type
 kind common_retval /kind
  -  data_type hashTable /data_type
  +  data_type rpmficl /data_type
 constraint $0 != NULL /constraint
   /spec_type
   
   !-- rpmgc.h --
   
  +!-- rpmgit.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmgit /data_type
  +  value rpmgitNew(argv, 0) /value
  +  final_code $0 = rpmgitFree($0); /final_code
  +  associating
  +except rpmgitFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmgit /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmhash.h --
   spec_type
 kind common_param /kind
  @@ -1563,6 +1598,22 @@
   
   !-- rpmsq.h --
   
  +!-- rpmsql.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsql /data_type
  +  value rpmsqlNew(argv, 0) /value
  +  final_code $0 = rpmsqlFree($0); /final_code
  +  associating
  +except rpmsqlFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmsql /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmsquirrel.h --
   spec_type
 kind common_param /kind
  @@ -1581,6 +1632,22 @@
   
   !-- rpmssl.h --
   
  +!-- rpmsvn.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsvn /data_type
  +  value rpmsvnNew(argv, 0) /value
  +  final_code $0 = rpmsvnFree($0); /final_code
  +  associating
  +except rpmsvnFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind common_retval /kind
  +  data_type rpmsvn /data_type
  +  constraint $0 != NULL /constraint
  +/spec_type
  +
   !-- rpmsw.h --
   spec_type
 kind common_param /kind
  @@ -1613,6 +1680,20 @@
   --
   
   !-- rpmsyck.h --
  +spec_type
  +  kind common_param /kind
  +  data_type rpmsyck /data_type
  +  value rpmsyckCreate() /value
  +  final_code $0 = rpmsyckFree($0); /final_code
  +  associating
  +except rpmsyckFree /except
  +  /associating
  +/spec_type
  +spec_type
  +  kind

[CVS] RPM: rpm-5_4: rpm/ CHANGES configure.ac

2010-12-27 Thread Jeff Johnson 
  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:   27-Dec-2010 23:05:46
  Branch: rpm-5_4  Handle: 2010122722054500

  Modified files:   (Branch: rpm-5_4)
rpm CHANGES configure.ac

  Log:
- 5.4.0 - 5.4.1.

  Summary:
RevisionChanges Path
1.3501.2.28 +2  -0  rpm/CHANGES
2.472.2.4   +1  -1  rpm/configure.ac
  

  patch -p0 '@@ .'
  Index: rpm/CHANGES
  
  $ cvs diff -u -r1.3501.2.27 -r1.3501.2.28 CHANGES
  --- rpm/CHANGES   27 Dec 2010 16:01:49 -  1.3501.2.27
  +++ rpm/CHANGES   27 Dec 2010 22:05:45 -  1.3501.2.28
  @@ -1,3 +1,5 @@
  +5.4.0 - 5.4.1:
  +
   5.3.7 - 5.4.0:
   - jbj: build: rescusictate the ISPRAS markup.
   - jbj: rpmlib: rescusictate the ISPRAS markup.
  @@ .
  patch -p0 '@@ .'
  Index: rpm/configure.ac
  
  $ cvs diff -u -r2.472.2.3 -r2.472.2.4 configure.ac
  --- rpm/configure.ac  25 Dec 2010 18:02:27 -  2.472.2.3
  +++ rpm/configure.ac  27 Dec 2010 22:05:45 -  2.472.2.4
  @@ -8,7 +8,7 @@
   
   AC_PREREQ(2.63)
   m4_define([PACKAGE_BUGREPORT_DEFAULT], [rpm-de...@rpm5.org])
  -AC_INIT([rpm],[5.4.0],[PACKAGE_BUGREPORT_DEFAULT])
  +AC_INIT([rpm],[5.4.1],[PACKAGE_BUGREPORT_DEFAULT])
   PACKAGE_TIMESTAMP=2010-12-06 dnl # [-MM[-DD[ HH[:MM
   AC_MSG_TITLE([RPM Package Manager (RPM)], [$PACKAGE_VERSION])
   
  @@ .
__
RPM Package Managerhttp://rpm5.org
CVS Sources Repositoryrpm-cvs@rpm5.org