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: 06-Jul-2007 19:54:56
Branch: HEAD Handle: 2007070618545600
Modified files:
rpm CHANGES
Log:
oops.
Summary:
Revision Changes Path
1.1436 +0 -3 rpm/CHANGES
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: rpm/CHANGES
============================================================================
$ cvs diff -u -r1.1435 -r1.1436 CHANGES
--- rpm/CHANGES 6 Jul 2007 17:54:21 -0000 1.1435
+++ rpm/CHANGES 6 Jul 2007 17:54:56 -0000 1.1436
@@ -1,10 +1,7 @@
4.5 -> 5.0:
-<<<<<<< CHANGES
- jbj: generate per-platform macros for major CPU-linux platforms.
-=======
- mgh: Stop the python module from using rpmrc files
- mgh: Change python configuration to allow for --with-python 2.x, 2.4
or 2.5. (no value will scan as it previously did)
->>>>>>> 1.1434
- jbj: parameterize upgrade/obsoletes tag. Panu's Big Mistake imho.
- jbj: reset errno to 0 in rpmgiOpen to eliminate false ENOENT failure.
- rse: do not build and install NLS data under po/ at all in case of
--disable-nls
@@ .
______________________________________________________________________
RPM Package Manager http://rpm5.org
CVS Sources Repository rpm-cvs@rpm5.org
