rpms/clearsilver/FC-6 clearsilver-0.10.4-nojavatest.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 clearsilver.spec, 1.6, 1.7 sources, 1.3, 1.4

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/clearsilver/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1003

Modified Files:
	.cvsignore clearsilver.spec sources 
Added Files:
	clearsilver-0.10.4-nojavatest.patch 
Log Message:
Sync with devel.

clearsilver-0.10.4-nojavatest.patch:

--- NEW FILE clearsilver-0.10.4-nojavatest.patch ---
diff --git a/java-jni/Makefile b/java-jni/Makefile
index bc07ab4..dad9c93 100644
--- a/java-jni/Makefile
+++ b/java-jni/Makefile
@@ -23,7 +23,7 @@ LDFLAGS += -Wl,-soname=$(NEO_UTIL_SO)
 
 TARGETS = org_clearsilver_HDF.h org_clearsilver_CS.h $(NEO_UTIL_SO)
 
-all: $(TARGETS) test
+all: $(TARGETS)
 
 $(NEO_UTIL_JAVA_JAR): $(NEO_UTIL_JAVA_SRC)
 	$(JAVAC) $(NEO_UTIL_JAVA_SRC)


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/FC-6/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore	13 Mar 2006 18:36:56 -0000	1.3
+++ .cvsignore	12 Apr 2007 14:40:51 -0000	1.4
@@ -1 +1 @@
-clearsilver-0.10.3.tar.gz
+clearsilver-0.10.4.tar.gz


Index: clearsilver.spec
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/FC-6/clearsilver.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- clearsilver.spec	28 Aug 2006 17:15:52 -0000	1.6
+++ clearsilver.spec	12 Apr 2007 14:40:51 -0000	1.7
@@ -1,17 +1,18 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           clearsilver
-Version:        0.10.3
-Release:        5%{?dist}
+Version:        0.10.4
+Release:        3%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 License:        Neotonic ClearSilver Software License
 URL:            http://www.clearsilver.net/
 Source0:        http://www.clearsilver.net/downloads/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.10.3-fedora.patch
+Patch1:         %{name}-0.10.4-nojavatest.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  zlib-devel
-Provides:       %{name}-devel = %{version}-%{release}
+BuildRequires:  httpd-devel
 
 %description
 ClearSilver is a fast, powerful, and language-neutral HTML template
@@ -81,6 +82,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
@@ -127,8 +129,9 @@
 %files
 %defattr(-,root,root,-)
 %doc CS_LICENSE INSTALL LICENSE README
+%{_bindir}/cs
 %{_bindir}/cstest
-%{_bindir}/static.cgi
+%{_bindir}/cs_static.cgi
 %{_mandir}/man3/*
 
 %files devel
@@ -165,6 +168,19 @@
 %endif
 
 %changelog
+* Thu Apr 12 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.4-3
+- Remove bogus -devel provides.
+- Skip java tests - seems to have some bugs.
+
+* Wed Mar 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.4-2
+- Bump release.
+
+* Wed Mar 28 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.4-1
+- Update to 0.10.4
+
+* Sat Dec  9 2006 Joost Soeterbroek <joost.soeterbroek at gmail.com> - 0.10.3-5
+- Rebuild for python 2.5 
+
 * Mon Aug 28 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.3-4
 - Rebuild for Fedora Extras 6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/FC-6/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	13 Mar 2006 18:33:03 -0000	1.3
+++ sources	12 Apr 2007 14:40:51 -0000	1.4
@@ -1 +1 @@
-ff4104b0e58bca1b61d528edbd902769  clearsilver-0.10.3.tar.gz
+9523df7ef17e41a01dbae5032a3e450b  clearsilver-0.10.4.tar.gz