[RPM (6.0)] [DIST generic] openjpa-1.2.2-1.jpp6

Ralph Apel <[email protected]> Mon, 17 Sep 2012 10:30:18 +0200
Newsgroups gmane.linux.jpackage.announce
Message-ID <[email protected]>
Name        : openjpa                      Relocations: (not relocatable)
Version     : 1.2.2                             Vendor: JPackage Project
Release     : 1.jpp6                        Build Date: Mon 17 Sep 2012 10:14:06 AM CEST
Install Date: (not installed)               Build Host: linux.fritz.box
Group       : Development/Libraries/Java    Source RPM: (none)
Size        : 7019201                          License: Apache Software License 2.0
Signature   : (none)
Packager    : Ralph Apel <[email protected]>
URL         : http://openjpa.apache.org/
Summary     : Apache OpenJPA
Description :
Apache OpenJPA, a Java EE persistence project of the Apache
Software Foundation. It is a feature-rich implementation of
the persistence part of Enterprise Java Beans 3.0, also known
as the Java Persistence API (JPA), and is available under the
terms of the Apache Software License. OpenJPA can be used as
a stand-alone POJO persistence layer, or it can be integrated
into any EJB3.0 compliant container and many lightweight frameworks.

---------------
Ralph Apel <[email protected]> 0:1.2.2-1
- 1.2.2 as first JPP-6 release
---------------
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingDatabaseMetaData.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-TestUpdateManagerFlushException.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DistributedConnection.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DistributedResultSet.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-SimpleDriverDataSource.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DistributedTemplate.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingStatement.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-project-pom.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DistributedPreparedStatement.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingCallableStatement.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingConnection.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingPreparedStatement.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingResultSet.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-DelegatingDataSource.patch
openjpa.src: W: source-or-patch-not-bzipped openjpa-pom.patch
openjpa.src: W: no-signature
openjpa.src: W: name-repeated-in-summary OpenJPA
openjpa.src: W: invalid-license Apache Software License 2.0
1 packages and 0 specfiles checked; 0 errors, 18 warnings.

---------------
Index: openjpa.spec
===================================================================
RCS file: /home/projects/jpackage/cvs/rpms/free/openjpa/openjpa.spec,v
retrieving revision 1.1
diff -u -r1.1 openjpa.spec
--- openjpa.spec	26 Feb 2008 16:57:01 -0000	1.1
+++ openjpa.spec	17 Sep 2012 08:30:16 -0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2000-2008, JPackage Project
+# Copyright (c) 2000-2012, JPackage Project
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,59 +28,57 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
 
-%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
-
-## If you don't want to build with maven, and use straight ant instead,
-## give rpmbuild option '--without maven'
-
-%define with_maven %{!?_without_maven:1}%{?_without_maven:0}
-%define without_maven %{?_without_maven:1}%{!?_without_maven:0}
-
-## If you don't want to wait for tests
-## give rpmbuild option '--without tests'
-
-%define with_tests %{!?_without_tests:1}%{?_without_tests:0}
-%define without_tests %{?_without_tests:1}%{!?_without_tests:0}
-
 %define section   free
+%define _binary_payload w9.gzdio
+%define _source_payload w9.gzdio
+%define _binary_filedigest_algorithm 1
+%define _source_filedigest_algorithm 1
 
 Name:           openjpa
-Version:        1.0.2
-Release:        1jpp
+Version:        1.2.2
+Release:        1%{?dist}
 Epoch:          0
 Summary:        Apache OpenJPA
-License:        Apache License 2.0
+License:        Apache Software License 2.0
 Url:            http://openjpa.apache.org/
 Group:          Development/Libraries/Java
-Vendor: %{?_vendorinfo:%{_vendorinfo}}%{!?_vendorinfo:%{_vendor}}
-Distribution: %{?_distribution:%{_distribution}}%{!?_distribution:%{_vendor}}
-Source0:        http://www.apache.org/dist/openjpa/1.0.2/apache-openjpa-1.0.2-source.zip
+Source0:        http://archive.apache.org/dist/openjpa/1.2.2/apache-openjpa-1.2.2-source.zip
 Source1:        %{name}-settings.xml
