[eclipse-jgit] Added Java libraries, javadocs and console binary subpackages.

[Andrew Robinson]

commit d5491adc27b5c65b38af0ecaf7cb69cacaae9ed2
Author: Andrew Robinson <arobinso at redhat.com>
Date:   Thu Oct 27 14:31:21 2011 -0400

    Added Java libraries, javadocs and console binary subpackages.

 eclipse-jgit.spec |  127 ++++++++++++++++++++++++++++++++++++++++++++++++----
 1 files changed, 117 insertions(+), 10 deletions(-)
---
diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec
index d879d50..d4c7c65 100644
--- a/eclipse-jgit.spec
+++ b/eclipse-jgit.spec
@@ -3,7 +3,7 @@
 
 Name:           eclipse-jgit
 Version:        1.1.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Eclipse JGit
 
 Group:          Development/Tools
@@ -11,7 +11,6 @@ License:        BSD
 URL:            http://www.eclipse.org/egit/
 #Fetched from http://egit.eclipse.org/w/?p=jgit.git;a=snapshot;h=v1.1.0.201109151100-r;sf=tbz2
 Source0:        jgit-v1.1.0.201109151100-r.tar.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch: noarch
 
@@ -22,29 +21,137 @@ Requires: eclipse-platform >= 3.5.0
 %description
 A pure Java implementation of the Git version control system.
 
+%package -n     jgit-javadoc
+Summary:        API documentation for %{name}
+Group:          Documentation
+Requires:       jpackage-utils
+
+%description -n jgit-javadoc
+%{summary}.
+
+%package -n     jgit-libs
+Summary:        Non-Eclipse JGit libraries
+Group:          Development/Libraries
+BuildRequires:  jpackage-utils
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  args4j >= 2.0.12
+Requires:       args4j >= 2.0.12
+Requires:       java >= 1.6.0
+Requires:       jpackage-utils
+
+%description -n jgit-libs
+Non-eclipse dependant installation of the core JGit libraries.
+
+%package -n     jgit
+Summary:        Java-based command line Git interface
+Group:          Development/Tools
+BuildRequires:  jpackage-utils
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-release-plugin
+BuildRequires:  maven-resources-plugin
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  args4j >= 2.0.12
+Requires:       args4j >= 2.0.12
+Requires:       java >= 1.6.0
+Requires:       jpackage-utils
+
+%description -n jgit
+Non-eclipse dependant installation of the core JGit libraries.
+
 %prep
-%setup -n eclipse-jgit -q -c
+%setup -n jgit -q
+sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
+ org.eclipse.jgit/pom.xml
+sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
+ org.eclipse.jgit.ui/pom.xml
+sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
+ org.eclipse.jgit.console/pom.xml
+sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
+ org.eclipse.jgit.iplog/pom.xml
+sed -i -e "s|\${bundle-manifest}|\${source-bundle-manifest}|g" \
+ org.eclipse.jgit.pgm/pom.xml
 
 %build
+# build JARs
+mvn-rpmbuild -Dtranslate-qualifier=true install javadoc:aggregate \
+ -pl "org.eclipse.jgit,org.eclipse.jgit.ui,org.eclipse.jgit.console,org.eclipse.jgit.iplog,org.eclipse.jgit.pgm"
+# build plugin
 %{eclipse_base}/buildscripts/pdebuild -f org.eclipse.jgit
 
 %install
 %{__rm} -rf %{buildroot}
 install -d -m 755 %{buildroot}%{install_loc}
-
+# Eclipse Plugin
 %{__unzip} -q -d %{buildroot}%{install_loc} \
      build/rpmBuild/org.eclipse.jgit.zip 
