[RPM (6.0)] [DIST generic] google-guice3-3.0-3.jpp6

Ralph Apel <[email protected]> Sun, 20 Jan 2013 13:12:43 +0100
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : google-guice3                Relocations: (not relocatable)
Version     : 3.0                               Vendor: JPackage Project
Release     : 3.jpp6                        Build Date: Sun 20 Jan 2013 12:58:41 PM CET
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries         Source RPM: (none)
Size        : 23940274                         License: ASL 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://code.google.com/p/google-guice/
Summary     : Dependency Injection Framework
Description :
Put simply, Guice alleviates the need for factories and the
use of new in your Java code. Think of Guice's @Inject as
the new new. You will still need to write factories in some
cases, but your code will not depend directly on them. Your
code will be easier to change, unit test and reuse in other
contexts.

Guice embraces Java's type safe nature, especially when it
comes to features introduced in Java 5 such as generics and
annotations. You might think of Guice as filling in missing
features for core Java. Ideally, the language itself would
provide most of the same features, but until such a
language comes along, we have Guice.

---------------
Ralph Apel <[email protected]> 3.0-3
- Auto rebuild for JPackage 6 in centos5 mock
---------------
google-guice3.src: W: source-or-patch-not-bzipped google-guice3-core-pom.patch
google-guice3.src: W: source-or-patch-not-bzipped google-guice3-extensions-pom.patch
google-guice3.src: W: source-or-patch-not-bzipped google-guice3-extensions-assistedinject-pom.patch
google-guice3.src: W: source-or-patch-not-bzipped google-guice3-pom.patch
google-guice3.src: W: no-signature
google-guice3.src: W: invalid-license ASL 2.0
1 packages and 0 specfiles checked; 0 errors, 6 warnings.

---------------
Index: google-guice3-jpp-depmap.xml
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice3/google-guice3-jpp-depmap.xml,v
retrieving revision 1.1
diff -u -r1.1 google-guice3-jpp-depmap.xml
--- google-guice3-jpp-depmap.xml	28 Jun 2012 07:35:03 -0000	1.1
+++ google-guice3-jpp-depmap.xml	20 Jan 2013 12:12:41 -0000
@@ -26,7 +26,347 @@
     </jpp>
 </dependency>
 
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.shared</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>maven-common-artifact-filters</artifactId>
+        <version>1.4</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>javax.transaction</groupId>
+        <artifactId>jta</artifactId>
+        <version>1.1</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>jta_1_1_api</artifactId>
+        <version>1.1</version>
+    </jpp>
+</dependency>
+
+
+<dependency>
+    <maven>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>4.8.2</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>junit4</artifactId>
+        <version>4.8.2</version>
+    </jpp>
+</dependency>
+
 <!--
+<dependency>
+    <maven>
+        <groupId>org.hsqldb</groupId>
+        <artifactId>hsqldb-j5</artifactId>
+        <version>2.0.0</version>
+    </maven>
+    <jpp>
+        <groupId>JPP</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>1.8.0.10</version>
+    </jpp>
+</dependency>
+
+2) org.hsqldb:hsqldb-j5:jar:2.0.0
 -->
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-manager</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-artifact-test</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>artifact-test</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-core</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>core</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>error-diagnostics</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>model</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-monitor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>monitor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-descriptor</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-parameter-documenter</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>plugin-registry</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-profile</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>profile</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-project</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>project</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>repository-metadata</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-settings</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>settings</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting-api</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting-api</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-ant</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-ant</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>script-beanshell</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.reporting</groupId>
+        <artifactId>maven-reporting</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>reporting</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven-plugins</artifactId>
+        <version>10</version>
+    </jpp>
+</dependency>
+
+<dependency>
+    <maven>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </maven>
+    <jpp>
+        <groupId>JPP/maven2</groupId>
+        <artifactId>maven</artifactId>
+        <version>2.0.8</version>
+    </jpp>
+</dependency>
+
 
 </dependencies>
