[native-platform] Re-enable javadoc package
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Tue Oct 21 11:13:48 UTC 2014
commit bc0afdd72b082948364de14322cf70b7cb9929c6
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Tue Oct 21 12:28:12 2014 +0200
Re-enable javadoc package
native-platform-0.7-Makefile | 2 +-
native-platform.spec | 11 ++---------
2 files changed, 3 insertions(+), 10 deletions(-)
---
diff --git a/native-platform-0.7-Makefile b/native-platform-0.7-Makefile
index 04f58d6..68e232a 100644
--- a/native-platform-0.7-Makefile
+++ b/native-platform-0.7-Makefile
@@ -57,7 +57,7 @@ javafiles-list: $(_JAVA)
javadoc: javafiles-list
mkdir -p $(JDOCDIR)
$(JAVA_HOME)/bin/javadoc -d $(JDOCDIR) -classpath $(JOPT_JAR) @javafiles-list
-
+
jar: $(JCLASSESDIR)/%.class
mkdir -p $(JDOCDIR)
(cd $(JCLASSESDIR) ; $(JAVA_HOME)/bin/jar cf ../../$(JAR) .)
diff --git a/native-platform.spec b/native-platform.spec
index b9bb5b5..f8e2368 100644
--- a/native-platform.spec
+++ b/native-platform.spec
@@ -40,14 +40,12 @@ These APIs support Java 5 and later. Some
of these APIs overlap with APIs available
in later Java versions.
-%if 0
%package javadoc
Summary: Javadoc for %{name}
BuildArch: noarch
%description javadoc
This package contains javadoc for %{name}.
-%endif
%prep
%setup -q -n %{name}-%{namedversion}
@@ -97,14 +95,10 @@ CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ;
CPPFLAGS="${CPPFLAGS:-%optflags}" ; export CPPFLAGS ;
CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ;
LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS;
-make %{?_smp_mflags} JAVA_HOME=%{_jvmdir}/java
+make %{?_smp_mflags} build javadoc JAVA_HOME=%{_jvmdir}/java
%install
-%if 0
%mvn_install -J build/docs/javadoc
-%else
-%mvn_install
-%endif
mkdir -p %{buildroot}%{_libdir}/%{name}
install -pm 0755 build/binaries/libnative-platform-curses.so %{buildroot}%{_libdir}/%{name}
install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{name}
@@ -113,14 +107,13 @@ install -pm 0755 build/binaries/libnative-platform.so %{buildroot}%{_libdir}/%{n
%{_libdir}/%{name}
%doc readme.md LICENSE
-%if 0
%files javadoc -f .mfiles-javadoc
%doc LICENSE
-%endif
%changelog
* Tue Oct 21 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 0.10-1
- Fix build
+- Re-enable javadoc package
* Fri Oct 17 2014 gil cattaneo <puntogil at libero.it> 0.10-1
- update to 0.10
More information about the scm-commits
mailing list