[java-sig-commits] [javapackages/generate_javadoc: 3/7] Add support for multiple licenses

Stanislav Ochotnicky sochotni at fedoraproject.org
Wed Nov 2 17:53:17 UTC 2011


commit 782b7452acc6986fb370d321df6d030c4d7345f1
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Nov 2 18:06:00 2011 +0100

    Add support for multiple licenses

 macros.fjava |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index bde7e58..5577a93 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -73,13 +73,17 @@ popd \
 %{!?__javadoc_license: \
 %global __javadoc_license %(\
 cd %{buildsubdir} \
-for lic in LICENSE COPYING;do \
+licenses="" \
+for lic in LICENSE* COPYING* doc/LICENSE* doc/COPYING* license*;do \
 if [ -f $lic ];then \
-   echo $lic; \
-   exit 0; \
+   licenses="$licenses $lic"; \
 fi \
 done \
-echo "%{nil}";
+if [ "$licenses" == "" ]; then \
+echo "%{nil}"; \
+else \
+echo $licenses; \
+fi \
 )\
 }
 }


More information about the java-sig-commits mailing list