Index: google-guice3-pom.patch
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice3/google-guice3-pom.patch,v
retrieving revision 1.1
diff -u -r1.1 google-guice3-pom.patch
--- google-guice3-pom.patch	28 Jun 2012 07:35:03 -0000	1.1
+++ google-guice3-pom.patch	20 Jan 2013 12:12:41 -0000
@@ -1,5 +1,5 @@
 --- pom.xml.sav0	2011-03-25 02:48:39.000000000 +0100
-+++ pom.xml	2012-03-24 12:14:28.272090401 +0100
++++ pom.xml	2013-01-05 18:06:51.380654676 +0100
 @@ -86,11 +86,11 @@
  
    <modules>
Index: google-guice3.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/google-guice3/google-guice3.spec,v
retrieving revision 1.1
diff -u -r1.1 google-guice3.spec
--- google-guice3.spec	28 Jun 2012 07:35:03 -0000	1.1
+++ google-guice3.spec	20 Jan 2013 12:12:41 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2012, JPackage Project
+# Copyright (c) 2000-2013, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -29,14 +29,10 @@
 #
 
 %define section free
-%define _binary_payload w9.gzdio
-%define _source_payload w9.gzdio
-%define _binary_filedigest_algorithm 1
-%define _source_filedigest_algorithm 1
 
 Name:           google-guice3
 Version:        3.0
-Release:        1%{?dist}
+Release:        3%{?dist}
 Epoch:          0
 Summary:        Dependency Injection Framework
 Group:          Development/Libraries
@@ -48,33 +44,29 @@
 Source0:        google-guice-3.0.tar.bz2
 Source1:        %{name}-settings.xml
 Source2:        %{name}-jpp-depmap.xml
+Source3:        hsqldb-j5-2.2.4.jar
+Source4:        hsqldb-j5-2.2.4.pom
 Patch0:         google-guice3-pom.patch
 Patch1:         google-guice3-core-pom.patch
+Patch2:         google-guice3-extensions-pom.patch
+Patch3:         google-guice3-extensions-assistedinject-pom.patch
 Requires(post): jpackage-utils >= 0:1.7.5
 Requires(postun): jpackage-utils >= 0:1.7.5
 Requires:       aopalliance >= 0:1.0
-Requires:       apache-felix-framework
-Requires:       atinject
 Requires:       cglib >= 0:2.2
 Requires:       java >= 0:1.6.0
 Requires:       jpackage-utils >= 0:1.7.5
 Requires:       objectweb-asm >= 0:3.2
-BuildRequires:  animal-sniffer
 BuildRequires:  aopalliance >= 0:1.0
 BuildRequires:  apache-commons-parent
 BuildRequires:  apache-felix-framework
 BuildRequires:  atinject
 BuildRequires:  atinject-tck
 BuildRequires:  cglib >= 0:2.2
-BuildRequires:  apache-jar-resource-bundle
-BuildRequires:  google-pom
-BuildRequires:  mojo-parent
-BuildRequires:  mojo-signatures
-BuildRequires:  oss-parent
-BuildRequires:  sonatype-plugins-parent
 BuildRequires:  java-devel >= 0:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.7.5
 BuildRequires:  junit
+BuildRequires:  testng
 BuildRequires:  maven2 >= 0:2.0.8
 BuildRequires:  maven2-plugin-antrun
 BuildRequires:  maven2-plugin-assembly
@@ -82,14 +74,18 @@
 BuildRequires:  maven2-plugin-install
 BuildRequires:  maven2-plugin-jar
 BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-remote-resources
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-source
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-testng
 BuildRequires:  jarjar-maven-plugin
+BuildRequires:  mojo-animal-sniffer
+BuildRequires:  glassfish-persistence-1.0b-api
+BuildRequires:  google-pom
+BuildRequires:  hibernate3-entitymanager
+BuildRequires:  oss-parent
+BuildRequires:  sonatype-plugins-parent
 BuildRequires:  objectweb-asm >= 0:3.2
-BuildRequires:  testng
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -120,98 +116,108 @@
 %setup -q -n google-guice-%{version}
 %patch0 -b .sav0
 %patch1 -b .sav1
