Attachment 302154 Details for Bug 433312 – specfile patch to remove gcj bits

[patch] specfile patch to remove gcj bits

opengrok.spec.patch (text/plain), 1.99 KB, created by Andrew Overholt on 2008-04-11 18:38:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Overholt

Created: 2008-04-11 18:38:07 UTC

Size: 1.99 KB

patch

obsolete

>--- opengrok.spec	2008-04-09 11:21:32.000000000 -0400
>+++ opengrok.spec.me	2008-04-11 14:35:51.000000000 -0400
>@@ -1,5 +1,3 @@
>-# Use rpmbuild --without gcj to disable native bits
>-%define with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
> %define snapshot 275
> 
> Name:           opengrok
>@@ -21,13 +19,7 @@
> Patch3:         opengrok-0.5-manifest-classpath.patch
> BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>-%if %{with_gcj}
>-BuildRequires:    java-gcj-compat-devel >= 1.0.31
>-Requires(post):   java-gcj-compat >= 1.0.31
>-Requires(postun): java-gcj-compat >= 1.0.31
>-%else
> BuildArch:      noarch
>-%endif
> 
> %define common_reqs jakarta-oro ant bcel servlet lucene > 2 lucene-contrib > 2 swing-layout jpackage-utils javacc
> Requires:       %{common_reqs}
>@@ -36,9 +28,8 @@
> BuildRequires:  %{common_reqs}
> BuildRequires:  jflex >= 1.4
> BuildRequires:  ant-nodeps
>-# FIXME: As of 0.6-hg275 this should build with java-1.5 again.
>-# This is just to prevent GCJ from attempting to build this.
>-# ant scripts from both jrcs and opengrok need to be fixed somehow
>+# GCJ is missing java.util.Scanner so we require >= 1.6 to ensure we
>+# build with OpenJDK
> BuildRequires:  java-devel >= 1.6
> BuildRequires:  desktop-file-utils
> BuildRequires:  subversion-javahl
>@@ -200,34 +191,11 @@
>         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
>         %{SOURCE3}
> 
>-# gcj
>-%if %{with_gcj}
>-%{_bindir}/aot-compile-rpm
>-%endif
>-
> 
> %clean
> rm -rf $RPM_BUILD_ROOT
> 
> 
>-%post
>-%if %{with_gcj}
>-if [ -x %{_bindir}/rebuild-gcj-db ]
>-then
>-  %{_bindir}/rebuild-gcj-db
>-fi
>-%endif
>-
>-
>-%postun
>-%if %{with_gcj}
>-if [ -x %{_bindir}/rebuild-gcj-db ]
>-then
>-  %{_bindir}/rebuild-gcj-db
>-fi
>-%endif
>-
>-
> %files
> %defattr(-,root,root,-)
> %{_javadir}/*
>@@ -238,9 +206,6 @@
> %{_datadir}/pixmaps/opengrok.png
> %dir %{_sysconfdir}/%{name}
> %config(noreplace) %{_sysconfdir}/%{name}/configuration.xml
>-%if %{with_gcj}
>-%{_libdir}/gcj/%{name}
>-%endif
> %doc CHANGES.txt LICENSE.txt README.txt doc/EXAMPLE.txt README.Fedora
> 
>

Actions: View | Diff

Attachments on bug 433312: 302154