diff --git a/bea-stax.spec b/bea-stax.spec index b5556fb..56a8d16 100644 --- a/bea-stax.spec +++ b/bea-stax.spec @@ -28,10 +28,6 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%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 gcj_support 1 - Summary: Streaming API for XML URL: http://dev2dev.bea.com/technologies/stax/index.jsp Source0: http://dist.codehaus.org/stax/distributions/stax-src-1.2.0_rc1-dev.zip @@ -42,13 +38,11 @@ Source0: http://dist.codehaus.org/stax/distributions/stax-src-1.2.0_rc1-d Patch0: %{name}-ecj-bootclasspath.patch Name: bea-stax Version: 1.2.0 -Release: 0.5.rc1%{?dist} +Release: 0.6.rc1%{?dist} Epoch: 0 License: ASL 2.0 Group: Development/Libraries/Java -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRequires: jpackage-utils >= 0:1.6 BuildRequires: ant @@ -58,12 +52,6 @@ Requires: %{name}-api = %{epoch}:%{version}-%{release} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif - %description The Streaming API for XML (StAX) is a groundbreaking new Java API for parsing and writing XML easily and @@ -73,11 +61,6 @@ efficiently. Summary: The StAX API Group: Development/Documentation Requires: jpackage-utils >= 0:1.6 -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif %description api %{summary} @@ -93,9 +76,6 @@ Requires: jpackage-utils >= 0:1.6 %prep %setup -q -c -n %{name}-%{version} %{__sed} -i 's/\r//' ASF2.0.txt -%if %{gcj_support} -%patch0 -b .bak -%endif %build export CLASSPATH=`pwd`/build/stax-api-1.0.jar @@ -115,72 +95,29 @@ ln -s %{name}-ri-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-ri.jar install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name} cp -pr build/javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name} -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT -%if %{gcj_support} -%post api -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun api -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - %files %defattr(-,root,root,-) %doc ASF2.0.txt %{_javadir}/%{name}-ri-%{version}.jar %{_javadir}/%{name}-ri.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/bea-stax-ri-1.2.0.jar.* -%endif - %files api %defattr(-,root,root,-) %doc ASF2.0.txt %{_javadir}/%{name}-api-%{version}.jar %{_javadir}/%{name}-api.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/bea-stax-api-1.2.0.jar.* -%endif - %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/* %changelog +* Thu Oct 7 2010 Alexander Kurtakov 0:1.2.0-0.6.rc1 +- Drop gcj support. + * Fri Jul 24 2009 Fedora Release Engineering - 0:1.2.0-0.5.rc1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild @@ -220,3 +157,4 @@ fi * Thu Sep 09 2004 Ralph Apel 0:1.0-1jpp - First JPackage build - Note: there is a stax project starting at codehaus +