rpms/rcs/devel rcs-5.7-newsvnsyntax.patch, NONE, 1.1 rcs.spec, 1.18, 1.19

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

Author: jmoskovc

Update of /cvs/extras/rpms/rcs/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12098

Modified Files:
	rcs.spec 
Added Files:
	rcs-5.7-newsvnsyntax.patch 
Log Message:
Fixed new SVN tag syntax.


rcs-5.7-newsvnsyntax.patch:

--- NEW FILE rcs-5.7-newsvnsyntax.patch ---
diff -rup rcs-5.7/src/ident.c rcs-5.7mzk/src/ident.c
--- rcs-5.7/src/ident.c	1995-06-16 08:19:24.000000000 +0200
+++ rcs-5.7mzk/src/ident.c	2007-07-17 15:23:15.000000000 +0200
@@ -228,12 +228,18 @@ match(fp)   /* group substring between t
    char line[BUFSIZ];
    register int c;
    register char * tp;
+   int COLON_C = 0;
+   int MAX_COLON = 1;
 
    tp = line;
-   while ((c = getc(fp)) != VDELIM) {
+   while ((c = getc(fp)) && (COLON_C < MAX_COLON)) {
       if (c == EOF  &&  feof(fp) | ferror(fp))
 	 return c;
       switch (ctab[c]) {
+     case COLON:
+                *tp++ = c;
+                COLON_C++;
+                break;
 	 case LETTER: case Letter:
 	    *tp++ = c;
 	    if (tp < line+sizeof(line)-4)
@@ -245,7 +251,12 @@ match(fp)   /* group substring between t
    }
    if (tp == line)
       return c;
-   *tp++ = c;
+      if(c == ' '){
+          ungetc(c,fp);
+      }
+      else{
+          *tp++ = c;
+      }
    if ((c = getc(fp)) != ' ')
       return c ? c : '\n';
    *tp++ = c;


Index: rcs.spec
===================================================================
RCS file: /cvs/extras/rpms/rcs/devel/rcs.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- rcs.spec	12 Jul 2006 07:57:51 -0000	1.18
+++ rcs.spec	21 Sep 2007 12:01:22 -0000	1.19
@@ -1,7 +1,7 @@
 Summary: Revision Control System (RCS) file version management tools.
 Name: rcs
 Version: 5.7
-Release: 30.1
+Release: 31
 License: GPL
 Group: Development/Tools
 URL: http://www.gnu.org/software/rcs/
@@ -10,6 +10,7 @@
 Patch1: rcs-5.7-security.patch
 Patch2: rcs-5.7-sameuserlocks.patch
 Patch3: rcs-5.7-option.patch
+Patch4: rcs-5.7-newsvnsyntax.patch
 Prefix: %{_prefix}
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: automake
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .security
 %patch2 -p1 -b .sameuserlocks
 %patch3 -p1 -b .option
+%patch4 -p1 -b .newsvnsyntax
 
 autoconf
 
@@ -56,6 +58,10 @@
 rm -rf ${RPM_BUILD_ROOT}
 
 %changelog
+* Tue Jul 17 2007 Jiri Moskovcak <jmoskovc at redhat.com> - 5.7-31
+- Addded support for new svn syntax.
+- Resolves: #247998
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 5.7-30.1
 - rebuild