rpms/clearsilver/devel clearsilver-0.10.5-regression.patch, NONE, 1.1 clearsilver.spec, 1.17, 1.18

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/pkgs/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10241

Modified Files:
	clearsilver.spec 
Added Files:
	clearsilver-0.10.5-regression.patch 
Log Message:
* Mon Apr 14 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.5-4
- Add patch from Kevin Kofler to fix build failures.


clearsilver-0.10.5-regression.patch:

--- NEW FILE clearsilver-0.10.5-regression.patch ---
diff -ur clearsilver-0.10.5/cs/csparse.c clearsilver-0.10.5-option3/cs/csparse.c
--- clearsilver-0.10.5/cs/csparse.c	2007-07-12 04:37:34.000000000 +0200
+++ clearsilver-0.10.5-option3/cs/csparse.c	2008-04-14 18:55:58.000000000 +0200
@@ -3717,7 +3717,7 @@
   if (val.op_type & (CS_TYPE_VAR | CS_TYPE_STRING))
   {
     char *s = arg_eval(parse, &val);
-    if (s) result->n = ne_crc((unsigned char *)s, strlen(s));
+    if (s) result->n = (int) ne_crc((unsigned char *)s, strlen(s));
   }
   if (val.alloc) free(val.s);
   return STATUS_OK;


Index: clearsilver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clearsilver/devel/clearsilver.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- clearsilver.spec	7 Mar 2008 01:51:58 -0000	1.17
+++ clearsilver.spec	14 Apr 2008 17:15:21 -0000	1.18
@@ -2,7 +2,7 @@
 
 Name:           clearsilver
 Version:        0.10.5
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 # Technically, the license is "Neotonic ClearSilver", but it is a copy of 
@@ -11,6 +11,7 @@
 URL:            http://www.clearsilver.net/
 Source0:        http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
 Patch0:         clearsilver-0.10.5-fedora.patch
+Patch1:		clearsilver-0.10.5-regression.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
 BuildRequires:  httpd-devel
@@ -82,6 +83,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 touch configure
 sed -i 's|/neo/opt/bin/python|%{__python}|' python/examples/*/*.py
 sed -i 's|PYTHON_SITE = @PYTHON_SITE@|PYTHON_SITE = %{python_sitearch}|' rules.mk.in
@@ -171,6 +173,9 @@
 %endif
 
 %changelog
+* Mon Apr 14 2008 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.5-4
+- Add patch from Kevin Kofler to fix build failures.
+
 * Thu Mar 06 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 0.10.5-3
 Rebuild for new perl