[RPM (6.0)] [DIST generic] db-torque-3.3-4.jpp6
Ralph Apel <[email protected]>
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : db-torque Relocations: (not relocatable) Version : 3.3 Vendor: JPackage Project Release : 4.jpp6 Build Date: Sat 04 Aug 2012 12:32:56 PM CEST Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Libraries/Java Source RPM: (none) Size : 1089159 License: Apache Software License Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://db.apache.org/torque/ Summary : Torque persistence layer Description : Torque is a persistence layer. Torque includes a generator to generate all the database resources required by your application and includes a runtime environment to run the generated classes. --------------- Ralph Apel <r.apel at r-apel.de> - 0:3.3-4 - First JPP-6 release --------------- db-torque.src: W: strange-permission db-torque-3.3-settings.xml 0674 db-torque.src: W: strange-permission db-torque-3.3-jpp-depmap.xml 0674 db-torque.src: W: source-or-patch-not-bzipped db-torque-common-pom.patch db-torque.src: W: source-or-patch-not-bzipped db-torque-3.3-generator-project_xml.patch db-torque.src: W: source-or-patch-not-bzipped db-torque-3.3-runtime-pom.patch db-torque.src: W: no-signature 1 packages and 0 specfiles checked; 0 errors, 6 warnings. --------------- Index: db-torque.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/db-torque/db-torque.spec,v retrieving revision 1.4 diff -u -r1.4 db-torque.spec --- db-torque.spec 14 Aug 2008 08:46:15 -0000 1.4 +++ db-torque.spec 4 Aug 2012 10:37: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,8 +28,6 @@ # 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' @@ -38,10 +36,14 @@ %define section free %define base_name torque +%define _binary_payload w9.gzdio +%define _source_payload w9.gzdio +%define _binary_filedigest_algorithm 1 +%define _source_filedigest_algorithm 1 Name: db-torque Version: 3.3 -Release: 1%{dist} +Release: 4%{?dist} Epoch: 0 Summary: Torque persistence layer @@ -73,14 +75,10 @@ Patch1: db-torque-3.3-runtime-pom.patch Patch2: db-torque-3.3-generator-project_xml.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -#Distribution: JPackage -#Vendor: JPackage Project -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRequires: jpackage-utils >= 0:1.7.5 -BuildRequires: java-devel >= 0:1.5.0 +BuildRequires: java-devel >= 0:1.6.0 BuildRequires: junit %if %{with_maven} BuildRequires: maven >= 0:1.1 @@ -88,8 +86,8 @@ BuildRequires: maven-plugin-changelog BuildRequires: maven-plugin-changes BuildRequires: maven-plugin-checkstyle -BuildRequires: checkstyle < 0:5 -BuildRequires: checkstyle-optional < 0:5 +BuildRequires: checkstyle4 +BuildRequires: checkstyle4-optional BuildRequires: maven-plugin-developer-activity BuildRequires: maven-plugin-file-activity BuildRequires: maven-plugin-jcoverage @@ -104,8 +102,8 @@ BuildRequires: maven-plugin-test BuildRequires: maven-plugin-xdoc BuildRequires: sf-findbugs-maven-plugin -BuildRequires: saxon -BuildRequires: saxon-scripts + +# BuildRequires: maven2 >= 0:2.0.7 BuildRequires: maven2-plugin-compiler BuildRequires: maven2-plugin-gpg @@ -116,55 +114,50 @@ BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-source BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit3 %endif BuildRequires: excalibur-avalon-framework-api BuildRequires: excalibur-avalon-framework-impl BuildRequires: excalibur-avalon-logkit BuildRequires: fulcrum-testcontainer BuildRequires: fulcrum-yaafi -BuildRequires: gnu-getopt -BuildRequires: jakarta-commons-beanutils -BuildRequires: jakarta-commons-collections -BuildRequires: jakarta-commons-configuration >= 0:1.2 -BuildRequires: jakarta-commons-dbcp -BuildRequires: jakarta-commons-lang -BuildRequires: jakarta-commons-logging -BuildRequires: jakarta-commons-pool +BuildRequires: gnu.getopt +BuildRequires: apache-commons-beanutils +BuildRequires: apache-commons-collections +BuildRequires: apache-commons-configuration >= 0:1.2 +BuildRequires: apache-commons-dbcp +BuildRequires: apache-commons-lang +BuildRequires: apache-commons-logging +BuildRequires: apache-commons-pool BuildRequires: jakarta-jcs BuildRequires: jamonapi BuildRequires: log4j BuildRequires: mysql-connector-java -#BuildRequires: village +BuildRequires: saxon +BuildRequires: saxon-scripts BuildRequires: texen -BuildRequires: xerces-j2 -BuildRequires: xml-commons-apis +#BuildRequires: xerces-j2 +#BuildRequires: xml-commons-apis - -Requires: java >= 0:1.5.0 +Requires: java >= 0:1.6.0 Requires: excalibur-avalon-framework-api +Requires: excalibur-avalon-framework-impl Requires: excalibur-avalon-logkit -Requires: jakarta-commons-beanutils -Requires: jakarta-commons-collections -Requires: jakarta-commons-configuration >= 0:1.2 -Requires: jakarta-commons-dbcp -Requires: jakarta-commons-lang -Requires: jakarta-commons-logging -Requires: jakarta-commons-pool +Requires: apache-commons-beanutils +Requires: apache-commons-collections +Requires: apache-commons-configuration >= 0:1.2 +Requires: apache-commons-dbcp +Requires: apache-commons-lang +Requires: apache-commons-logging +Requires: apache-commons-pool Requires: jakarta-jcs Requires: jamonapi -Requires: jdbc-stdext >= 0:2.0 -Requires: jndi >= 0:1.2.1 +#Requires: jdbc-stdext >= 0:2.0 +#Requires: jndi >= 0:1.2.1 Requires: log4j -#Requires: village Requires: texen -Requires: xerces-j2 -Requires: xml-commons-apis -%if %{gcj_support} -BuildRequires: gnu-crypto -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif +#Requires: xerces-j2 +#Requires: xml-commons-apis Requires(post): jpackage-utils >= 0:1.7.5 Requires(postun): jpackage-utils >= 0:1.7.5 @@ -178,8 +171,6 @@ %package runtime-javadoc Summary: Javadoc for %{name}-runtime Group: Development/Documentation -#Requires(post): /bin/rm,/bin/ln -#Requires(postun): /bin/rm %description runtime-javadoc %{summary}. @@ -201,8 +192,6 @@ %package gen-javadoc Summary: Javadoc for %{name}-gen Group: Development/Documentation -#Requires(post): /bin/rm,/bin/ln -#Requires(postun): /bin/rm %description gen-javadoc %{summary}. @@ -240,8 +229,6 @@ %package village-javadoc Summary: Javadoc for %{name}-village Group: Development/Documentation -#Requires(post): /bin/rm,/bin/ln -#Requires(postun): /bin/rm Provides: village-javadoc = %{epoch}:%{version}-%{release} Obsoletes: village-javadoc < 0:3.3 @@ -283,8 +270,6 @@ %package maven2-plugin-javadoc Summary: Javadoc for %{name}-maven2-plugin Group: Development/Documentation -#Requires(post): /bin/rm,/bin/ln -#Requires(postun): /bin/rm %description maven2-plugin-javadoc %{summary}. @@ -337,7 +322,6 @@ %build -#export JAVA_HOME=%{_jvmdir}/java-1.5.0 mkdir external_repo ln -s %{_javadir} external_repo/JPP @@ -350,6 +334,7 @@ -Dmaven.repo.local=$MAVEN_REPO_LOCAL \ -Dmaven2.jpp.depmap.file=%{SOURCE1} \ -Dgpg.skip=true \ + -Dmaven.test.failure.ignore=true \ install javadoc:javadoc popd @@ -513,65 +498,14 @@ cp -pr torque-village-3.3/target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-village-%{version} -%if %{gcj_support} -export CLASSPATH=$(build-classpath gnu-crypto) -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT -#%post runtime-javadoc -#rm -f %{_javadocdir}/%{name} -#ln -s %{name}-%{version} %{_javadocdir}/%{name} - -#%postun runtime-javadoc -#if [ "$1" = "0" ]; then -# rm -f %{_javadocdir}/%{name} -#fi - -#%post gen-javadoc -#rm -f %{_javadocdir}/%{name}-gen -#ln -s %{name}-gen-%{version} %{_javadocdir}/%{name}-gen - -#%postun gen-javadoc -#if [ "$1" = "0" ]; then -# rm -f %{_javadocdir}/%{name}-gen -#fi - %post %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post gen -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun gen -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %files %defattr(-,root,root,-) @@ -583,10 +517,6 @@ %{_datadir}/%{name}-%{version} %{_datadir}/maven2/poms/* %{_mavendepmapfragdir}/* -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-runtime-%{version}.jar.* -%endif %files runtime-javadoc %defattr(-,root,root,-) @@ -603,10 +533,6 @@ %{_javadir}/%{name}-generator-%{version}.jar %{_javadir}/%{name}-generator.jar %{_javadir}/%{name}-gen.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-generator-%{version}.jar.* -%endif %files gen-javadoc %defattr(-,root,root,-) @@ -634,10 +560,6 @@ %{_javadir}/%{name}-village-%{version}.jar %{_javadir}/%{name}-village.jar %{_javadir}/village.jar -%if %{gcj_support} -%dir %attr(-,root,root) %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/%{name}-village-%{version}.jar.* -%endif %files village-javadoc %defattr(-,root,root,-) @@ -677,7 +599,16 @@ %doc %{_docdir}/%{name}-maven2-plugin-%{version} %changelog -* Thu Aug 14 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.3-1.jpp5 +* Sat Aug 04 2012 Ralph Apel <r.apel at r-apel.de> - 0:3.3-4 +- First JPP-6 release + +* Fri Apr 24 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.3-3.jpp5 +- BR checkstyle4, checkstyle4-optional + +* Wed Jan 21 2009 Ralph Apel <r.apel at r-apel.de> - 0:3.3-2.jpp5 +- BR saxon, saxon-scripts + +* Wed Aug 13 2008 Ralph Apel <r.apel at r-apel.de> - 0:3.3-1.jpp5 - 3.3 * Wed Mar 07 2007 Ralph Apel <r.apel at r-apel.de> - 0:3.1.1-7jpp Index: pom-maven2jpp-mapdeps.xsl =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/db-torque/pom-maven2jpp-mapdeps.xsl,v retrieving revision 1.2 diff -u -r1.2 pom-maven2jpp-mapdeps.xsl --- pom-maven2jpp-mapdeps.xsl 4 Nov 2005 21:27:56 -0000 1.2 +++ pom-maven2jpp-mapdeps.xsl 4 Aug 2012 10:37:16 -0000 @@ -47,19 +47,23 @@ <xsl:template name="replace"> <xsl:param name="artifact"/> <xsl:variable name="this" select="."/> - <xsl:element name="dependency"> <xsl:choose> <xsl:when test="document($map)//dependency/maven[./artifactId/text() = $artifact]"> <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]"> - <xsl:copy-of select="../jpp/*"/> - <xsl:copy-of select="$this/properties"/> + <xsl:if test="../jpp"> + <xsl:element name="dependency"> + <xsl:copy-of select="../jpp/*"/> + <xsl:copy-of select="$this/properties"/> + </xsl:element> + </xsl:if> </xsl:for-each> </xsl:when> <xsl:otherwise> - <xsl:copy-of select="./*"/> + <xsl:element name="dependency"> + <xsl:copy-of select="./*"/> + </xsl:element> </xsl:otherwise> </xsl:choose> - </xsl:element> <xsl:if test="document($map)//dependency/maven[./artifactId/text() = $artifact]"> <xsl:for-each select="document($map)//dependency/maven[./artifactId/text() = $artifact][1]"> <xsl:for-each select="../add/dependency">