Specify explicit source encoding to fix build with Java 7.
Install jar and javadocs unversioned. Crosslink with JDK javadocs.
This commit is contained in:
Ville Skyttä
parent
2aec982a47
commit
bf80784956
@ -16,6 +16,7 @@
|
||||
<property name="proxy.port" value=""></property>
|
||||
<property name="proxy.username" value=""></property>
|
||||
<property name="proxy.password" value=""></property>
|
||||
<property name="source.encoding" value="ISO-8859-1"></property>
|
||||
<path id="build.classpath">
|
||||
<pathelement location="${libdir}/regexp.jar"></pathelement>
|
||||
</path>
|
||||
@ -38,7 +39,7 @@
|
||||
</target>
|
||||
<target name="compile" description="o Compile the code" depends="get-deps">
|
||||
<mkdir dir="${classesdir}"></mkdir>
|
||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html">
|
||||
<javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html" encoding="${source.encoding}">
|
||||
<src>
|
||||
<pathelement location="${basedir}/src/java"></pathelement>
|
||||
</src>
|
||||
@ -82,10 +83,11 @@
|
||||
</tstamp>
|
||||
<property name="copyright" value="Copyright &copy; Apache Software Foundation. All Rights Reserved."></property>
|
||||
<property name="title" value="jakarta-bcel 5.2 API"></property>
|
||||
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*">
|
||||
<javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java" packagenames="org.apache.bcel.*" encoding="${source.encoding}">
|
||||
<classpath>
|
||||
<path refid="build.classpath"></path>
|
||||
</classpath>
|
||||
<link href="/usr/share/javadoc/java"/>
|
||||
</javadoc>
|
||||
</target>
|
||||
<target name="get-dep-regexp.jar" description="o Download the dependency : regexp.jar" unless="regexp.jar" depends="init,setProxy,noProxy,get-custom-dep-regexp.jar">
|
||||
|
||||
34
bcel.spec
34
bcel.spec
@ -39,7 +39,7 @@
|
||||
|
||||
Name: bcel
|
||||
Version: 5.2
|
||||
Release: 9%{?dist}
|
||||
Release: 10%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Byte Code Engineering Library
|
||||
License: ASL 2.0
|
||||
@ -110,6 +110,8 @@ being the Xalan XSLT processor at Apache.
|
||||
%package javadoc
|
||||
Summary: Javadoc for %{name}
|
||||
Group: Documentation
|
||||
BuildRequires: java-javadoc
|
||||
Requires: java-javadoc
|
||||
|
||||
%description javadoc
|
||||
%{summary}.
|
||||
@ -194,13 +196,7 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
|
||||
# jars
|
||||
%{__mkdir_p} %{buildroot}%{_javadir}
|
||||
%{__install} -m 0644 target/%{name}-%{version}.jar \
|
||||
%{buildroot}%{_javadir}/%{name}-%{version}.jar
|
||||
(
|
||||
cd %{buildroot}%{_javadir}
|
||||
for jar in *-%{version}*; do
|
||||
%{__ln_s} ${jar} `echo $jar | %{__sed} "s|-%{version}||g"`
|
||||
done
|
||||
)
|
||||
%{buildroot}%{_javadir}/%{name}.jar
|
||||
# depmap frags
|
||||
%add_to_maven_depmap %{name} %{name} %{version} JPP %{name}
|
||||
%add_to_maven_depmap org.apache.bcel %{name} %{version} JPP %{name}
|
||||
@ -210,15 +206,14 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
|
||||
%{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
|
||||
|
||||
# javadoc
|
||||
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}
|
||||
%if %{with_maven}
|
||||
%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
%{__cp} -pr target/docs/apidocs/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%{__rm} -rf target/docs/apidocs
|
||||
%else
|
||||
%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
|
||||
%{__cp} -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
|
||||
%{__rm} -rf dist/docs/api
|
||||
%endif
|
||||
%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
|
||||
|
||||
# manual
|
||||
%{__mkdir_p} %{buildroot}%{_docdir}/%{name}-%{version}
|
||||
@ -238,17 +233,21 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
|
||||
%postun
|
||||
%update_maven_depmap
|
||||
|
||||
%pre javadoc
|
||||
# workaround for rpm bug, can be removed in F-18
|
||||
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
||||
%{__rm} -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
||||
|
||||
%files
|
||||
%defattr(0644,root,root,0755)
|
||||
%doc %{_docdir}/%{name}-%{version}
|
||||
%doc %{_docdir}/%{name}-%{version}/LICENSE.txt
|
||||
%{_javadir}/*
|
||||
%{_javadir}/%{name}.jar
|
||||
%{_datadir}/maven2/poms/*
|
||||
%{_mavendepmapfragdir}
|
||||
|
||||
%files javadoc
|
||||
%defattr(0644,root,root,0755)
|
||||
%{_javadocdir}/%{name}-%{version}
|
||||
%doc %{_javadocdir}/%{name}
|
||||
|
||||
%files manual
|
||||
@ -256,6 +255,11 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
|
||||
%doc %{_docdir}/%{name}-%{version}
|
||||
|
||||
%changelog
|
||||
* Wed Jan 11 2012 Ville Skyttä <ville.skytta@iki.fi> - 0:5.2-10
|
||||
- Specify explicit source encoding to fix build with Java 7.
|
||||
- Install jar and javadocs unversioned.
|
||||
- Crosslink with JDK javadocs.
|
||||
|
||||
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:5.2-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||
|
||||
@ -351,7 +355,7 @@ ant -Dbuild.dest=build/classes -Dbuild.dir=build -Ddocs.dest=docs \
|
||||
* Mon Mar 24 2003 Nicolas Mailhot <Nicolas.Mailhot (at) JPackage.org> - 5.0-6jpp
|
||||
- For jpackage-utils 1.5
|
||||
|
||||
* Tue Feb 25 2003 Ville Skyttä <ville.skytta at iki.fi> - 5.0-5jpp
|
||||
* Tue Feb 25 2003 Ville Skyttä <ville.skytta@iki.fi> - 5.0-5jpp
|
||||
- Rebuild to get docdir right on modern distros.
|
||||
- Fix License tag and source file perms.
|
||||
- Built with IBM's 1.3.1SR3 (doesn't build with Sun's 1.4.1_01).
|
||||
|
||||
Loading…
Reference in New Issue
Block a user