-Source2:        %{name}-%{version}-jpp-depmap.xml
-Source3:        %{name}-autogenerated-files.tar.gz
-Source4:        %{name}-autogenerated-files-notests.tar.gz
-Patch0:         openjpa-1.0.2-TestSQLDateId.patch
-Patch1:         openjpa-1.0.2-TestSQLBigDecimalId.patch 
-Patch2:         openjpa-1.0.2-TestSQLBigIntegerId.patch
-Patch3:         openjpa-1.0.2-pom.patch
-Patch4:         openjpa-1.0.2-project-pom.patch
-Patch5:         openjpa-1.0.2-site_xml.patch
-
-BuildRequires:  jpackage-utils >= 0:1.7.4
-BuildRequires:  java-devel = 0:1.5.0
-BuildRequires:  ant >= 0:1.6.5
+Source2:        %{name}-jpp-depmap.xml
+Source3:        http://svn.apache.org/repos/asf/openjpa/trunk/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar
+Source4:        http://svn.apache.org/repos/asf/openjpa/trunk/openjpa-kernel/internal-repository/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom
+Patch0:         openjpa-SimpleDriverDataSource.patch
+Patch1:         openjpa-DelegatingDatabaseMetaData.patch
+Patch2:         openjpa-DelegatingResultSet.patch
+Patch3:         openjpa-pom.patch
+Patch4:         openjpa-project-pom.patch
+Patch5:         openjpa-DelegatingCallableStatement.patch
+Patch6:         openjpa-DelegatingDataSource.patch
+Patch7:         openjpa-DelegatingConnection.patch
+Patch8:         openjpa-DelegatingPreparedStatement.patch
+Patch9:         openjpa-DelegatingStatement.patch
+Patch10:        openjpa-TestUpdateManagerFlushException.patch
+Patch11:        openjpa-DistributedConnection.patch
+Patch12:        openjpa-DistributedTemplate.patch
+Patch13:        openjpa-DistributedPreparedStatement.patch
+Patch14:        openjpa-DistributedResultSet.patch
+
+BuildRequires:  jpackage-utils >= 0:1.7.5
+BuildRequires:  java-devel >= 0:1.6.0
+BuildRequires:  ant >= 0:1.7.1
 BuildRequires:  ant-nodeps
+BuildRequires:  ant-jsch
 BuildRequires:  ant-junit
 BuildRequires:  junit
 BuildRequires:  derby
+BuildRequires:  geronimo-genesis
 BuildRequires:  hsqldb
 BuildRequires:  javacc
-%if %{with_maven}
 BuildRequires:  docbkx
 BuildRequires:  docbook-xml
 BuildRequires:  maven2-common-poms
-BuildRequires:  maven2 >= 0:2.0.7
-BuildRequires:  maven2-default-skin
+BuildRequires:  maven2 >= 0:2.0.8
+BuildRequires:  maven-skins
 BuildRequires:  maven2-plugin-ant
 BuildRequires:  maven2-plugin-antrun
 BuildRequires:  maven2-plugin-compiler
@@ -93,35 +91,38 @@
 BuildRequires:  maven2-plugin-project-info-reports
 BuildRequires:  maven2-plugin-resources
 BuildRequires:  maven2-plugin-site
-BuildRequires:  maven2-plugin-surefire
-BuildRequires:  maven2-plugin-surefire-report
-BuildRequires:  mojo-maven2-plugin-cobertura
-BuildRequires:  mojo-maven2-plugin-javacc
-BuildRequires:  mojo-maven2-plugin-taglist
+BuildRequires:  maven-surefire-plugin
+BuildRequires:  maven-surefire-provider-junit3
+BuildRequires:  maven-surefire-report-plugin
+BuildRequires:  mojo-cobertura-maven-plugin
+BuildRequires:  mojo-ianal-maven-plugin
+BuildRequires:  mojo-javacc-maven-plugin
+BuildRequires:  mojo-taglist-maven-plugin
 BuildRequires:  jetty6-maven2-plugins
-%endif
 
 
-BuildRequires:  jakarta-commons-collections
-BuildRequires:  jakarta-commons-dbcp
-BuildRequires:  jakarta-commons-lang
-BuildRequires:  jakarta-commons-logging
-BuildRequires:  jakarta-commons-pool
+BuildRequires:  apache-commons-collections
+BuildRequires:  apache-commons-dbcp
+BuildRequires:  apache-commons-lang
+BuildRequires:  apache-commons-logging
+BuildRequires:  apache-commons-pool
 BuildRequires:  jaxb_2_1_api
