From d1e620c6826d884ed80ed4c01300fad92f9dad31 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Aug 28 2010 14:54:40 +0000 Subject: Retired package due to being renamed in F14+ --- diff --git a/commons-beanutils-1.7.0-BeanificationTestCase.patch b/commons-beanutils-1.7.0-BeanificationTestCase.patch deleted file mode 100644 index dccee09..0000000 --- a/commons-beanutils-1.7.0-BeanificationTestCase.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/test/org/apache/commons/beanutils/BeanificationTestCase.java.sav 2007-07-24 13:45:25.000000000 +0200 -+++ ./src/test/org/apache/commons/beanutils/BeanificationTestCase.java 2007-07-24 13:46:18.000000000 +0200 -@@ -96,7 +96,7 @@ - public void testMemoryTestMethodology() throws Exception { - // test methodology - // many thanks to Juozas Baliuka for suggesting this method -- ClassLoader loader = new ClassLoader() {}; -+ ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {}; - WeakReference reference = new WeakReference(loader); - Class myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean"); - diff --git a/commons-beanutils-1.7.0-LocaleBeanificationTestCase.patch b/commons-beanutils-1.7.0-LocaleBeanificationTestCase.patch deleted file mode 100644 index 677094e..0000000 --- a/commons-beanutils-1.7.0-LocaleBeanificationTestCase.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java.sav 2007-07-24 13:50:13.000000000 +0200 -+++ ./src/test/org/apache/commons/beanutils/locale/LocaleBeanificationTestCase.java 2007-07-24 13:50:50.000000000 +0200 -@@ -100,7 +100,7 @@ - public void testMemoryTestMethodology() throws Exception { - // test methodology - // many thanks to Juozas Baliuka for suggesting this method -- ClassLoader loader = new ClassLoader() {}; -+ ClassLoader loader = new ClassLoader(this.getClass().getClassLoader()) {}; - WeakReference reference = new WeakReference(loader); - Class myClass = loader.loadClass("org.apache.commons.beanutils.BetaBean"); - diff --git a/commons-beanutils-1.7.0-jdk6.patch b/commons-beanutils-1.7.0-jdk6.patch deleted file mode 100644 index 5ff4622..0000000 --- a/commons-beanutils-1.7.0-jdk6.patch +++ /dev/null @@ -1,233 +0,0 @@ ---- commons-beanutils-1.7.0-src/src/test/org/apache/commons/beanutils/TestResultSet.java.orig 2004-02-28 08:18:36.000000000 -0500 -+++ commons-beanutils-1.7.0-src/src/test/org/apache/commons/beanutils/TestResultSet.java 2008-09-19 11:28:22.000000000 -0400 -@@ -34,6 +34,9 @@ - import java.sql.Statement; - import java.sql.Time; - import java.sql.Timestamp; -+import java.sql.RowId; -+import java.sql.NClob; -+import java.sql.SQLXML; - import java.util.Calendar; - import java.util.Map; - -@@ -860,5 +863,204 @@ - throw new UnsupportedOperationException(); - } - -+ // new method for JDK6 -+ public RowId getRowId(int columnIndex) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public RowId getRowId(String columnLabel) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateRowId(int columnIndex, RowId x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateRowId(String columnLabel, RowId x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public int getHoldability() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public boolean isClosed() throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNString(int columnIndex, String nString) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNString(String columnLabel, String nString) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(int columnIndex, NClob nClob) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(String columnLabel, NClob nClob) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public NClob getNClob(int columnIndex) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public NClob getNClob(String columnLabel) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public SQLXML getSQLXML(int columnIndex) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public SQLXML getSQLXML(String columnLabel) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public String getNString(int columnIndex) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public String getNString(String columnLabel) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public Reader getNCharacterStream(int columnIndex) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public Reader getNCharacterStream(String columnLabel) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } - -+ public void updateAsciiStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBinaryStream(String columnLabel, InputStream x, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateCharacterStream(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBlob(int columnIndex, InputStream inputStream, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBlob(String columnLabel, InputStream inputStream, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateCharacterStream(int columnIndex, Reader x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateClob(int columnIndex, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateClob(String columnLabel, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(int columnIndex, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public void updateNClob(String columnLabel, Reader reader) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public T unwrap(Class iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } - } ---- commons-beanutils-1.7.0-src/src/test/org/apache/commons/beanutils/TestResultSetMetaData.java.orig 2004-02-28 08:18:36.000000000 -0500 -+++ commons-beanutils-1.7.0-src/src/test/org/apache/commons/beanutils/TestResultSetMetaData.java 2008-09-19 11:15:04.000000000 -0400 -@@ -166,5 +166,13 @@ - throw new UnsupportedOperationException(); - } - -+ // new methods for JDK6 - -+ public T unwrap(Class iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } -+ -+ public boolean isWrapperFor(Class iface) throws SQLException { -+ throw new UnsupportedOperationException(); -+ } - } diff --git a/commons-beanutils-1.7.0-jpp-depmap.xml b/commons-beanutils-1.7.0-jpp-depmap.xml deleted file mode 100644 index 51bf0f8..0000000 --- a/commons-beanutils-1.7.0-jpp-depmap.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - commons-collections - commons-collections - 3.0 - - - JPP - commons-collections - commons-collections.jar - 3.0 - - - - - commons-collections - commons-collections-testframework - SNAPSHOT - - - JPP - commons-collections-testframework - commons-collections-testframework.jar - SNAPSHOT - - - - - commons-logging - commons-logging - 1.0.3 - - - JPP - commons-logging - commons-logging.jar - 1.0.3 - - - diff --git a/commons-beanutils-1.7.0-navigation_xml.patch b/commons-beanutils-1.7.0-navigation_xml.patch deleted file mode 100644 index a5c3c68..0000000 --- a/commons-beanutils-1.7.0-navigation_xml.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xdocs/navigation.xml.sav 2007-07-24 14:08:57.000000000 +0200 -+++ xdocs/navigation.xml 2007-07-24 14:09:17.000000000 +0200 -@@ -14,7 +14,7 @@ - See the License for the specific language governing permissions and - limitations under the License. - --> -- -+ - - - BeanUtils diff --git a/commons-beanutils-1.7.0-project_properties.patch b/commons-beanutils-1.7.0-project_properties.patch deleted file mode 100644 index d7581ab..0000000 --- a/commons-beanutils-1.7.0-project_properties.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- project.properties.sav 2007-07-24 15:16:30.000000000 +0200 -+++ project.properties 2007-07-24 15:16:51.000000000 +0200 -@@ -13,11 +13,11 @@ - # limitations under the License. - - # documentation properties --maven.xdoc.jsl=../commons-build/commons-site.jsl -+maven.xdoc.jsl=file://${basedir}/commons-build/commons-site.jsl - maven.xdoc.date=left - maven.xdoc.version=${pom.currentVersion} - maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html - maven.xdoc.poweredby.image=maven-feather.png - - --beanutils.cvs=pserver:anoncvs@cvs.apache.org:/home/cvspublic -\ No newline at end of file -+beanutils.cvs=pserver:anoncvs@cvs.apache.org:/home/cvspublic diff --git a/commons-beanutils-1.7.0-project_xml.patch b/commons-beanutils-1.7.0-project_xml.patch deleted file mode 100644 index 9fc272b..0000000 --- a/commons-beanutils-1.7.0-project_xml.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- project.xml.sav 2004-07-27 23:40:14.000000000 +0200 -+++ project.xml 2007-07-24 13:52:05.000000000 +0200 -@@ -155,7 +155,7 @@ - - - -- -+ - **/*TestCase.java - - -@@ -168,15 +168,13 @@ - - - -- -- -- - -+ - - **/*.properties - -+ - -- - - - diff --git a/commons-beanutils-1.7.0.pom b/commons-beanutils-1.7.0.pom deleted file mode 100644 index a8c4f71..0000000 --- a/commons-beanutils-1.7.0.pom +++ /dev/null @@ -1,13 +0,0 @@ - - 4.0.0 - commons-beanutils - commons-beanutils - 1.7.0 - - - commons-logging - commons-logging - 1.0.3 - - - \ No newline at end of file diff --git a/commons-beanutils-bean-collections-1.7.0.pom b/commons-beanutils-bean-collections-1.7.0.pom deleted file mode 100644 index 199da19..0000000 --- a/commons-beanutils-bean-collections-1.7.0.pom +++ /dev/null @@ -1,6 +0,0 @@ - - 4.0.0 - commons-beanutils - commons-beanutils-bean-collections - 1.7.0 - \ No newline at end of file diff --git a/commons-beanutils-build-other-jars.xml b/commons-beanutils-build-other-jars.xml deleted file mode 100644 index 7340726..0000000 --- a/commons-beanutils-build-other-jars.xml +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/commons-beanutils-core-1.7.0.pom b/commons-beanutils-core-1.7.0.pom deleted file mode 100644 index aea2b85..0000000 --- a/commons-beanutils-core-1.7.0.pom +++ /dev/null @@ -1,26 +0,0 @@ - - - - 4.0.0 - commons-beanutils - commons-beanutils-core - 1.7.0 - - - commons-logging - commons-logging - 1.0 - - - commons-collections - commons-collections - 2.0 - - - junit - junit - 3.7 - test - - - diff --git a/commons-beanutils-maven.xml b/commons-beanutils-maven.xml deleted file mode 100644 index 03bf6e0..0000000 --- a/commons-beanutils-maven.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..9657ed8 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +This package has been renamed to apache-commons-beanutils in F14+ \ No newline at end of file diff --git a/jakarta-commons-beanutils-component-info.xml b/jakarta-commons-beanutils-component-info.xml deleted file mode 100644 index a3fd62b..0000000 --- a/jakarta-commons-beanutils-component-info.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - diff --git a/jakarta-commons-beanutils.spec b/jakarta-commons-beanutils.spec deleted file mode 100644 index 6174c3f..0000000 --- a/jakarta-commons-beanutils.spec +++ /dev/null @@ -1,418 +0,0 @@ -# Copyright (c) 2000-2008, JPackage Project -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the -# distribution. -# 3. Neither the name of the JPackage Project nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# - -%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} -%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} -%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} -%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} - -%bcond_without jdk6 -%bcond_with maven - -%define _with_gcj_support 1 -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} - -%define base_name beanutils -%define short_name commons-beanutils - -%define section free - -Name: jakarta-commons-beanutils -Version: 1.7.0 -Release: 12.3%{?dist} -Epoch: 0 -Summary: Jakarta Commons BeanUtils Package -License: ASL 2.0 -Group: Development/Libraries/Java -URL: http://jakarta.apache.org/commons/%{base_name}/ -Source0: http://www.apache.org/dist/jakarta/commons/beanutils/source/commons-beanutils-1.7.0-src.tar.gz -Source1: pom-maven2jpp-depcat.xsl -Source2: pom-maven2jpp-newdepmap.xsl -Source3: pom-maven2jpp-mapdeps.xsl -Source4: commons-beanutils-1.7.0-jpp-depmap.xml -Source5: commons-beanutils-1.7.0.pom -Source6: commons-beanutils-bean-collections-1.7.0.pom -Source7: commons-beanutils-core-1.7.0.pom -Source8: commons-build.tar.gz -Source9: commons-beanutils-maven.xml -Source10: commons-beanutils-build-other-jars.xml -Source11: jakarta-commons-beanutils-component-info.xml -Patch0: commons-beanutils-1.7.0-project_xml.patch -Patch1: commons-beanutils-1.7.0-BeanificationTestCase.patch -Patch2: commons-beanutils-1.7.0-LocaleBeanificationTestCase.patch -Patch3: commons-beanutils-1.7.0-navigation_xml.patch -Patch4: commons-beanutils-1.7.0-project_properties.patch -Patch5: commons-beanutils-1.7.0-jdk6.patch -BuildRequires: ant -BuildRequires: ant-junit -BuildRequires: junit -%if %with maven -BuildRequires: maven >= 0:1.1 -BuildRequires: maven-plugin-xdoc -BuildRequires: saxon -BuildRequires: saxon-scripts -%endif -BuildRequires: jakarta-commons-collections >= 0:2.0 -BuildRequires: jakarta-commons-logging >= 0:1.0 -BuildRequires: java-1.6.0-devel -BuildRequires: jpackage-utils > 0:1.7.2 -BuildRequires: coreutils -Requires: jakarta-commons-collections >= 0:2.0 -Requires: jakarta-commons-logging >= 0:1.0 -BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot -Provides: %{short_name} = %{epoch}:%{version}-%{release} -Obsoletes: %{short_name} < %{epoch}:%{version}-%{release} -Requires(post): jpackage-utils >= 0:1.7.2 -Requires(postun): jpackage-utils >= 0:1.7.2 - -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -%else -BuildArch: noarch -%endif - -%description -The scope of this package is to create a package of Java utility methods -for accessing and modifying the properties of arbitrary JavaBeans. No -dependencies outside of the JDK are required, so the use of this package -is very lightweight. - -%package javadoc -Summary: Javadoc for %{name} -Group: Development/Documentation - -%description javadoc -%{summary}. - -%if %with maven -%package manual -Summary: Documents for %{name} -Group: Development/Documentation - -%description manual -%{summary}. -%endif - -%prep -%setup -q -n %{short_name}-%{version}-src -%setup -q -n %{short_name}-%{version}-src -T -D -a 8 -cp -p %{SOURCE9} maven.xml -cp -p %{SOURCE10} build-other-jars.xml -#cp LICENSE.txt LICENSE -# remove all binary libs -# (dwalluck): jars are already removed -%patch0 -b .sav -%patch1 -b .sav -%patch2 -b .sav -%patch3 -b .sav -%patch4 -b .sav -%if %with jdk6 -%patch5 -p1 -%endif - -%build -%if %with maven -if [ ! -f %{SOURCE4} ]; then -export DEPCAT=$(pwd)/commons-beanutils-1.7.0-depcat.new.xml -echo '' > $DEPCAT -echo '' >> $DEPCAT -for p in $(find . -name project.xml); do - pushd $(dirname $p) - %{_bindir}/saxon project.xml %{SOURCE1} >> $DEPCAT - popd -done -echo >> $DEPCAT -echo '' >> $DEPCAT -%{_bindir}/saxon $DEPCAT %{SOURCE2} > commons-beanutils-1.7.0-depmap.new.xml -fi - -for p in $(find . -name project.xml); do - pushd $(dirname $p) - cp project.xml project.xml.orig - %{_bindir}/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} - popd -done -mkdir -p .maven/repository/JPP/jars -mkdir -p .maven/plugins - -export MAVEN_HOME_LOCAL=$(pwd)/.maven - -maven -e \ - -Dmaven.repo.remote=file:/usr/share/maven/repository \ - -Dmaven.home.local=${MAVEN_HOME_LOCAL} \ - jar:jar site - -%else -export CLASSPATH=$(build-classpath commons-collections commons-logging) -export OPT_JAR_LIST="ant/ant-junit junit" -ant -Dbuild.sysclasspath=first test dist -%endif - -%install -rm -rf $RPM_BUILD_ROOT - -# jars -install -d -m 755 $RPM_BUILD_ROOT%{_javadir} -%if %with maven -install -m 644 target/%{short_name}-1.7.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 target/%{short_name}-bean-collections-1.7.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections-%{version}.jar -install -m 644 target/%{short_name}-core-1.7.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -%else -install -m 644 dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar -install -m 644 dist/%{short_name}-core.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core-%{version}.jar -install -m 644 dist/%{short_name}-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections-%{version}.jar -%endif -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) -(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) - -%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name} -%add_to_maven_depmap %{short_name} %{short_name}-core %{version} JPP %{short_name}-core -%add_to_maven_depmap %{short_name} %{short_name}-bean-collections %{version} JPP %{short_name}-bean-collections - -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -pm 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}.pom -install -pm 644 %{SOURCE6} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}-bean-collections.pom -install -pm 644 %{SOURCE7} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{short_name}-core.pom - -# javadoc -install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -%if %with maven -cp -pr target/docs/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -# FIXME: (dwalluck): This breaks rpmbuild -bi --short-circuit -rm -rf target/docs/apidocs -%else -cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -%endif -%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} - -# manual -install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site -cp -p PROPOSAL.html STATUS.html RELEASE-NOTES.txt LICENSE.txt \ - $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} -%if %with maven -cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site -%endif - -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - -%clean -rm -rf $RPM_BUILD_ROOT - -%triggerpostun -- commons-beanutils < 1.7 -pushd %{_javadir} > /dev/null - ln -sf %{name}-%{version}.jar %{short_name}-%{version}.jar - ln -sf %{short_name}-%{version}.jar %{short_name}.jar -popd > /dev/null - -%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 - -%files -%defattr(0644,root,root,0755) -%doc *.html *.txt -%{_javadir}/*.jar -%{_datadir}/maven2/poms/* -%{_mavendepmapfragdir}/* -%if %{gcj_support} -%dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-1.7.0.jar.* -# Not created by aot-compile for being subsets of the full JAR -#%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-bean-collections-1.7.0.jar.* -#%attr(-,root,root) %{_libdir}/gcj/%{name}/jakarta-commons-beanutils-core-1.7.0.jar.* -%endif - -%files javadoc -%defattr(0644,root,root,0755) -%{_javadocdir}/%{name}-%{version} -%{_javadocdir}/%{name} - -%if %with maven -%files manual -%defattr(0644,root,root,0755) -%{_docdir}/%{name}-%{version}/site -%endif - -%changelog -* Fri Jul 24 2009 Fedora Release Engineering - 0:1.7.0-12.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Wed Feb 25 2009 Fedora Release Engineering - 0:1.7.0-11.3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.3 -- Fedora-specific: enable GCJ support - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.2 -- Fedora-specific: BuildRequires: java-1.6.0-devel - -* Thu Oct 23 2008 David Walluck 0:1.7.0-10.1 -- Fedora-specific: remove repolib -- Fedora-specific: enable JDK6 support - -* Mon Oct 20 2008 David Walluck 0:1.7.0-10 -- add flag to build with maven - -* Fri Sep 19 2008 David Walluck 0:1.7.0-9 -- add jdk6 patch -- fix repolib - -* Sun Jun 15 2008 David Walluck 0:1.7.0-8.jpp5 -- fix duplicate files -- correctly unpack sources -- remove spurious gnu-crypto requirement -- remove spurious javadoc package requirements -- fix javadoc directory -- fix build-classpath call -- use macros - -* Fri May 30 2008 Permaine Cheung - 0:1.7.0-7 -- First JPP5 build - -* Tue Jul 24 2007 Ralph Apel - 0:1.7.0-6jpp -- Make Vendor, Distribution based on macro -- Fix aot build -- Add poms and depmap frags -- Build with maven1 by default -- Add manual subpackage when built with maven - -* Tue Mar 13 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.ep1.2 -- Fix repolib location - -* Tue Mar 13 2007 Fernando Nasser - 0:1.7.0-2jpp.ep1.1 -- New repolib location - -* Mon Mar 05 2007 Fernando Nasser - 0:1.7.0-2jpp.el4ep1.3 -- Remove pre section used for RHUG cleanup - -* Tue Feb 20 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.2 -- Add -brew suffix - -* Fri Feb 17 2007 Vivek Lakshmanan - 0:1.7.0-2jpp.el4ep1.1 -- Add repolib support - -* Thu Aug 17 2006 Fernando Nasser - 0:1.7.0-5jpp -- Require what is used in post/postun for javadoc - -* Fri Jul 14 2006 Fernando Nasser - 0:1.7.0-4jpp -- Add AOT bits - -* Thu May 11 2006 Fernando Nasser - 0:1.7.0-3jpp -- Add header -- Remove unecessary macro definitions - -* Wed Feb 22 2006 Fernando Nasser - 0:1.7.0-2jpp_1rh -- Merge with upstream - -* Wed Apr 27 2005 Fernando Nasser - 0:1.7.0-1jpp_3rh -- Fix build so that collections jar is created - -* Sat Jan 29 2005 Ralph Apel - 0:1.7.0-2jpp -- Use the "dist" target to get a full build, including bean-collections - -* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp_1rh -- Import from upstream - -* Thu Oct 21 2004 Fernando Nasser - 0:1.7.0-1jpp -- Upgrade to 1.7.0 - -* Fri Oct 1 2004 Andrew Overholt 0:1.6.1-4jpp_6rh -- add coreutils BuildRequires - -* Sun Aug 23 2004 Randy Watler - 0:1.6.1-5jpp -- Rebuild with ant-1.6.2 - -* Fri Jul 2 2004 Aizaz Ahmed 0:1.6.1-4jpp_5rh -- Added trigger to restore symlinks that are removed if ugrading - from a commons-beanutils rhug package - -* Fri Apr 2 2004 Frank Ch. Eigler 0:1.6.1-4jpp_4rh -- more of the same, for version-suffixed .jar files - -* Fri Mar 26 2004 Frank Ch. Eigler 0:1.6.1-4jpp_3rh -- add RHUG upgrade cleanup - -* Fri Mar 5 2004 Frank Ch. Eigler 0:1.6.1-4jpp_2rh -- RH vacuuming part II - -* Thu Mar 4 2004 Frank Ch. Eigler 0:1.6.1-4jpp_1rh -- RH vacuuming - -* Fri May 09 2003 David Walluck 0:1.6.1-4jpp -- update for JPackage 1.5 - -* Thu Feb 27 2003 Henri Gomez 1.6.1-2jpp -- fix ASF license and add packager name - -* Wed Feb 19 2003 Henri Gomez 1.6.1-1jpp -- 1.6.1 - -* Thu Feb 13 2003 Henri Gomez 1.6-1jpp -- 1.6 - -* Thu Oct 24 2002 Henri Gomez 1.5-1jpp -- 1.5 - -* Fri Aug 23 2002 Henri Gomez 1.4.1-1jpp -- 1.4.1 - -* Tue Aug 20 2002 Henri Gomez 1.4-1jpp -- 1.4 - -* Fri Jul 12 2002 Henri Gomez 1.3-3jpp -- change to commons-xxx.jar instead of commons-xxx.home in ant parameters - -* Mon Jun 10 2002 Henri Gomez 1.3-2jpp -- use sed instead of bash 2.x extension in link area to make spec compatible - with distro using bash 1.1x - -* Fri Jun 07 2002 Henri Gomez 1.3-1jpp -- 1.3 -- added short names in %%{_javadir}, as does jakarta developpers -- first jPackage release diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl deleted file mode 100644 index 92834cc..0000000 --- a/pom-maven2jpp-depcat.xsl +++ /dev/null @@ -1,109 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -ERROR - - - - - - - - - - JPP - - - - - - - - - - - - - - - - - - - -ERROR - - - - - - - - - - - - - - - - - - -ERROR - - - - - - .jar - . - - - .jar - - - - - - - - - - - - diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl deleted file mode 100644 index 566a1da..0000000 --- a/pom-maven2jpp-mapdeps.xsl +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl deleted file mode 100644 index 3b8dbfa..0000000 --- a/pom-maven2jpp-newdepmap.xsl +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/sources b/sources deleted file mode 100644 index 6a8e82c..0000000 --- a/sources +++ /dev/null @@ -1,2 +0,0 @@ -3fd5cbdf70363b151de5cd538f726e67 commons-beanutils-1.7.0-src.tar.gz -a9522fe95e0fe85857174b3c19763c97 commons-build.tar.gz