Attachment 632808 Details for Bug 869198 – Replace java-devel BuildRequires with java-1.5.0-gcj

[patch] Replace java-devel BuildRequires with java-1.5.0-gcj

0001-Replace-java-devel-BuildRequires-with-java-1.5.0-gcj.patch (text/plain), 1.59 KB, created by Mikolaj Izdebski on 2012-10-24 13:48:17 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikolaj Izdebski

Created: 2012-10-24 13:48:17 UTC

Size: 1.59 KB

patch

obsolete

>From 93965379e6c11e8e9f0e10d7bf78e7bad2891be7 Mon Sep 17 00:00:00 2001
>From: Mikolaj Izdebski <mizdebsk@redhat.com>
>Date: Wed, 24 Oct 2012 15:45:33 +0200
>Subject: [PATCH] Replace java-devel BuildRequires with java-1.5.0-gcj
>
>- Resolves: rhbz#869198
>---
> geronimo-specs.spec | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
>diff --git a/geronimo-specs.spec b/geronimo-specs.spec
>index ed2e97f..8a96480 100644
>--- a/geronimo-specs.spec
>+++ b/geronimo-specs.spec
>@@ -9,14 +9,14 @@
> 
> Name:		geronimo-specs
> Version:	1.0
>-Release:	3.5.M2%{?dist}
>+Release:	3.6.M2%{?dist}
> Epoch:		0
> License:	ASL 2.0
> Group:		Development/Libraries
> BuildRequires:	jpackage-utils >= 0:1.5
> BuildRequires:	mx4j >= 0:2.0.1
> BuildRequires:	apache-tomcat-apis
>-BuildRequires:	java-devel
>+BuildRequires:	java-1.5.0-gcj
> Requires:	mx4j >= 0:2.0.1
> Requires:	apache-tomcat-apis
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
>@@ -65,7 +65,7 @@ chmod -R go=u-w *
> %build
> # Force Java 5 (GCJ) as this code will not build on Java 6
> # due to API differences (-source and -target only solve syntax problems)
>-export JAVA_HOME=/usr/lib/jvm/java-1.5.0
>+export JAVA_HOME=$(echo /usr/lib*/jvm/java-1.5.0-gcj-*)
> export PATH=$JAVA_HOME/bin:$PATH
> 
> mkdir -p build/lib
>@@ -147,6 +147,10 @@ rm -rf $RPM_BUILD_ROOT
> %{_javadir}/*.jar
> 
> %changelog
>+* Wed Oct 24 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.0-3.6.M2
>+- Replace java-devel BuildRequires with java-1.5.0-gcj
>+- Resolves: rhbz#869198
>+
> * Wed May 30 2012 Mikolaj Izdebski <mizdebsk@redhat.com> - 0:1.0-3.5.M2
> - Resolves: #818755
> - Cleanup descriptions
>-- 
>1.7.11.4
>

Actions: View | Diff

Attachments on bug 869198: 632005 | 632808 | 632809