Accepting request 200559 from Java:packages
[FOR-OPENSUSE-13.1] - Build with gcc-java as openjdk7 (1.7.0_40) fails to build it - Disable javadoc package OBS-URL: https://build.opensuse.org/request/show/200559 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/objectweb-asm?expand=0&rev=14
This commit is contained in:
commit
d37c8cc4f7
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 25 12:03:11 UTC 2013 - mvyskocil@suse.com
|
||||||
|
|
||||||
|
- Build with gcc-java as openjdk7 (1.7.0_40) fails to build it
|
||||||
|
- Disable javadoc package
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Sep 11 07:32:22 UTC 2013 - mvyskocil@suse.com
|
Wed Sep 11 07:32:22 UTC 2013 - mvyskocil@suse.com
|
||||||
|
|
||||||
|
@ -40,7 +40,7 @@ Patch0: objectweb-asm-no-classpath-in-manifest.patch
|
|||||||
Requires: xml-commons-apis
|
Requires: xml-commons-apis
|
||||||
PreReq: javapackages-tools
|
PreReq: javapackages-tools
|
||||||
BuildRequires: ant >= 1.6.5
|
BuildRequires: ant >= 1.6.5
|
||||||
BuildRequires: java-devel
|
BuildRequires: java-1_5_0-gcj-compat-devel
|
||||||
BuildRequires: javapackages-tools
|
BuildRequires: javapackages-tools
|
||||||
BuildRequires: objectweb-anttask
|
BuildRequires: objectweb-anttask
|
||||||
BuildRequires: xml-commons-apis
|
BuildRequires: xml-commons-apis
|
||||||
@ -59,6 +59,7 @@ Machine.
|
|||||||
ASM offers similar functionalities as BCEL or SERP, but is much
|
ASM offers similar functionalities as BCEL or SERP, but is much
|
||||||
smaller.
|
smaller.
|
||||||
|
|
||||||
|
%if 0
|
||||||
%package javadoc
|
%package javadoc
|
||||||
Summary: Javadoc for %{name}
|
Summary: Javadoc for %{name}
|
||||||
Group: Development/Libraries/Java
|
Group: Development/Libraries/Java
|
||||||
@ -73,6 +74,7 @@ Machine.
|
|||||||
|
|
||||||
ASM offers similar functionalities as BCEL or SERP, but is much
|
ASM offers similar functionalities as BCEL or SERP, but is much
|
||||||
smaller.
|
smaller.
|
||||||
|
%endif
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n asm-%{version}
|
%setup -q -n asm-%{version}
|
||||||
@ -84,7 +86,7 @@ cp -p %{SOURCE9} META-INF/MANIFEST.MF
|
|||||||
%build
|
%build
|
||||||
export CLASSPATH=
|
export CLASSPATH=
|
||||||
export OPT_JAR_LIST=:
|
export OPT_JAR_LIST=:
|
||||||
ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar jdoc
|
ant -Dobjectweb.ant.tasks.path=$(build-classpath objectweb-anttask) jar
|
||||||
|
|
||||||
%install
|
%install
|
||||||
# jars
|
# jars
|
||||||
@ -123,9 +125,11 @@ install -m 644 %{SOURCE7} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-all.
|
|||||||
install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom
|
install -m 644 %{SOURCE8} %{buildroot}%{_mavenpomdir}/JPP.objectweb-asm-asm-parent.pom
|
||||||
%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar
|
%add_maven_depmap JPP.objectweb-asm-asm-all.pom %{name}/asm-all.jar
|
||||||
|
|
||||||
|
%if 0
|
||||||
# javadoc
|
# javadoc
|
||||||
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
install -p -d -m 755 %{buildroot}%{_javadocdir}/%{name}
|
||||||
cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name}
|
cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name}
|
||||||
|
%endif
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
@ -135,8 +139,10 @@ cp -pr output/dist/doc/javadoc/user/* %{buildroot}%{_javadocdir}/%{name}
|
|||||||
%{_mavenpomdir}/*
|
%{_mavenpomdir}/*
|
||||||
%config %{_mavendepmapfragdir}/*
|
%config %{_mavendepmapfragdir}/*
|
||||||
|
|
||||||
|
%if 0
|
||||||
%files javadoc
|
%files javadoc
|
||||||
%defattr(0644,root,root,0755)
|
%defattr(0644,root,root,0755)
|
||||||
%{_javadocdir}/%{name}
|
%{_javadocdir}/%{name}
|
||||||
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user