-BuildRequires:  jms_1_1_api
+BuildRequires:  geronimo-jms-1.1-api
 BuildRequires:  jpa_3_0_api
 BuildRequires:  jta_1_1_api
 BuildRequires:  log4j
+BuildRequires:  postgresql-jdbc
 BuildRequires:  regexp
 BuildRequires:  serp
 BuildRequires:  stax_1_0_api
 
+Requires:  java >= 0:1.6.0
 Requires:  hsqldb
-Requires:  jakarta-commons-collections
-Requires:  jakarta-commons-dbcp
-Requires:  jakarta-commons-lang
-Requires:  jakarta-commons-logging
-Requires:  jakarta-commons-pool
+Requires:  apache-commons-collections
+Requires:  apache-commons-dbcp
+Requires:  apache-commons-lang
+Requires:  apache-commons-logging
+Requires:  apache-commons-pool
 Requires:  jaxb_2_1_api
 Requires:  jms_1_1_api
 Requires:  jpa_3_0_api
@@ -150,14 +151,12 @@
 %description javadoc
 %{summary}.
 
-%if %{with_maven}
 %package manual
 Summary:        Documents for %{name}
 Group:          Development/Documentation
 
 %description manual
 %{summary}.
-%endif
 
 %prep
 %setup -q -n apache-%{name}-%{version}-source
@@ -165,13 +164,6 @@
 for j in $(find . -name "*.jar"); do
     mv $j $j.no
 done
-%if %{without_maven}
-%if %{with_tests}
-gzip -dc %{SOURCE3} | tar xf -
-%else
-gzip -dc %{SOURCE4} | tar xf -
-%endif
-%endif
 
 %patch0 -b .sav0
 %patch1 -b .sav1
@@ -179,6 +171,15 @@
 %patch3 -b .sav3
 %patch4 -b .sav4
 %patch5 -b .sav5
+%patch6 -b .sav6
+%patch7 -b .sav7
+%patch8 -b .sav8
+%patch9 -b .sav9
+%patch10 -b .sav10
+%patch11 -b .sav11
+%patch12 -b .sav12
+%patch13 -b .sav13
+%patch14 -b .sav14
 
 cp %{SOURCE1} settings.xml
 sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
@@ -188,12 +189,13 @@
 cp src/site/site.xml openjpa-project/src/site
 
 %build
-export JAVA_HOME=%{_jvmdir}/java-1.5.0
-
-%if %{with_maven}
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
-mkdir -p $MAVEN_REPO_LOCAL/org/apache/maven/skins/maven-default-skin/1.1/
-ln -sf $(build-classpath maven2/default-skin) $MAVEN_REPO_LOCAL/org/apache/maven/skins/maven-default-skin/1.1/maven-default-skin-1.1.jar
+
+mkdir -p $MAVEN_REPO_LOCAL/com/ibm/websphere/websphere_uow_api/0.0.1/
+cp %{SOURCE3} $MAVEN_REPO_LOCAL/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.jar
+cp %{SOURCE4} $MAVEN_REPO_LOCAL/com/ibm/websphere/websphere_uow_api/0.0.1/websphere_uow_api-0.0.1.pom
+mkdir -p $MAVEN_REPO_LOCAL/org/docbook/docbook-xml/4.4/
+ln -s %{_javadir}/docbook-xml-resources.zip  $MAVEN_REPO_LOCAL/org/docbook/docbook-xml/4.4/docbook-xml-4.4.jar
 
 mkdir external_repo
 ln -s %{_javadir} external_repo/JPP
@@ -202,11 +204,7 @@
 mvn-jpp \
         -e \
         -s $M2_SETTINGS \
-%if %{with_tests}
         -P test-derby \
-%else
-        -Dtest=false \
-%endif
         -Dmaven.test.failure.ignore=true \
         -Dmaven2.jpp.depmap.file=%{SOURCE2} \
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
@@ -229,171 +227,6 @@
         -Dmaven.repo.local=$MAVEN_REPO_LOCAL \
         process-resources
 