+%patch2 -b .sav2
+%patch3 -b .sav3
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
 done
-%if 0
-mkdir -p build/dist
-#BUILD/google-guice-2.0/lib/aopalliance.jar.no
-ln -sf $(build-classpath aopalliance) lib/aopalliance.jar
-#BUILD/google-guice-2.0/lib/build/asm-3.1.jar.no
-ln -sf $(build-classpath objectweb-asm/asm) lib/build/asm-3.1.jar
-#BUILD/google-guice-2.0/lib/build/bnd-0.0.305.jar.no
-ln -sf $(build-classpath aqute-bndlib) lib/build/bnd-0.0.305.jar
-#BUILD/google-guice-2.0/lib/build/cglib-2.2.1-snapshot.jar.no
-ln -sf $(build-classpath cglib) lib/build/cglib-2.2.1-snapshot.jar
-#BUILD/google-guice-2.0/lib/build/commons-logging-1.0.4.jar.no
-ln -sf $(build-classpath commons-logging) lib/build/commons-logging-1.0.4.jar
-#BUILD/google-guice-2.0/lib/build/easymock.jar.no
-ln -sf $(build-classpath easymock) lib/build/easymock.jar
-#BUILD/google-guice-2.0/lib/build/jarjar-1.0rc8.jar.no
-ln -sf $(build-classpath jarjar) lib/build/jarjar-1.0rc8.jar
-#BUILD/google-guice-2.0/lib/build/junit.jar.no
-ln -sf $(build-classpath junit) lib/build/junit.jar
-#BUILD/google-guice-2.0/lib/build/munge.jar.no
-
-#BUILD/google-guice-2.0/lib/build/safesax.jar.no
-
-#BUILD/google-guice-2.0/lib/build/spring-beans.jar.no
-ln -sf $(build-classpath spring2/beans) lib/build/spring-beans.jar
-#BUILD/google-guice-2.0/lib/build/spring-core.jar.no
-ln -sf $(build-classpath spring2/core) lib/build/spring-core.jar
-
-
-# #BUILD/google-guice-2.0/servlet/lib/build/servlet-api-2.5.jar.no
-# ln -sf $(build-classpath servlet_2_5_api) servlet/lib/build/servlet-api-2.5.jar
-# #BUILD/google-guice-2.0/struts2/lib/ant-1.6.5.jar.no
-# ln -sf $(build-classpath ant) struts2/lib/ant-1.6.5.jar
-# #BUILD/google-guice-2.0/struts2/lib/commons-logging-1.0.4.jar.no
-# ln -sf $(build-classpath commons-logging) struts2/lib/commons-logging-1.0.4.jar
-# #BUILD/google-guice-2.0/struts2/lib/core-3.1.1.jar.no
-# ln -sf $(build-classpath ecj3) struts2/lib/core-3.1.1.jar
-# #BUILD/google-guice-2.0/struts2/lib/freemarker-2.3.8.jar.no
-# ln -sf $(build-classpath freemarker) struts2/lib/freemarker-2.3.8.jar
-# #BUILD/google-guice-2.0/struts2/lib/jetty-6.1.0.jar.no
-# ln -sf $(build-classpath jetty6/jetty6) struts2/lib/jetty-6.1.0.jar
-# #BUILD/google-guice-2.0/struts2/lib/jetty-util-6.1.0.jar.no
-# ln -sf $(build-classpath jetty6/jetty6-util) struts2/lib/jetty-util-6.1.0.jar
-# #BUILD/google-guice-2.0/struts2/lib/jsp-2.1.jar.no
-# ln -sf $(build-classpath jetty6/jsp-2.1/jsp-2.1-jetty) struts2/lib/jsp-2.1.jar
-# #BUILD/google-guice-2.0/struts2/lib/jsp-api-2.1.jar.no
-# ln -sf $(build-classpath jsp_2_1_api) struts2/lib/jsp-api-2.1.jar
-# #BUILD/google-guice-2.0/struts2/lib/ognl-2.6.9.jar.no
-# ln -sf $(build-classpath ognl) struts2/lib/ognl-2.6.9.jar
-# #BUILD/google-guice-2.0/struts2/lib/servlet-api-2.5.jar.no
-# ln -sf $(build-classpath servlet_2_5_api) struts2/lib/servlet-api-2.5.jar
-# #BUILD/google-guice-2.0/struts2/lib/struts2-api-2.0.5.jar.no
-# #BUILD/google-guice-2.0/struts2/lib/struts2-core-2.0.5.jar.no
-# #BUILD/google-guice-2.0/struts2/lib/xwork-2.0.0.jar.no
-# ln -sf $(build-classpath xwork) struts2/lib/xwork-2.0.0.jar
-%endif
 
 cp %{SOURCE1} settings.xml
-sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
 sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
-sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
+sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" settings.xml
 sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
 sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml
 
 %build
 export MAVEN_REPO_LOCAL=`pwd`/m2_repo/repository
-%{_bindir}/mvn-jpp \
-        -s $(pwd)/settings.xml \
+mkdir -p ${MAVEN_REPO_LOCAL}/org/hsqldb/hsqldb-j5/2.0.0/
+cp %{SOURCE3} ${MAVEN_REPO_LOCAL}/org/hsqldb/hsqldb-j5/2.0.0/hsqldb-j5-2.0.0.jar
+cp %{SOURCE4} ${MAVEN_REPO_LOCAL}/org/hsqldb/hsqldb-j5/2.0.0/hsqldb-j5-2.0.0.pom
+
+export SETTINGS=$(pwd)/settings.xml
+%{_bindir}/mvn-jpp -e \
+        -s ${SETTINGS} \
         -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dguice.with.no_aop=false \
         org.apache.felix:maven-bundle-plugin:manifest install javadoc:aggregate
+pushd extensions
+%{_bindir}/mvn-jpp -e \
+        -s ${SETTINGS} \
+        -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
+        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
+        -Dmaven.test.failure.ignore=true \
+        org.apache.felix:maven-bundle-plugin:manifest install javadoc:aggregate
+popd
 
 %install
 rm -rf %{buildroot}
 
 # jars
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 core/target/guice-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-install -m 644 core/target/guice-%{version}-SNAPSHOT-no_deps.jar %{buildroot}%{_javadir}/%{name}-nodeps-%{version}.jar
-install -m 644 core/target/guice-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}-tests-%{version}.jar
+mkdir -p %{buildroot}%{_javadir}/%{name}
+install -m 644 core/target/guice-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/%{name}-%{version}.jar
+install -m 644 core/target/guice-%{version}-SNAPSHOT-no_deps.jar %{buildroot}%{_javadir}/%{name}/%{name}-no_deps-%{version}.jar
+install -m 644 core/target/guice-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/%{name}-tests-%{version}.jar
+install -m 644 extensions/assistedinject/target/guice-assistedinject-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/assistedinject-%{version}.jar
+install -m 644 extensions/assistedinject/target/guice-assistedinject-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/assistedinject-tests-%{version}.jar
+install -m 644 extensions/grapher/target/guice-grapher-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/grapher-%{version}.jar
+install -m 644 extensions/grapher/target/guice-grapher-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/grapher-tests-%{version}.jar
+install -m 644 extensions/jmx/target/guice-jmx-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/jmx-%{version}.jar
+install -m 644 extensions/jmx/target/guice-jmx-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/jmx-tests-%{version}.jar
+install -m 644 extensions/jndi/target/guice-jndi-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/jndi-%{version}.jar
+install -m 644 extensions/jndi/target/guice-jndi-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/jndi-tests-%{version}.jar
+install -m 644 extensions/multibindings/target/guice-multibindings-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/multibindings-%{version}.jar
+install -m 644 extensions/multibindings/target/guice-multibindings-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/multibindings-tests-%{version}.jar
+install -m 644 extensions/persist/target/guice-persist-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/persist-%{version}.jar
+install -m 644 extensions/persist/target/guice-persist-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/persist-tests-%{version}.jar
+install -m 644 extensions/servlet/target/guice-servlet-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/servlet-%{version}.jar
+install -m 644 extensions/servlet/target/guice-servlet-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/servlet-tests-%{version}.jar
+install -m 644 extensions/spring/target/guice-spring-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/spring-%{version}.jar
+install -m 644 extensions/spring/target/guice-spring-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/spring-tests-%{version}.jar
+install -m 644 extensions/throwingproviders/target/guice-throwingproviders-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}/throwingproviders-%{version}.jar
+install -m 644 extensions/throwingproviders/target/guice-throwingproviders-%{version}-SNAPSHOT-tests.jar %{buildroot}%{_javadir}/%{name}/throwingproviders-tests-%{version}.jar
 
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -s ${jar} `/bin/echo ${jar} | sed "s|-%{version}||g"`; done)
+(cd %{buildroot}%{_javadir}/%{name} && for jar in *-%{version}*; do ln -s ${jar} `/bin/echo ${jar} | sed "s|-%{version}||g"`; done)
 
 # poms
 mkdir -p %{buildroot}%{_datadir}/maven2/poms
 install -m 644 pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}-parent.pom
 %add_to_maven_depmap com.google.inject guice-parent %{version} JPP %{name}-parent
