diff --git a/jdom.spec b/jdom.spec index 60fb4ad..6000e8f 100644 --- a/jdom.spec +++ b/jdom.spec @@ -2,7 +2,7 @@ Name: jdom Version: 1.0 -Release: 1jpp_3fc +Release: 1jpp_4fc Epoch: 0 Summary: Java alternative to DOM and SAX License: Apache Software License-like @@ -15,7 +15,11 @@ BuildRequires: jpackage-utils >= 0:1.5 BuildRequires: java-javadoc BuildRequires: ant BuildRequires: xalan-j2 >= 0:2.2.0 -BuildArch: noarch + +# libgcj aot-compiled native libraries +BuildRequires: java-gcj-compat-devel >= 1.0.35 +Requires(post): java-gcj-compat >= 1.0.31 +Requires(postun): java-gcj-compat >= 1.0.31 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot %description @@ -74,19 +78,32 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name} cp -pr samples $RPM_BUILD_ROOT%{_datadir}/%{name} +aot-compile-rpm %clean rm -rf $RPM_BUILD_ROOT +%post +/usr/bin/rebuild-gcj-db %{_libdir} + +%postun +/usr/bin/rebuild-gcj-db %{_libdir} + +%post demo +/usr/bin/rebuild-gcj-db %{_libdir} + +%postun demo +/usr/bin/rebuild-gcj-db %{_libdir} %post javadoc rm -f %{_javadocdir}/%{name} ln -s %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(0644,root,root,0755) %doc CHANGES.txt COMMITTERS.txt LICENSE.txt README.txt TODO.txt +%dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %{_javadir}/%{name}*.jar %files javadoc @@ -96,10 +113,15 @@ ln -s %{name}-%{version} %{_javadocdir}/%{name} %files demo %defattr(0644,root,root,0755) +%dir %{_libdir}/gcj/%{name} +%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-%{version}.jar.* %{_datadir}/%{name} %changelog +* Wed Jun 7 2006 Deepak Bhole - 0:1.0-1jpp_4fc +- Build natively + * Mon Mar 6 2006 Jeremy Katz - 0:1.0-1jpp_3fc - stop scriptlet spew