rpms/clearsilver/F-7 clearsilver.spec, 1.10, 1.11 clearsilver-0.10.2-fedora.patch, 1.1, NONE

[Jeffrey C. Ollie (jcollie)]

Author: jcollie

Update of /cvs/extras/rpms/clearsilver/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2047

Modified Files:
	clearsilver.spec 
Removed Files:
	clearsilver-0.10.2-fedora.patch 
Log Message:
Cleanups, don't build java on EL-4


Index: clearsilver.spec
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/F-7/clearsilver.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- clearsilver.spec	12 Apr 2007 12:56:22 -0000	1.10
+++ clearsilver.spec	2 Jun 2007 02:32:45 -0000	1.11
@@ -2,7 +2,7 @@
 
 Name:           clearsilver
 Version:        0.10.4
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast and powerful HTML templating system
 Group:          Development/Libraries
 License:        Neotonic ClearSilver Software License
@@ -58,25 +58,21 @@
 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 
 %description -n ruby-%{name}
 %{summary}.
-%endif
 
-%ifarch %{ix86} ppc
+%if 0%{?rhel} > 4
 %package     -n java-%{name}
 Summary:        Java interface to the ClearSilver HTML templating system
 Group:          Development/Libraries
 BuildRequires:  java-devel
 Provides:       %{name}-java = %{version}-%{release}
-%endif
 
-%ifarch %{ix86} ppc 
 %description -n java-%{name}
 %{summary}.
 %endif
+%endif
 
 %prep
 %setup -q
@@ -90,7 +86,9 @@
 # java and ruby does not build on x86_64
 %ifarch %{ix86} ppc 
 %configure \
+%if 0%{?rhel} > 4
   --with-java=%{_libdir}/jvm/java \
+%endif
   --with-python=%{__python} \
   --disable-csharp 
 %else
@@ -113,6 +111,7 @@
 chmod -R u+w $RPM_BUILD_ROOT/*
 
 %ifarch %{ix86} ppc 
+%if 0%{?rhel} > 4
 install -dm 755 $RPM_BUILD_ROOT%{_libdir}/java
 mv $RPM_BUILD_ROOT%{_libdir}{,/java}/libclearsilver-jni.so
 mv $RPM_BUILD_ROOT%{_libdir}/clearsilver.jar \
@@ -120,6 +119,7 @@
 chmod 644 $RPM_BUILD_ROOT%{_libdir}/java/clearsilver-%{version}.jar
 ln -s clearsilver-%{version}.jar $RPM_BUILD_ROOT%{_libdir}/java/clearsilver.jar
 %endif
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -156,16 +156,22 @@
 %defattr(-,root,root,-)
 %{ruby_sitearchdir}/hdf.so
 %{ruby_sitelibdir}/neo.rb
-%endif
 
-%ifarch %{ix86} ppc 
+%if 0%{?rhel} > 4
 %files -n java-clearsilver
 %doc CS_LICENSE LICENSE
 %defattr(-,root,root,-)
 %{_libdir}/java/*clearsilver*
 %endif
+%endif
 
 %changelog
+* Fri Jun 01 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.4-4
+- Minor cleanups
+
+* Fri Jun 01 2007 Jesse Keating <jkeating at redhat.com> - 0.10.4-3.1
+- Disable java subpackages on el4
+
 * Thu Apr 12 2007 Jeffrey C. Ollie <jeff at ocjtech.us> - 0.10.4-3
 - Remove bogus -devel provides.
 


--- clearsilver-0.10.2-fedora.patch DELETED ---