rpms/clearsilver/devel clearsilver-0.10.5-fedora.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 clearsilver.spec, 1.14, 1.15 sources, 1.4, 1.5 clearsilver-0.10.2-fedora.patch, 1.1, NONE
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Wed Aug 29 04:02:31 UTC 2007
Author: jcollie
Update of /cvs/pkgs/rpms/clearsilver/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3728
Modified Files:
.cvsignore clearsilver.spec sources
Added Files:
clearsilver-0.10.5-fedora.patch
Removed Files:
clearsilver-0.10.2-fedora.patch
Log Message:
Update to 0.10.5
clearsilver-0.10.5-fedora.patch:
--- NEW FILE clearsilver-0.10.5-fedora.patch ---
diff --git a/cgi/cgi.c b/cgi/cgi.c
index 5be9afe..5c8cf8d 100644
--- a/cgi/cgi.c
+++ b/cgi/cgi.c
@@ -503,7 +503,7 @@ static void _launch_debugger (CGI *cgi, char *display)
if ((debugger = hdf_get_value (cgi->hdf, "Config.Debugger", NULL)) == NULL)
{
- debugger = "/usr/local/bin/sudo /usr/local/bin/ddd -display %s %s %d";
+ debugger = "/usr/bin/sudo /usr/local/bin/ddd -display %s %s %d";
}
if (!pid)
diff --git a/configure b/configure
index 8fc6a50..e49342e 100755
--- a/configure
+++ b/configure
@@ -6513,7 +6513,7 @@ if test $cs_cv_python = yes; then
echo $ECHO_N "checking for python includes... $ECHO_C" >&6
python_inc=no
python_lib=no
- python_search_path="/neo/opt /usr/local /usr /c"
+ python_search_path="/usr"
python_versions="2.4 2.3 2.2 2.1 2.0 1.5 24 23 22 21 20 15"
if test $cs_cv_python_path != "no" -a -x $cs_cv_python_path; then
python_bin=$cs_cv_python_path
@@ -6809,7 +6809,8 @@ echo "${ECHO_T}$_cur" >&6
done
_ACJNI_FOLLOWED="$_cur"
-_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+#_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[^/]*$::'`
+_JTOPDIR="$java_path"
case "$host_os" in
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[^/]*$::'`
_JINC="$_JTOPDIR/Headers";;
diff --git a/imd/imdm.py b/imd/imdm.py
index 442c1ee..c23f590 100755
--- a/imd/imdm.py
+++ b/imd/imdm.py
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/python
#
# imdm
#
diff --git a/java-jni/Makefile b/java-jni/Makefile
index 390bdf5..f6edba5 100644
--- a/java-jni/Makefile
+++ b/java-jni/Makefile
@@ -40,14 +40,14 @@ org_clearsilver_HDF.h: $(NEO_UTIL_JAVA_JAR)
org_clearsilver_CS.h: $(NEO_UTIL_JAVA_JAR)
$(JAVAH) -classpath $(NEO_UTIL_JAVA_JAR) -jni org.clearsilver.CS
-CSTest.class: CSTest.java
+CSTest.class: CSTest.java $(NEO_UTIL_JAVA_JAR)
$(JAVAC) -classpath $(NEO_UTIL_JAVA_JAR) CSTest.java
gold: CSTest.class
@/bin/sh -c "LD_LIBRARY_PATH=$(NEOTONIC_ROOT)/java-jni; export LD_LIBRARY_PATH; CLASSPATH=$(NEO_UTIL_JAVA_JAR):.; export CLASSPATH; $(JAVA_PATH)/bin/java CSTest" > javatest.gold
@echo "Generated gold files"
-test: CSTest.class
+test: CSTest.class $(NEO_UTIL_SO)
@echo "Running java test"
@failed=0; \
rm -f javatest.out; \
diff --git a/ruby/Makefile b/ruby/Makefile
index a8a82bf..02cf557 100644
--- a/ruby/Makefile
+++ b/ruby/Makefile
@@ -41,7 +41,7 @@ testrb: ext/hdf/hdf.so
install: all
- $(RUBY) install.rb install
+ $(RUBY) install.rb install --prefix=$(DESTDIR)
clean:
$(RM) ext/hdf/*.o ext/hdf/*.so
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/clearsilver/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore 28 Mar 2007 20:35:28 -0000 1.4
+++ .cvsignore 29 Aug 2007 04:01:58 -0000 1.5
@@ -1 +1 @@
-clearsilver-0.10.4.tar.gz
+clearsilver-0.10.5.tar.gz
Index: clearsilver.spec
===================================================================
RCS file: /cvs/pkgs/rpms/clearsilver/devel/clearsilver.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- clearsilver.spec 4 Jun 2007 14:21:24 -0000 1.14
+++ clearsilver.spec 29 Aug 2007 04:01:58 -0000 1.15
@@ -1,14 +1,14 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: clearsilver
-Version: 0.10.4
-Release: 5%{?dist}
+Version: 0.10.5
+Release: 1%{?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
+Patch0: clearsilver-0.10.5-fedora.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: zlib-devel
BuildRequires: httpd-devel
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/clearsilver/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources 28 Mar 2007 20:35:28 -0000 1.4
+++ sources 29 Aug 2007 04:01:58 -0000 1.5
@@ -1 +1 @@
-9523df7ef17e41a01dbae5032a3e450b clearsilver-0.10.4.tar.gz
+b8c0c7fbe0ef5e06e0c935f134304d44 clearsilver-0.10.5.tar.gz
--- clearsilver-0.10.2-fedora.patch DELETED ---
More information about the fedora-extras-commits
mailing list