rpms/clearsilver/EL-5 clearsilver.spec,1.7,1.8
Jeffrey C. Ollie (jcollie)
fedora-extras-commits at redhat.com
Sat Jun 2 05:14:47 UTC 2007
Author: jcollie
Update of /cvs/extras/rpms/clearsilver/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16793
Modified Files:
clearsilver.spec
Log Message:
Minor cleanups.
Index: clearsilver.spec
===================================================================
RCS file: /cvs/extras/rpms/clearsilver/EL-5/clearsilver.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- clearsilver.spec 12 Apr 2007 14:40:51 -0000 1.7
+++ clearsilver.spec 2 Jun 2007 05:14:07 -0000 1.8
@@ -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
@@ -59,25 +59,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
@@ -92,7 +88,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
@@ -115,6 +113,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 \
@@ -122,6 +121,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
@@ -158,9 +158,8 @@
%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,-)
@@ -168,6 +167,12 @@
%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.
- Skip java tests - seems to have some bugs.
More information about the fedora-extras-commits
mailing list