-%else
-#[INFO] Reactor build order:
-#[INFO]   OpenJPA
-#[INFO]   OpenJPA Utilities
-#[INFO]   OpenJPA Kernel
-#[INFO]   OpenJPA JDBC
-#[INFO]   OpenJPA XML Store
-#[INFO]   OpenJPA JDBC 1.5
-#[INFO]   OpenJPA Utilities 1.5
-#[INFO]   OpenJPA Kernel 1.5
-#[INFO]   OpenJPA JPA
-#[INFO]   OpenJPA JPA JDBC
-#[INFO]   OpenJPA Aggregate Jar
-#[INFO]   OpenJPA Distribution
-#[INFO]   OpenJPA Integration Tests
-#[INFO]   OpenJPA Examples Integration Tests
-#[INFO]   OpenJPA JPA TCK Integration Tests
-#[INFO]   OpenJPA Persistence Examples
-
-export OPT_JAR_LIST="ant/ant-nodep ant/ant-junit junit"
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-lang \
-commons-logging \
-log4j \
-regexp \
-serp \
-)
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-lib
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-lang \
-commons-pool \
-jms_1_1_api \
-jta_1_1_api \
-regexp \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-kernel
-jjtree -BUILD_NODE_FILES=false -OUTPUT_DIRECTORY=target/generated-sources/jjtree/org/apache/openjpa/kernel/jpql/ src/main/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jjt 
-javacc -OUTPUT_DIRECTORY=target/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ target/generated-sources/jjtree/org/apache/openjpa/kernel/jpql/JPQL.jj 
-rm target/generated-sources/javacc/org/apache/openjpa/kernel/jpql/ParseException.java
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar
-$JAVA_HOME/bin/java org.apache.openjpa.ee.WASManagedRuntime
-$JAVA_HOME/bin/java org.apache.openjpa.util.ProxyManagerImpl -utils 5
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-lang \
-hsqldb \
-jta_1_1_api \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-jdbc
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-xmlstore
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-jaxb_2_1_api \
-stax_1_0_api \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-jdbc-5
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-lib-5
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-kernel-5
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-lang \
-jpa_3_0_api \
-jta_1_1_api \
-serp \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib-5/target/openjpa-lib-5-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel-5/target/openjpa-kernel-5-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc-5/target/openjpa-jdbc-5-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-persistence
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-commons-dbcp \
-commons-lang \
-commons-pool \
-derby/derby \
-jaxb_2_1_api \
-jpa_3_0_api \
-jta_1_1_api \
-log4j \
-serp \
-stax_1_0_api \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib/target/openjpa-lib-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-lib-5/target/openjpa-lib-5-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel-5/target/openjpa-kernel-5-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc-5/target/openjpa-jdbc-5-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-persistence/target/openjpa-persistence-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-persistence-jdbc
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-export CLASSPATH=
-pushd openjpa-all
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only 
-popd
-export CLASSPATH=$(build-classpath \
-commons-collections \
-jpa_3_0_api \
-)
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-kernel/target/openjpa-kernel-%{version}.jar
-CLASSPATH=$CLASSPATH:$(pwd)/openjpa-jdbc/target/openjpa-jdbc-%{version}.jar
-CLASSPATH=$CLASSPATH:target/classes:target/test-classes
-pushd openjpa-examples
-ant -Dmaven.settings.offline=true -Dbuild.sysclasspath=only jar javadoc
-popd
-
-%endif
-
 %install
 rm -rf $RPM_BUILD_ROOT
 
@@ -409,31 +242,16 @@
 %add_to_maven_depmap org.apache.openjpa %{name} %{version} JPP/%{name} all
 install -m 644 %{name}-all/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-all.pom
 
-install -m 644 %{name}-jdbc-5/target/%{name}-jdbc-5-%{version}.jar \
-           $RPM_BUILD_ROOT%{_javadir}/%{name}/jdbc-5-%{version}.jar
-%add_to_maven_depmap org.apache.openjpa %{name}-jdbc-5 %{version} JPP/%{name} jdbc-5
-install -m 644 %{name}-jdbc-5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdbc-5.pom
-
 install -m 644 %{name}-jdbc/target/%{name}-jdbc-%{version}.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{name}/jdbc-%{version}.jar
 %add_to_maven_depmap org.apache.openjpa %{name}-jdbc %{version} JPP/%{name} jdbc
 install -m 644 %{name}-jdbc/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-jdbc.pom
 
-install -m 644 %{name}-kernel-5/target/%{name}-kernel-5-%{version}.jar \
-           $RPM_BUILD_ROOT%{_javadir}/%{name}/kernel-5-%{version}.jar
-%add_to_maven_depmap org.apache.openjpa %{name}-kernel-5 %{version} JPP/%{name} kernel-5
-install -m 644 %{name}-kernel-5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-kernel-5.pom
-
 install -m 644 %{name}-kernel/target/%{name}-kernel-%{version}.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{name}/kernel-%{version}.jar
 %add_to_maven_depmap org.apache.openjpa %{name}-kernel %{version} JPP/%{name} kernel
 install -m 644 %{name}-kernel/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-kernel.pom
 
