rpms/xml-commons-resolver/devel xml-commons-resolver.spec, 1.12, 1.13

[fedora-cvs-commits at redhat.com]

Author: dbhole

Update of /cvs/dist/rpms/xml-commons-resolver/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv11217

Modified Files:
	xml-commons-resolver.spec 
Log Message:

Added conditional native compilation.




Index: xml-commons-resolver.spec
===================================================================
RCS file: /cvs/dist/rpms/xml-commons-resolver/devel/xml-commons-resolver.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xml-commons-resolver.spec	12 Jul 2006 08:54:30 -0000	1.12
+++ xml-commons-resolver.spec	21 Jul 2006 22:44:34 -0000	1.13
@@ -1,11 +1,13 @@
-%define name		xml-commons-resolver
-%define version         1.1
-%define release 	1jpp_9fc
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           xml-commons-resolver
+Version:        1.1
+Release: 	    1jpp_10fc
 Epoch:          0
 Summary:        Resolver subproject of xml-commons.
 License:        Apache Software License
@@ -21,9 +23,17 @@
 #BuildRequires:  %{_bindir}/xsltproc
 #BuildRequires:  docbook-style-xsl
 Group:          Text Processing/Markup/XML
+%if ! %{gcj_support}
 BuildArch:      noarch
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
+
 %description
 Resolver subproject of xml-commons.
 
@@ -76,6 +86,10 @@
 cp %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/xml-xread
 cp %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/xml-xparse
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -88,17 +102,40 @@
     rm -f %{_javadocdir}/%{name}
 fi
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %doc KEYS LICENSE.resolver.txt
 %{_javadir}/*
 %attr(0755,root,root) %{_bindir}/*
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Jul 21 2006 Deepak Bhole <dbhole at redhat.com> - 0:1.1-1jpp_10fc
+- Added conditional native compilation.
+
 * Wed Jul 12 2006 Jesse Keating <jkeating at redhat.com> - 0:1.1-1jpp_9fc
 - rebuild