-
-%clean
-%{__rm} -rf %{buildroot}
+# JARs
+install -d -m 0755 %{buildroot}%{_javadir}
+install -m 644 org.eclipse.jgit/target/org.eclipse.jgit-1.1.0.201109151100-r.jar   %{buildroot}%{_javadir}/org.eclipse.jgit.jar
+install -m 644 org.eclipse.jgit.ui/target/org.eclipse.jgit.ui-1.1.0.201109151100-r.jar   %{buildroot}%{_javadir}/org.eclipse.jgit.ui.jar
+install -m 644 org.eclipse.jgit.console/target/org.eclipse.jgit.console-1.1.0.201109151100-r.jar   %{buildroot}%{_javadir}/org.eclipse.jgit.console.jar
+install -m 644 org.eclipse.jgit.iplog/target/org.eclipse.jgit.iplog-1.1.0.201109151100-r.jar   %{buildroot}%{_javadir}/org.eclipse.jgit.iplog.jar
+install -m 644 org.eclipse.jgit.pgm/target/org.eclipse.jgit.pgm-1.1.0.201109151100-r.jar   %{buildroot}%{_javadir}/org.eclipse.jgit.pgm.jar
+# Javadocs
+install -d -m 755 %{buildroot}%{_javadocdir}/jgit
+cp -rp org.eclipse.jgit/target/apidocs %{buildroot}%{_javadocdir}/jgit
+cp -rp org.eclipse.jgit.ui/target/apidocs %{buildroot}%{_javadocdir}/jgit
+cp -rp org.eclipse.jgit.console/target/apidocs %{buildroot}%{_javadocdir}/jgit
+cp -rp org.eclipse.jgit.iplog/target/apidocs %{buildroot}%{_javadocdir}/jgit
+# POM Files
+install -d -m 755 %{buildroot}%{_mavenpomdir}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-jgit-parent.pom
+install -pm 644 org.eclipse.jgit/pom.xml %{buildroot}%{_mavenpomdir}/JPP-org.eclipse.jgit.pom
+install -pm 644 org.eclipse.jgit.ui/pom.xml %{buildroot}%{_mavenpomdir}/JPP-org.eclipse.jgit.ui.pom
+install -pm 644 org.eclipse.jgit.console/pom.xml %{buildroot}%{_mavenpomdir}/JPP-org.eclipse.jgit.console.pom
+install -pm 644 org.eclipse.jgit.iplog/pom.xml %{buildroot}%{_mavenpomdir}/JPP-org.eclipse.jgit.iplog.pom
+install -pm 644 org.eclipse.jgit.pgm/pom.xml %{buildroot}%{_mavenpomdir}/JPP-org.eclipse.jgit.pgm.pom
+
+%add_maven_depmap JPP-org.eclipse.jgit.pom org.eclipse.jgit.jar
+%add_maven_depmap JPP-org.eclipse.jgit.ui.pom org.eclipse.jgit.ui.jar
+%add_maven_depmap JPP-org.eclipse.jgit.console.pom org.eclipse.jgit.console.jar
+%add_maven_depmap JPP-org.eclipse.jgit.iplog.pom org.eclipse.jgit.iplog.jar
+%add_maven_depmap JPP-org.eclipse.jgit.pgm.pom org.eclipse.jgit.pgm.jar
+%add_maven_depmap JPP-jgit-parent.pom
+# Binary
+install -dm 755 %{buildroot}%{_bindir}
+install -m 755 org.eclipse.jgit.pgm/target/jgit %{buildroot}%{_bindir}/jgit
 
 %files
-%defattr(-,root,root,-)
-%doc jgit/LICENSE 
-%doc jgit/README
+%doc LICENSE 
+%doc README
 %{install_loc}
 
+%files -n jgit-libs
+%{_javadir}/org.eclipse.jgit*
+%{_mavendepmapfragdir}/%{name}
+%{_mavenpomdir}/JPP-jgit-parent.pom
+%{_mavenpomdir}/JPP-org.eclipse.jgit*.pom
+%doc LICENSE 
+%doc README
+
+%files -n jgit
+%{_bindir}/jgit
+%doc LICENSE 
+%doc README
+
+%files -n jgit-javadoc
+%{_javadocdir}/jgit
+%doc LICENSE 
+%doc README
+
 %changelog
+* Thu Oct 27 2011 Andrew Robinson <arobinso at redhat.com> 1.1.0-2
+- Added Java libraries, javadocs and console binary subpackages.
+
 * Fri Sep 23 2011 Andrew Robinson <arobinso at redhat.com> 1.1.0-1
 - Update to upstream release 1.1.0.