rpms/clearsilver/FC-5 .cvsignore, 1.3, 1.4 clearsilver.spec, 1.4, 1.5 sources, 1.3, 1.4

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

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

Modified Files:
	.cvsignore clearsilver.spec sources 
Log Message:
Sync with devel.


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/FC-5/.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 16:18:25 -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-5/clearsilver.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- clearsilver.spec	17 Mar 2006 18:08:17 -0000	1.4
+++ clearsilver.spec	12 Apr 2007 16:18:25 -0000	1.5
@@ -1,7 +1,7 @@
 %{!?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
+Version:        0.10.4
 Release:        3%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
@@ -9,9 +9,10 @@
 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
@@ -56,6 +57,8 @@
 BuildRequires:  ruby
 BuildRequires:  ruby-devel
 Provides:       %{name}-ruby = %{version}-%{release}
+%define ruby_sitearchdir %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')
+%define ruby_sitelibdir  %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')
 %endif
 
 %ifarch %{ix86} ppc 
@@ -79,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
@@ -125,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
@@ -151,8 +156,8 @@
 %files -n ruby-clearsilver
 %doc CS_LICENSE LICENSE
 %defattr(-,root,root,-)
-%{_libdir}/site_ruby/*/*/hdf.so
-%{_libdir}/site_ruby/*/neo.rb
+%{ruby_sitearchdir}/hdf.so
+%{ruby_sitelibdir}/neo.rb
 %endif
 
 %ifarch %{ix86} ppc 
@@ -163,6 +168,25 @@
 %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
+
+* Thu Jun  1 2006 Paul Howarth <paul at city-fan.org> - 0.10.3-4
+- ruby subpackage fix: use ruby_sitearchdir and ruby_sitelibdir
+
 * Fri Mar 17 2006 Joost Soeterbroek <fedora at soeterbroek.com> - 0.10.3-3
 - fix for x86_64
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/FC-5/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 16:18:25 -0000	1.4
@@ -1 +1 @@
-ff4104b0e58bca1b61d528edbd902769  clearsilver-0.10.3.tar.gz
+9523df7ef17e41a01dbae5032a3e450b  clearsilver-0.10.4.tar.gz