-install -m 644 core/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom
-%add_to_maven_depmap com.google.inject guice %{version} JPP %{name}
+
+install -m 644 core/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-%{name}.pom
+%add_to_maven_depmap com.google.inject guice %{version} JPP/%{name} %{name}
+
+install -m 644 extensions/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-extensions.pom
+%add_to_maven_depmap com.google.inject.extensions extensions-parent %{version} JPP/%{name} extensions
+
+
+install -m 644 extensions/assistedinject/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-assistedinject.pom
+%add_to_maven_depmap com.google.inject.extensions guice-assistedinject %{version} JPP/%{name} assistedinject
+
+install -m 644 extensions/grapher/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-grapher.pom
+%add_to_maven_depmap com.google.inject.extensions guice-grapher %{version} JPP/%{name} grapher
+
+install -m 644 extensions/jmx/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-jmx.pom
+%add_to_maven_depmap com.google.inject.extensions guice-jmx %{version} JPP/%{name} jmx
+
+install -m 644 extensions/jndi/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-jndi.pom
+%add_to_maven_depmap com.google.inject.extensions guice-jndi %{version} JPP/%{name} jndi
+
+install -m 644 extensions/multibindings/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-multibindings.pom
+%add_to_maven_depmap com.google.inject.extensions guice-multibindings %{version} JPP/%{name} multibindings
+
+install -m 644 extensions/persist/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-persist.pom
+%add_to_maven_depmap com.google.inject.extensions guice-persist %{version} JPP/%{name} persist
+
+install -m 644 extensions/servlet/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-servlet.pom
+%add_to_maven_depmap com.google.inject.extensions guice-servlet %{version} JPP/%{name} servlet
+
+install -m 644 extensions/spring/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-spring.pom
+%add_to_maven_depmap com.google.inject.extensions guice-spring %{version} JPP/%{name} spring
+
+install -m 644 extensions/throwingproviders/pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP.%{name}-throwingproviders.pom
+%add_to_maven_depmap com.google.inject.extensions guice-throwingproviders %{version} JPP/%{name} throwingproviders
 
 # javadoc
 mkdir -p %{buildroot}%{_javadocdir}/%{name}-%{version}
@@ -229,7 +235,8 @@
 
 %files
 %defattr(0644,root,root,0755)
-%{_javadir}/*.jar
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*.jar
 %{_datadir}/maven2/poms/*
 %{_mavendepmapfragdir}/*
 
@@ -238,6 +245,12 @@
 %{_javadocdir}/*
 
 %changelog
+* Sun Jan 20 2013 Ralph Apel <[email protected]> 3.0-3
+- Auto rebuild for JPackage 6 in centos5 mock
+
+* Wed Oct 31 2012 Will Tatam <[email protected]> 3.0-2
+- Auto rebuild for JPackage 6 in centos5 mock
+
 * Thu Jun 28 2012 Ralph Apel <[email protected]> 0:3.0-1
 - 3.0 as google-guice3