SPECS: rpm.spec - get back old fileconflicts behaviour, release 0.3.

[pluto]

Author: pluto                        Date: Wed Dec 28 03:06:40 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- get back old fileconflicts behaviour, release 0.3.

---- Files affected:
SPECS:
   rpm.spec (1.722 -> 1.723) 

---- Diffs:

================================================================
Index: SPECS/rpm.spec
diff -u SPECS/rpm.spec:1.722 SPECS/rpm.spec:1.723
--- SPECS/rpm.spec:1.722	Fri Dec 16 01:01:05 2005
+++ SPECS/rpm.spec	Wed Dec 28 04:06:35 2005
@@ -30,7 +30,7 @@
 Name:		rpm
 %define	sover	4.4
 Version:	4.4.4
-Release:	0.2
+Release:	0.3
 License:	GPL
 Group:		Base
 Source0:	ftp://jbj.org/pub/rpm-4.4.x/%{name}-%{version}.tar.gz
@@ -97,7 +97,7 @@
 Patch39:	%{name}-pythondeps.patch
 Patch40:	%{name}-print-requires.patch
 Patch41:	%{name}-reduce-stack-usage.patch
-
+Patch42:	%{name}-old-fileconflicts-behaviour.patch
 Patch43:	%{name}-patch-quote.patch
 Patch44:	%{name}-no-neon.patch
 Patch45:	%{name}-no-sqlite.patch
@@ -672,10 +672,12 @@
 %patch39 -p1
 %patch40 -p1
 %patch41 -p1
+%patch42 -p1
 %patch43 -p1
 %{!?with_neon:%patch44 -p1}
 %patch45 -p1
 %patch46 -p1
+
 %patch48 -p1
 %patch49 -p1
 %patch50 -p1
@@ -1148,6 +1150,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.723  2005/12/28 03:06:35  pluto
+- get back old fileconflicts behaviour, release 0.3.
+
 Revision 1.722  2005/12/16 00:01:05  qboosh
 - added empty-rpmlock-path patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/rpm.spec?r1=1.722&r2=1.723&f=u