rpms/cvs/F-8 cvs-1.11.22-diff-rm-try2.patch, NONE, 1.1 cvs.spec, 1.58, 1.59

[Jiří Moskovčák (jmoskovc)]

Author: jmoskovc

Update of /cvs/extras/rpms/cvs/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23239

Modified Files:
	cvs.spec 
Added Files:
	cvs-1.11.22-diff-rm-try2.patch 
Log Message:
Rewritten diff-rm patch to make cvsspam work right. rhbz#447595


cvs-1.11.22-diff-rm-try2.patch:

--- NEW FILE cvs-1.11.22-diff-rm-try2.patch ---
--- cvs-1.11.22/src/rcs.c	2008-05-28 16:11:44.000000000 +0200
+++ cvs-1.11.22/src/rcs.c.old	2008-05-28 16:11:55.000000000 +0200
@@ -5750,6 +5750,11 @@
 
 	if (rev2 != NULL)
 	{
+      //We sholdn't ask for '-' rev, but we do if we locally remove file and then ask for -r BASE
+        if(rev1[0] == '-')
+            rev1++;
+        if(rev2[0] == '-')
+            rev2++;
 	    /* Open & cache rev1 */
 	    tmpfile = cvs_temp_name();
 	    if (RCS_checkout (rcs, NULL, rev1, NULL, options, tmpfile,


Index: cvs.spec
===================================================================
RCS file: /cvs/extras/rpms/cvs/F-8/cvs.spec,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- cvs.spec	17 Sep 2007 15:04:20 -0000	1.58
+++ cvs.spec	5 Jun 2008 15:59:43 -0000	1.59
@@ -6,7 +6,7 @@
 Summary: A version control system
 Name: cvs
 Version: 1.11.22
-Release: 12%{?dist}
+Release: 13%{?dist}
 License: GPL
 Group: Development/Tools
 Source0: ftp://ftp.gnu.org/non-gnu/cvs/source/stable/%{version}/cvs-%{version}.tar.bz2
@@ -43,7 +43,7 @@
 Patch15: cvs-1.11.21-sort.patch
 Patch16: cvs-1.11.22-free.patch
 Patch17: cvs-1.11.22-ipv6-proxy.patch
-Patch18: cvs-1.11.22-diff-rm.patch
+Patch18: cvs-1.11.22-diff-rm-try2.patch
 
 
 %description
@@ -83,7 +83,7 @@
 %patch15 -p1 -b .env
 %patch16 -p1 -b .free
 %patch17 -p1 -b .ipv6
-%patch18 -p1 -b .diff-rm
+#%patch18 -p1 -b .diff-rm-try2
 
 # Apply a patch to the generated files, OR
 # run autoreconf and require autoconf >= 2.58, automake >= 1.7.9
@@ -161,6 +161,11 @@
 %{_sysconfdir}/profile.d/*
 
 %changelog
+* Wed May 28 2008 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22.13
+- rewritten diff-rm patch - fixes diffing locally removed file 
+  doesn't confuse cvsspam
+- Resolves: #447595
+
 * Mon Sep 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 1.11.22-12
 - rewriten previous patch when trying to diff  removed files
 - Resolves: #277501, #242049