RPM Package Manager, CVS Repository
http://rpm5.org/cvs/
____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson
Root: /v/rpm/cvs Email: [EMAIL PROTECTED]
Module: rpm Date: 21-Nov-2007 14:31:37
Branch: HEAD Handle: 2007112113313700
Modified files:
rpm CHANGES TODO
rpm/build rpmbuild.h
Log:
- jbj: revert "rebase rpmParseState_e +256", more than rebasing needs
doing.
Summary:
Revision Changes Path
1.1861 +1 -0 rpm/CHANGES
1.22 +4 -0 rpm/TODO
2.78 +1 -1 rpm/build/rpmbuild.h
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1860 -r1.1861 CHANGES
--- rpm/CHANGES 21 Nov 2007 00:25:03 -0000 1.1860
+++ rpm/CHANGES 21 Nov 2007 13:31:37 -0000 1.1861
@@ -1,4 +1,5 @@
5.0a2 -> 5.0a3:
+ - jbj: revert "rebase rpmParseState_e +256", more than rebasing needs
doing.
- jbj: convert+remove headerRead() from the API, use rpmpkgRead instead.
- jbj: rebase rpmParseState_e +256 to permit rpmRC to be returned too.
- jbj: remove headerWrite() from the public API, use rpmpkgWrite instead.
@@ .
patch -p0 <<'@@ .'
Index: rpm/TODO
============================================================================
$ cvs diff -u -r1.21 -r1.22 TODO
--- rpm/TODO 20 Nov 2007 23:50:55 -0000 1.21
+++ rpm/TODO 21 Nov 2007 13:31:37 -0000 1.22
@@ -63,6 +63,10 @@
"works", but not same FC8 package converted using txar and FC8 pubkey
verify.
- jbj: check that rpmbuild --sign is functional, or eliminate the option.
+ - jbj: parsing error paths (like missing source or patch file) are
+ returning rpmRC in some cases now, with accidental collision with
+ PART_FOO values that drive the spec file parser. Renumbering enum
+ rpmParseState to avoid the collisions should fix most of the problem.
- jbj: choose between db-4.5.20 and db-4.6.18. db-4.5.20 may have fewer
upgrade/downgrade issues because of the db-4.6.18 DB_HASH change,
but rpm-5.0 already uses DB_BTREE for Packages.
@@ .
patch -p0 <<'@@ .'
Index: rpm/build/rpmbuild.h
============================================================================
$ cvs diff -u -r2.77 -r2.78 rpmbuild.h
--- rpm/build/rpmbuild.h 20 Nov 2007 23:50:56 -0000 2.77
+++ rpm/build/rpmbuild.h 21 Nov 2007 13:31:37 -0000 2.78
@@ -47,7 +47,7 @@
/** \ingroup rpmbuild
* Spec file parser states.
*/
-#define PART_BASE 256
+#define PART_BASE 0
typedef enum rpmParseState_e {
PART_NONE = 0+PART_BASE, /*!< */
PART_PREAMBLE = 1+PART_BASE, /*!< */
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