-install -m 644 %{name}-lib-5/target/%{name}-lib-5-%{version}.jar \
-           $RPM_BUILD_ROOT%{_javadir}/%{name}/lib-5-%{version}.jar
-%add_to_maven_depmap org.apache.openjpa %{name}-lib-5 %{version} JPP/%{name} lib-5
-install -m 644 %{name}-lib-5/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-lib-5.pom
-
 install -m 644 %{name}-lib/target/%{name}-lib-%{version}.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{name}/lib-%{version}.jar
 %add_to_maven_depmap org.apache.openjpa %{name}-lib %{version} JPP/%{name} lib
@@ -449,11 +267,21 @@
 %add_to_maven_depmap org.apache.openjpa %{name}-persistence %{version} JPP/%{name} persistence
 install -m 644 %{name}-persistence/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-persistence.pom
 
+install -m 644 %{name}-slice/target/%{name}-slice-%{version}.jar \
+           $RPM_BUILD_ROOT%{_javadir}/%{name}/slice-%{version}.jar
+%add_to_maven_depmap org.apache.openjpa %{name}-slice %{version} JPP/%{name} slice
+install -m 644 %{name}-slice/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-slice.pom
+
 install -m 644 %{name}-xmlstore/target/%{name}-xmlstore-%{version}.jar \
            $RPM_BUILD_ROOT%{_javadir}/%{name}/xmlstore-%{version}.jar
 %add_to_maven_depmap org.apache.openjpa %{name}-xmlstore %{version} JPP/%{name} xmlstore
 install -m 644 %{name}-xmlstore/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-xmlstore.pom
 
+install -m 644 %{name}-examples/target/%{name}-examples-%{version}.jar \
+           $RPM_BUILD_ROOT%{_javadir}/%{name}/examples-%{version}.jar
+%add_to_maven_depmap org.apache.openjpa %{name}-examples %{version} JPP/%{name} examples
+install -m 644 %{name}-examples/pom.xml $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-examples.pom
+
 
 
 (cd $RPM_BUILD_ROOT%{_javadir}/%{name} && for jar in *-%{version}*; do \
@@ -463,14 +291,12 @@
 # javadoc
 for module in \
            examples \
-           jdbc-5 \
            jdbc \
-           kernel-5 \
            kernel \
-           lib-5 \
            lib \
            persistence-jdbc \
            persistence \
+           slice \
            xmlstore \
            ; do
     install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}/$module
@@ -481,22 +307,12 @@
 ## manual
 install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 cp -p LICENSE.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%if %{with_maven}
 cp -pr target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-cp -pr openjpa-project/target/manual $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
-%endif
+cp -pr openjpa-project/target/site $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post javadoc
-ln -sf %{name}-%{version} %{_javadocdir}/%{name}
- 
-%postun javadoc
-if [ "$1" = "0" ]; then
-  rm -f %{_javadocdir}/%{name}
-fi
-
 %post
 %update_maven_depmap
 
@@ -506,22 +322,23 @@
 %files
 %defattr(0644,root,root,0755)
 %{_docdir}/%{name}-%{version}/LICENSE.txt
-%{_javadir}/%{name}
-%{_datadir}/maven2
-%{_mavendepmapfragdir}
+%dir %{_javadir}/%{name}
+%{_javadir}/%{name}/*.jar
+%{_datadir}/maven2/poms/*
+%{_mavendepmapfragdir}/*
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
-%ghost %{_javadocdir}/%{name}
+%doc %{_javadocdir}/%{name}
 
-%if %{with_maven}
 %files manual
 %defattr(0644,root,root,0755)
-%doc %{_docdir}/%{name}-%{version}/manual
-%doc %{_docdir}/%{name}-%{version}/site
-%endif
+%doc %{_docdir}/%{name}-%{version}
 
 %changelog
+* Mon Sep 17 2012 Ralph Apel <[email protected]> 0:1.2.2-1
+- 1.2.2 as first JPP-6 release
+
 * Tue Feb 26 2008 Ralph Apel <[email protected]> 0:1.0.2-1jpp
 - First release