From 1031783d252bbe2db5ccf745fe7f4ea66f5a25df Mon Sep 17 00:00:00 2001
From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= <valtri@civ.zcu.cz>
Date: Tue, 22 Jan 2013 16:27:36 +0000
Subject: [PATCH] Update packaging of jobid.api-java to comply with Fedora
 Packaging Guidelines, update lb.client-java.

---
 org.glite.jobid.api-java/Makefile                  |  2 +-
 org.glite.jobid.api-java/build.xml                 |  4 ++--
 .../nbproject/project.properties                   |  4 ++--
 org.glite.jobid.api-java/nbproject/project.xml     |  2 +-
 .../project/glite-jobid-api-java.spec              | 23 +++++++++++++++++++---
 org.glite.lb.client-java/Makefile                  | 11 ++++++-----
 org.glite.lb.client-java/project/list-jars.sh      |  2 +-
 7 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/org.glite.jobid.api-java/Makefile b/org.glite.jobid.api-java/Makefile
index 7685d73..cc8dedc 100644
--- a/org.glite.jobid.api-java/Makefile
+++ b/org.glite.jobid.api-java/Makefile
@@ -25,7 +25,7 @@ stage:
 
 install:
 	mkdir -p ${DESTDIR}${PREFIX}${prefix}/share/java
-	cp dist/jobid-api-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java
+	cp dist/glite-jobid-api-java.jar ${DESTDIR}${PREFIX}${prefix}/share/java
 
 check:
 
diff --git a/org.glite.jobid.api-java/build.xml b/org.glite.jobid.api-java/build.xml
index 90e26a7..b394710 100755
--- a/org.glite.jobid.api-java/build.xml
+++ b/org.glite.jobid.api-java/build.xml
@@ -2,8 +2,8 @@
 <!-- You may freely edit this file. See commented blocks below for -->
 <!-- some examples of how to customize the build. -->
 <!-- (If you delete it and reopen the project it will be recreated.) -->
-<project name="jobid-api-java" default="default" basedir=".">
-    <description>Builds, tests, and runs the project jobid-api-java.</description>
+<project name="glite-jobid-api-java" default="default" basedir=".">
+    <description>Builds, tests, and runs the project glite-jobid-api-java.</description>
     <import file="nbproject/build-impl.xml"/>
     <!--
 
diff --git a/org.glite.jobid.api-java/nbproject/project.properties b/org.glite.jobid.api-java/nbproject/project.properties
index 7b4b8be..5d14f03 100755
--- a/org.glite.jobid.api-java/nbproject/project.properties
+++ b/org.glite.jobid.api-java/nbproject/project.properties
@@ -1,4 +1,4 @@
-application.title=jobid-api-java
+application.title=glite-jobid-api-java
 application.vendor=xpiskac
 build.classes.dir=${build.dir}/classes
 build.classes.excludes=**/*.java,**/*.form
@@ -15,7 +15,7 @@ debug.test.classpath=\
     ${run.test.classpath}
 # This directory is removed when the project is cleaned:
 dist.dir=dist
-dist.jar=${dist.dir}/jobid-api-java.jar
+dist.jar=${dist.dir}/glite-jobid-api-java.jar
 dist.javadoc.dir=${dist.dir}/javadoc
 excludes=
 # file.reference.commons-codec-1.3.jar=/home/etics/repository/externals/commons-codec/1.3.0/noarch/
diff --git a/org.glite.jobid.api-java/nbproject/project.xml b/org.glite.jobid.api-java/nbproject/project.xml
index 0db31a3..8f9bc45 100755
--- a/org.glite.jobid.api-java/nbproject/project.xml
+++ b/org.glite.jobid.api-java/nbproject/project.xml
@@ -3,7 +3,7 @@
     <type>org.netbeans.modules.java.j2seproject</type>
     <configuration>
         <data xmlns="http://www.netbeans.org/ns/j2se-project/3">
-            <name>jobid-api-java</name>
+            <name>glite-jobid-api-java</name>
             <minimum-ant-version>1.6.5</minimum-ant-version>
             <source-roots>
                 <root id="src.dir"/>
diff --git a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
index ba04c29..4e641d7 100644
--- a/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
+++ b/org.glite.jobid.api-java/project/glite-jobid-api-java.spec
@@ -14,12 +14,25 @@ BuildArch:      noarch
 BuildRequires:  ant
 BuildRequires:  jakarta-commons-codec
 BuildRequires:  java-devel
+BuildRequires:  jpackage-utils
 Requires:       jakarta-commons-codec
+Requires:       jpackage-utils
 
 %description
 @DESCRIPTION@
 
 
+%package        javadoc
+Summary:        Java API documentation for %{name}
+Group:          Documentation
+Requires:       %{name} = %{version}-%{release}
+Requires:       jpackage-utils
+
+%description    javadoc
+This package contains java API documentation for java implementation of gLite
+jobid.
+
+
 %prep
 %setup -q
 
@@ -37,8 +50,8 @@ make check
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -rf {} \;
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -rf {} \;
+mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+cp -rp dist/javadoc $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 
 
 %clean
@@ -48,7 +61,11 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %doc LICENSE project/ChangeLog
-/usr/share/java/jobid-api-java.jar
+%{_javadir}/%{name}.jar
+
+%files javadoc
+%defattr(-,root,root)
+%{_javadocdir}/%{name}
 
 
 %changelog
diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 84712cd..0f67aa7 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -32,6 +32,7 @@ JAVA:=${jdk_prefix}/bin/java
 
 GEN:=${stagedir}${prefix}/bin/glite-lb-at3 ${top_srcdir}/project/genEventTypes.pl
 AT3DIR:=${stagedir}${prefix}/share/glite-lb/at3
+jobid_classpath:=${stagedir}${prefix}/share/java/glite-jobid-api-java.jar
 axis_classpath:=$(shell ${top_srcdir}/project/list-jars.sh ${axis_prefix}/lib ${axis_prefix}/share/java ${axis_prefix}/share/java/axis /usr/share/java /usr/lib/java /usr/lib/java/axis)
 trustmanager_classpath:=$(shell ls -1 ${trustmanager_prefix}/share/java/glite-security-trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager.jar ${trustmanager_prefix}/share/java/trustmanager-axis.jar ${stagedir}${prefix}/share/java/trustmanager.jar ${stagedir}${prefix}/share/java/trustmanager-axis.jar 2>/dev/null | tr '\012' :)
 
@@ -42,7 +43,7 @@ wtf:
 
 compile-java-axis: genws
 	${JAVAC} \
-		-classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \
+		-classpath ${jakarta-commons-lang_jar}:${jobid_classpath}:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath} \
 		-d build \
 		build/axis/org/glite/wsdl/services/lb/*.java \
 		build/axis/org/glite/wsdl/services/lb4agu/*.java \
@@ -55,18 +56,18 @@ compile-java-axis: genws
 compile-java-lb: Event.java Timeval.java Sources.java Level.java SeqCode.java Escape.java
 	-mkdir -p build/classes
 	${JAVAC} \
-		-classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build/classes \
+		-classpath ${jakarta-commons-lang_jar}:${jobid_classpath}:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build/classes \
 		-d build $+
 
 compile-java-gen: genevents
 	${JAVAC} \
-		-classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build:build/classes \
+		-classpath ${jakarta-commons-lang_jar}:${jobid_classpath}:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build:build/classes \
 		-d build \
 		build/gen/*.java
 
 compile-java-lb2: Context.java ContextDirect.java ContextIL.java ContextLL.java EventConvertor.java ILFileWriter.java ILProto.java Job.java LBCredentials.java LBException.java NotifParser.java Notification.java SSL.java SSLSend.java ServerConnection.java
 	${JAVAC} \
-		-classpath ${jakarta-commons-lang_jar}:${stagedir}${prefix}/share/java/jobid-api-java.jar:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build:build/classes \
+		-classpath ${jakarta-commons-lang_jar}:${jobid_classpath}:${trustmanager_classpath}:${utiljava_prefix}/share/java/glite-security-util-java.jar:${axis_classpath}:build:build/classes \
 		-d build/classes $+
 
 build-jar: lb-client-java.jar
@@ -87,7 +88,7 @@ examples: build/classes/examples
 
 build/classes/examples: ${FULL_EXAMPLES} ${SSL_EXAMPLES} ${TM_EXAMPLES}
 	-mkdir -p build/classes/examples/src/simple-ssl build/classes/examples/src/simple-trustmanager
-	${jdk_prefix}/bin/javac -d build/classes/examples -cp build:build/classes:build/classes/examples:${stagedir}${prefix}/share/java/jobid-api-java.jar:${axis_classpath} ${FULL_EXAMPLES}
+	${jdk_prefix}/bin/javac -d build/classes/examples -cp build:build/classes:build/classes/examples:${jobid_classpath}:${axis_classpath} ${FULL_EXAMPLES}
 	${jdk_prefix}/bin/javac -d build/classes/examples -cp build:build/classes:build/classes/examples:${axis_classpath} ${SSL_EXAMPLES}
 	${jdk_prefix}/bin/javac -d build/classes/examples -cp build:build/classes:${trustmanager_classpath}:${axis_classpath} ${TM_EXAMPLES}
 	cp ${FULL_EXAMPLES} build/classes/examples/src
diff --git a/org.glite.lb.client-java/project/list-jars.sh b/org.glite.lb.client-java/project/list-jars.sh
index 4536505..5d0d2a1 100755
--- a/org.glite.lb.client-java/project/list-jars.sh
+++ b/org.glite.lb.client-java/project/list-jars.sh
@@ -4,7 +4,7 @@
 #
 
 PREFIXES="${@:-'/usr/lib /usr/share/java'}"
-LIST="activation ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-apache-xalan2 ant-commons-logging ant-commons-net ant-javamail ant-jdepend ant-jmf ant-jsch ant-junit ant-nodeps ant-swing ant-trax axis axis-jaxrpc axis-saaj jaxrpc saaj commons-codec commons-discovery commons-lang commons-logging-adapters commons-logging-api commons-logging el-api gettext gnome-java-bridge gnumail gnumail-providers inetlib jobid-api-java jsp-api libintl log4j servlet-api wsdl4j xercesImpl xml-apis"
+LIST="activation ant-apache-bcel ant-apache-bsf ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-apache-xalan2 ant-commons-logging ant-commons-net ant-javamail ant-jdepend ant-jmf ant-jsch ant-junit ant-nodeps ant-swing ant-trax axis axis-jaxrpc axis-saaj jaxrpc saaj commons-codec commons-discovery commons-lang commons-logging-adapters commons-logging-api commons-logging el-api gettext gnome-java-bridge gnumail gnumail-providers inetlib glite-jobid-api-java jsp-api libintl log4j servlet-api wsdl4j xercesImpl xml-apis"
 
 CP=""
 for prefix in $PREFIXES; do
-- 
1.8.2.3