rpms/gob2/devel gob2-remove_sep.patch,NONE,1.1 gob2.spec,1.22,1.23

[Daniel Novotny]

Author: dnovotny

Update of /cvs/extras/rpms/gob2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3443

Modified Files:
	gob2.spec 
Added Files:
	gob2-remove_sep.patch 
Log Message:
- fix #519108 class and enum names convert incorrectly in mock / koji.


gob2-remove_sep.patch:
 util.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

--- NEW FILE gob2-remove_sep.patch ---
diff -up ./src/util.c.orig ./src/util.c
--- gob2-2.0.16/src/util.c.orig	2009-11-24 13:20:39.000000000 +1000
+++ gob2-2.0.16/src/util.c	2009-11-24 13:35:54.000000000 +1000
@@ -81,13 +81,17 @@ remove_sep(const char *base)
 {
 	char *p;
 	char *s = g_strdup(base);
+	char *q=s;
 
 	/* don't eat C++ :: thingies */
 	if (for_cpp && strstr (s, "::") != NULL)
 		return s;
 
-	while((p = strchr(s, ':')))
-		strcpy(p, p+1);
+	for(p=(char *)base;*p;p++){
+		if (*p!=':')
+			*q++=*p;
+	}
+	*q='\0';
 	return s;
 }
 


Index: gob2.spec
===================================================================
RCS file: /cvs/extras/rpms/gob2/devel/gob2.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- gob2.spec	25 Jul 2009 01:00:50 -0000	1.22
+++ gob2.spec	24 Nov 2009 10:57:10 -0000	1.23
@@ -1,7 +1,7 @@
 Summary: The GObject Builder
 Name: gob2
 Version: 2.0.16
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 Group: Development/Tools
 Source: gob2-%{version}.tar.gz
@@ -9,6 +9,7 @@ Url: http://www.5z.com/jirka/gob.html
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: glib2-devel 
 BuildRequires: bison flex
+Patch0: gob2-remove_sep.patch
 
 %description
 GOB is a simple preprocessor for making GObject objects (glib objects).
@@ -18,6 +19,7 @@ by java and yacc.  It supports generatin
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure 
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/aclocal/*
 
 %changelog
+* Tue Nov 24 2009 Daniel Novotny <dnovotny at redhat.com> 2.0.16-3
+- fix #519108 class and enum names convert incorrectly in mock / koji.
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.16-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild