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:
Revision Changes 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 -0000 1.3524
+++ rpm/CHANGES 27 Dec 2010 15:13:02 -0000 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 -0000 1.1
+++ rpm/lib/auto/.cvsignore 27 Dec 2010 15:13:03 -0000 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 -0000 1.2
+++ rpm/lib/auto/Makefile.am 27 Dec 2010 15:13:03 -0000 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 -0000 1.2
+++ rpm/lib/auto/desc.in 27 Dec 2010 15:13:03 -0000 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 -0000 1.3
+++ rpm/lib/auto/types.in 27 Dec 2010 15:13:03 -0000 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', POPT_ARG_INCLUDE_TABLE, rpmcliAllPoptTable, 0,
+ "Common options for all rpmio executables:", NULL },
+ POPT_AUTOHELP
+ POPT_TABLEEND
+ };
+ </global_code>
+ <init_code>
+ poptContext con = rpmcliInit(argc, argv, optionsTable);
+ </init_code>
+ <final_code>
+ con = rpmcliFini(con);
+ </final_code>
+</spec_type>
+
<!-- rpmio/argv.h -->
<spec_type>
<kind> common_param </kind>
@@ -89,7 +110,7 @@
</associating>
</spec_type>
-<!-- rpmio/rpmhash.h -->
+<!-- rpmio/rpmhash.h XXX DELETE?
<spec_type>
<kind> common_param </kind>
<data_type> hashTable </data_type>
@@ -106,6 +127,7 @@
#endif
</final_code>
</spec_type>
+-->
<!-- rpmio/rpmio.h -->
<spec_type>
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
