- Merge with upstream version and rpmlint cleanup, fix BR
This commit is contained in:
Permaine Cheung
parent
253fdd9c2a
commit
241baf7265
66
bcel.spec
66
bcel.spec
@ -1,4 +1,4 @@
|
||||
# Copyright (c) 2000-2005, JPackage Project
|
||||
# Copyright (c) 2000-2007, JPackage Project
|
||||
# All rights reserved.
|
||||
#
|
||||
# Redistribution and use in source and binary forms, with or without
|
||||
@ -32,30 +32,32 @@
|
||||
%define _with_gcj_support 1
|
||||
#Fedora currently does not support maven
|
||||
%define _without_maven 1
|
||||
%define _without_bootstrap 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 bootstrap %{?_with_bootstrap:1}%{!?_with_bootstrap:%{?_without_bootstrap:0}%{!?_without_bootstrap:%{?_bootstrap:%{_bootstrap}}%{!?_bootstrap:0}}}
|
||||
|
||||
# If you don't want to build with maven, and use straight ant instead,
|
||||
# give rpmbuild option '--without maven'
|
||||
|
||||
%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
|
||||
%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
|
||||
|
||||
%define section free
|
||||
|
||||
Name: bcel
|
||||
Version: 5.1
|
||||
Release: 8jpp.1
|
||||
Release: 10jpp.1%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Byte Code Engineering Library
|
||||
License: Apache Software License
|
||||
Source0: bcel-5.1-src-RHCLEAN.tar.gz
|
||||
# svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
|
||||
Source0: bcel-5.1-src.tar.gz
|
||||
#svn export https://svn.apache.org/repos/asf/jakarta/bcel/tags/BCEL_5_1
|
||||
#tar czvf bcel-5.1-src.tar.gz BCEL_5_1
|
||||
Source1: pom-maven2jpp-depcat.xsl
|
||||
Source2: pom-maven2jpp-newdepmap.xsl
|
||||
Source3: pom-maven2jpp-mapdeps.xsl
|
||||
Source4: bcel-5.1-jpp-depmap.xml
|
||||
Source5: jakarta-site2.tar.gz
|
||||
Source5: bcel-jakarta-site2.tar.gz
|
||||
|
||||
Patch0: bcel-5.1-build.patch
|
||||
Patch1: bcel-5.1-project_xml.patch
|
||||
@ -68,25 +70,27 @@ BuildRequires: maven >= 0:1.1
|
||||
BuildRequires: saxon
|
||||
BuildRequires: saxon-scripts
|
||||
%endif
|
||||
%if ! %{bootstrap}
|
||||
BuildRequires: jdom
|
||||
BuildRequires: velocity
|
||||
BuildRequires: jakarta-commons-collections
|
||||
#excalibur-avalong-logkit should be used once Maven is supported in Fedora
|
||||
BuildRequires: avalon-logkit
|
||||
#BuildRequires: excalibur-avalon-logkit
|
||||
BuildRequires: jakarta-commons-collections
|
||||
BuildRequires: jdom
|
||||
BuildRequires: velocity
|
||||
BuildRequires: werken-xpath
|
||||
#BuildRequires: ant-apache-regexp
|
||||
%endif
|
||||
BuildRequires: regexp
|
||||
BuildRequires: jpackage-utils >= 0:1.6
|
||||
BuildRequires: werken.xpath
|
||||
BuildRequires: ant-apache-regexp
|
||||
%if ! %{gcj_support}
|
||||
BuildArch: noarch
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
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
|
||||
BuildRequires: java-gcj-compat-devel
|
||||
Requires(post): java-gcj-compat
|
||||
Requires(postun): java-gcj-compat
|
||||
%endif
|
||||
|
||||
%description
|
||||
@ -128,7 +132,7 @@ Group: Development/Libraries/Java
|
||||
%description demo
|
||||
%{summary}.
|
||||
|
||||
#%prep
|
||||
%prep
|
||||
#cat <<EOT
|
||||
#
|
||||
# If you dont want to build with maven,
|
||||
@ -143,16 +147,18 @@ for j in $(find . -name "*.jar"); do
|
||||
mv $j $j.no
|
||||
done
|
||||
gzip -dc %{SOURCE5} | tar xf -
|
||||
%if ! %{bootstrap}
|
||||
mkdir jakarta-site2/lib
|
||||
pushd jakarta-site2/lib/
|
||||
build-jar-repository -s -p . jdom
|
||||
build-jar-repository -s -p . velocity
|
||||
build-jar-repository -s -p . commons-collections
|
||||
build-jar-repository -s -p . avalon-logkit
|
||||
build-jar-repository -s -p . werken.xpath
|
||||
build-jar-repository -s -p . werken-xpath
|
||||
popd
|
||||
%endif
|
||||
pushd lib
|
||||
ln -sf $(build-classpath regexp) Regexp.jar
|
||||
ln -sf $(build-classpath regexp) Regex.jar
|
||||
popd
|
||||
%patch0 -p1
|
||||
%patch1 -b .sav
|
||||
@ -189,12 +195,13 @@ maven \
|
||||
-Dmaven.home.local=${MAVEN_HOME_LOCAL} \
|
||||
jar:jar javadoc:generate xdoc:transform
|
||||
%else
|
||||
ant -Dbuild.dest=build/classes -Dbuild.dir=build \
|
||||
-Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
|
||||
compile jar apidocs xdocs
|
||||
ant -Dbuild.dest=build/classes -Dbuild.dir=build \
|
||||
-Ddocs.src=xdocs -Djakarta.site2=jakarta-site2 -Djdom.jar=jdom.jar \
|
||||
compile jar apidocs xdocs
|
||||
%endif
|
||||
|
||||
%install
|
||||
%__rm -rf %{buildroot}
|
||||
# jars
|
||||
%__mkdir_p %{buildroot}%{_javadir}
|
||||
%if %{with_maven}
|
||||
@ -241,16 +248,16 @@ if [ "$1" = "0" ]; then
|
||||
%__rm -f %{_javadocdir}/%{name}
|
||||
fi
|
||||
|
||||
%post
|
||||
%if %{gcj_support}
|
||||
%post
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
fi
|
||||
%endif
|
||||
|
||||
%postun
|
||||
%if %{gcj_support}
|
||||
%postun
|
||||
if [ -x %{_bindir}/rebuild-gcj-db ]
|
||||
then
|
||||
%{_bindir}/rebuild-gcj-db
|
||||
@ -282,6 +289,17 @@ fi
|
||||
# -----------------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Thu Mar 08 2007 Permaine Cheung <pcheung at redhat.com> 0:5.1-10jpp.1
|
||||
- Merge with upstream version and rpmlint cleanup, fix BR
|
||||
|
||||
* Fri Feb 09 2007 Ralph Apel <r.apel@r-apel.de> 0:5.1-10jpp
|
||||
- Fix empty-post and empty-postun
|
||||
- Fix no-cleaning-of-buildroot
|
||||
|
||||
* Fri Feb 09 2007 Ralph Apel <r.apel@r-apel.de> 0:5.1-9jpp
|
||||
- Optionally build without maven
|
||||
- Add bootstrap option
|
||||
|
||||
* Thu Aug 10 2006 Matt Wringe <mwringe at redhat.com> 0:5.1-8jpp.1
|
||||
- Merge with upstream version:
|
||||
- Add missing javadoc requires
|
||||
|
||||
Loading…
Reference in New Issue
Block a user