galileo pushed to minimal-json (master). "Fix javadoc error & make javadoc install explicit"

notifications at fedoraproject.org notifications at fedoraproject.org
Mon Apr 27 21:12:29 UTC 2015


>From 1219e124a2701d1e7b07c2d0ba6b72ae9f2e8b7c Mon Sep 17 00:00:00 2001
From: Gerard Ryan <gerard at ryan.lt>
Date: Mon, 27 Apr 2015 22:12:16 +0100
Subject: Fix javadoc error & make javadoc install explicit


diff --git a/minimal-json.spec b/minimal-json.spec
index 2b19983..ce1b0b2 100644
--- a/minimal-json.spec
+++ b/minimal-json.spec
@@ -27,13 +27,17 @@ API documentation for %{name}.
 %prep
 %setup -qn %{name}-%{commit}
 
+# Javadoc error
+sed -i -e  "s/@returns/@return/g" \
+    com.eclipsesource.json/src/main/java/com/eclipsesource/json/JsonObject.java
+
 %pom_disable_module com.eclipsesource.json.performancetest
 
 %build
 %mvn_build -s -- -f com.eclipsesource.json
 
 %install
-%mvn_install
+%mvn_install -J com.eclipsesource.json/target/apidocs
 
 %files -f .mfiles-minimal-json
 %dir /usr/share/java/minimal-json
@@ -43,6 +47,9 @@ API documentation for %{name}.
 %doc epl-v10.html
 
 %changelog
+* Mon Apr 27 2015 Gerard Ryan <galileo at fedoraproject.org> - 0.9.1-3
+- Fix javadoc error & make javadoc install explicit for f21
+
 * Tue Nov 25 2014 Gerard Ryan <galileo at fedoraproject.org> - 0.9.1-2
 - Make sure directory is owned by this package
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/minimal-json.git/commit/?h=master&id=1219e124a2701d1e7b07c2d0ba6b72ae9f2e8b7c


More information about the scm-commits mailing list