From 4118acb66faee84f268b9d28b3c5640347eac123dc2a6237c38daa1a84db06d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 29 Sep 2016 10:39:51 +0000 Subject: [PATCH] Rename first from jakarta-commons-pool OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=1 --- .gitattributes | 23 +++ .gitignore | 1 + commons-build.tar.bz2 | 3 + commons-pool-1.3-src.tar.bz2 | 3 + commons-pool-commons.ent | 20 +++ commons-pool-maven-build.dtd | 26 +++ jakarta-commons-pool-build.patch | 11 ++ jakarta-commons-pool.changes | 52 ++++++ jakarta-commons-pool.spec | 281 +++++++++++++++++++++++++++++++ pom-maven2jpp-depcat.xsl | 109 ++++++++++++ pom-maven2jpp-mapdeps.xsl | 78 +++++++++ pom-maven2jpp-newdepmap.xsl | 23 +++ pool-1.3-jpp-depmap.xml | 52 ++++++ pool-tomcat5-build.xml | 71 ++++++++ 14 files changed, 753 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 commons-build.tar.bz2 create mode 100644 commons-pool-1.3-src.tar.bz2 create mode 100644 commons-pool-commons.ent create mode 100644 commons-pool-maven-build.dtd create mode 100644 jakarta-commons-pool-build.patch create mode 100644 jakarta-commons-pool.changes create mode 100644 jakarta-commons-pool.spec create mode 100644 pom-maven2jpp-depcat.xsl create mode 100644 pom-maven2jpp-mapdeps.xsl create mode 100644 pom-maven2jpp-newdepmap.xsl create mode 100644 pool-1.3-jpp-depmap.xml create mode 100644 pool-tomcat5-build.xml diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/commons-build.tar.bz2 b/commons-build.tar.bz2 new file mode 100644 index 0000000..d8ebf5f --- /dev/null +++ b/commons-build.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cca660848595ef4d1bf21943eb6a7dc52f7dcbe476f1dee79b83f5085005b7b2 +size 98979 diff --git a/commons-pool-1.3-src.tar.bz2 b/commons-pool-1.3-src.tar.bz2 new file mode 100644 index 0000000..f04b7c8 --- /dev/null +++ b/commons-pool-1.3-src.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:03050bdb2287a3d269f38660f0cac562533224e8e56addd5dfd146859b2efb8e +size 292016 diff --git a/commons-pool-commons.ent b/commons-pool-commons.ent new file mode 100644 index 0000000..57c1e02 --- /dev/null +++ b/commons-pool-commons.ent @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + diff --git a/commons-pool-maven-build.dtd b/commons-pool-maven-build.dtd new file mode 100644 index 0000000..766051c --- /dev/null +++ b/commons-pool-maven-build.dtd @@ -0,0 +1,26 @@ + + + diff --git a/jakarta-commons-pool-build.patch b/jakarta-commons-pool-build.patch new file mode 100644 index 0000000..ee8cb2e --- /dev/null +++ b/jakarta-commons-pool-build.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2006-09-25 15:20:08.000000000 -0400 ++++ build.xml 2006-09-25 15:20:27.000000000 -0400 +@@ -93,7 +93,7 @@ + nonavbar="false" + serialwarn="false" + source="1.3"> +- ++ + + + diff --git a/jakarta-commons-pool.changes b/jakarta-commons-pool.changes new file mode 100644 index 0000000..40957ed --- /dev/null +++ b/jakarta-commons-pool.changes @@ -0,0 +1,52 @@ +------------------------------------------------------------------- +Mon Sep 9 11:05:48 UTC 2013 - tchvatal@suse.com + +- Move from jpackage-utils to javapackage-tools + +------------------------------------------------------------------- +Thu Mar 13 17:07:19 CET 2008 - mvyskocil@suse.cz + +- merged with jpackage 1.7 +- update to 1.3 +- changes in BuildRequires: + - java2-deve-packages was substituded by java-devel + - added a junit + - added a maven build support and maven related BuildRequires + - xml-commons-apis was moved to the maven build branch +- added a gcj build support +- included a maven depmap files +- remove a source=1.4 from build and a java14compat patch +- provides and obsoletes of main package contains the version +- new tomcat5 subpackage +- new manual subpackage (build only with maven) + +------------------------------------------------------------------- +Fri Sep 15 15:05:27 CEST 2006 - ro@suse.de + +- set source=1.4 for java + +------------------------------------------------------------------- +Wed Jan 25 21:46:38 CET 2006 - mls@suse.de + +- converted neededforbuild to BuildRequires + +------------------------------------------------------------------- +Thu Jul 28 13:53:21 CEST 2005 - jsmeix@suse.de + +- Adjustments in the spec file. + +------------------------------------------------------------------- +Mon Jul 18 16:28:18 CEST 2005 - jsmeix@suse.de + +- Current version 1.2 from JPackage.org + +------------------------------------------------------------------- +Thu Sep 16 15:49:57 CEST 2004 - skh@suse.de + +- Fix prerequires of javadoc subpackage + +------------------------------------------------------------------- +Thu Sep 2 18:58:54 CEST 2004 - skh@suse.de + +- Initial package created with version 1.2 (JPackage 1.5) + diff --git a/jakarta-commons-pool.spec b/jakarta-commons-pool.spec new file mode 100644 index 0000000..437e073 --- /dev/null +++ b/jakarta-commons-pool.spec @@ -0,0 +1,281 @@ +# +# spec file for package jakarta-commons-pool +# +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + + +%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} +%define with_maven 0 +%define base_name pool +%define short_name commons-%{base_name} +%define section free + +Name: jakarta-commons-pool +Version: 1.3 +Release: 0 +Summary: Jakarta Commons Pool Package +License: Apache-2.0 +Group: Development/Libraries/Java +Source0: http://www.apache.org/dist/jakarta/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.bz2 +Source1: pom-maven2jpp-depcat.xsl +Source2: pom-maven2jpp-newdepmap.xsl +Source3: pom-maven2jpp-mapdeps.xsl +Source4: %{base_name}-%{version}-jpp-depmap.xml +Source5: commons-build.tar.bz2 +Source6: pool-tomcat5-build.xml +Source7: commons-pool-maven-build.dtd +Source8: commons-pool-commons.ent +Patch0: jakarta-commons-pool-build.patch +Url: http://jakarta.apache.org/commons/pool/ +BuildRequires: ant +BuildRequires: javapackages-tools +BuildRequires: junit +%if ! %defined suse_version +BuildRequires: java-javadoc +%else +BuildRequires: java-devel +%endif +%if %{with_maven} +BuildRequires: maven >= 1.1 +BuildRequires: maven-plugin-changes +BuildRequires: maven-plugin-jdepend +BuildRequires: maven-plugin-jdiff +BuildRequires: maven-plugin-jxr +BuildRequires: maven-plugin-license +BuildRequires: maven-plugin-scm +BuildRequires: maven-plugin-tasklist +BuildRequires: maven-plugin-test +BuildRequires: maven-plugin-xdoc +BuildRequires: maven-plugins-base +BuildRequires: saxon +BuildRequires: saxon-scripts +BuildRequires: xerces-j2 +BuildRequires: xml-commons-jaxp-1.3-apis +%endif +%if ! %{gcj_support} +BuildArch: noarch +%endif +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Provides: %{short_name} = %{version}-%{release} +Obsoletes: %{short_name} < :%{version}-%{release} +%if %{gcj_support} +BuildRequires: java-gcj-compat-devel +Requires(post): java-gcj-compat +Requires(postun): java-gcj-compat +%endif + +%description +The goal of the Pool package is to create and maintain an object +(instance) pooling package to be distributed under the ASF license. The +package supports a variety of pool implementations, but encourages +support of an interface that makes these implementations +interchangeable. + + + +%package javadoc +Summary: Javadoc for jakarta-commons-pool +Group: Development/Libraries/Java +%if ! %defined suse_version +Requires: java-javadoc +%endif +Requires(post): /bin/rm,/bin/ln +Requires(postun): /bin/rm + +%description javadoc +The goal of Pool package it to create and maintain an object (instance) +pooling package to be distributed under the ASF license. The package +should support a variety of pool implementations, but encourage support +of an interface that makes these implementations interchangeable. + +This package contains the javadoc documentation for the Jakarta Commons +Pool Package. + + + +%package tomcat5 +Summary: Jakarta Commons Pool Package +Group: Development/Libraries/Java + +%description tomcat5 +The goal of the Pool package is to create and maintain an object +(instance) pooling package to be distributed under the ASF license. The +package supports a variety of pool implementations, but encourages +support of an interface that makes these implementations +interchangeable. + + + +%if %{with_maven} + +%package manual + +Summary: Documents for %{name} +Group: Development/Libraries/Java + +%description manual + +%{summary}. +%endif + +%prep +%setup -q -n %{short_name}-%{version}-src +# remove all binary libs +find . -name "*.jar" -exec rm -f {} \; +bzip2 -dc %{SOURCE5} | tar xf - +%patch0 +cp %{SOURCE6} . +%if %{with_maven} +#Hack to get around building completely offline +#TODO: properly setup xmlcatalog to properly point to local dtd and commons.ent +cp %{SOURCE7} maven-build.dtd +cp %{SOURCE8} commons.ent +sed -i 's_http://jakarta.apache.org/commons/build_'$(pwd)'_' maven-build.dtd +sed -i 's_http://jakarta.apache.org/commons/build_'$(pwd)'_' xdocs/navigation.xml +%endif + +%build +mkdir ./tmp +%if %{with_maven} +for p in $(find . -name project.xml); do + pushd $(dirname $p) + cp project.xml project.xml.orig + /usr/bin/saxon -o project.xml project.xml.orig %{SOURCE3} map=%{SOURCE4} + popd +done +maven -e \ + -Dmaven.javadoc.source=1.4 \ + -Dmaven.repo.remote=file:/usr/share/maven/repository \ + -Dmaven.home.local=$(pwd)/.maven \ + jar javadoc xdoc:transform +%else +ant -Djava.io.tmpdir=. clean dist +%endif +#commons-pool-tomcat5 +ant -f pool-tomcat5-build.xml +ant -Djava.io.tmpdir=. clean dist + +%install +# jars +install -d -m 755 $RPM_BUILD_ROOT%{_javadir} +%if %{with_maven} +install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%else +install -m 644 dist/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%endif +#tomcat5 jar +install -m 644 pool-tomcat5/%{short_name}-tomcat5.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-tomcat5-%{version}.jar +(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) +# 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} +rm -rf target/docs/apidocs +%else +cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} +%endif +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +%if %{with_maven} +# manual +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +%endif +%if %{gcj_support} +%{_bindir}/aot-compile-rpm +%endif + +%clean +rm -rf $RPM_BUILD_ROOT + +%post javadoc +rm -f %{_javadocdir}/%{name} +ln -s %{name}-%{version} %{_javadocdir}/%{name} + +%postun javadoc +if [ "$1" = "0" ]; then + rm -f %{_javadocdir}/%{name} +fi +%if %{gcj_support} + +%post +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif +%if %{gcj_support} + +%postun +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif +%if %{gcj_support} + +%post tomcat5 +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif +%if %{gcj_support} + +%postun tomcat5 +if [ -x %{_bindir}/rebuild-gcj-db ] +then + %{_bindir}/rebuild-gcj-db +fi +%endif + +%files +%defattr(0644,root,root,0755) +%doc README.txt LICENSE.txt +%{_javadir}/%{name}.jar +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{short_name}.jar +%{_javadir}/%{short_name}-%{version}.jar +%if %{gcj_support} +%attr(-,root,root) +%dir %{_libdir}/gcj/%{name} +%{_libdir}/gcj/%{name}/%{name}-%{version}.jar.db +%{_libdir}/gcj/%{name}/%{name}-%{version}.jar.so +%endif + +%files tomcat5 +%defattr(0644,root,root,0755) +%{_javadir}/*-tomcat5*.jar +%if %{gcj_support} +%attr(-,root,root) +%{_libdir}/gcj/%{name}/*-tomcat5* +%endif + +%files javadoc +%defattr(0644,root,root,0755) +%doc %{_javadocdir}/%{name}-%{version} +%ghost %{_javadocdir}/%{name} +%if %{with_maven} + +%files manual +%defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version} +%endif + +%changelog diff --git a/pom-maven2jpp-depcat.xsl b/pom-maven2jpp-depcat.xsl new file mode 100644 index 0000000..e1042c5 --- /dev/null +++ b/pom-maven2jpp-depcat.xsl @@ -0,0 +1,109 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +ERROR + + + + + + + + + + JPP + + + + + + + + + + + + + + + + + + + +ERROR + + + + + + + + + + + + + + + + + + +ERROR + + + + + + .jar + . + + + .jar + + + + + + + + + + + + diff --git a/pom-maven2jpp-mapdeps.xsl b/pom-maven2jpp-mapdeps.xsl new file mode 100644 index 0000000..d10cce7 --- /dev/null +++ b/pom-maven2jpp-mapdeps.xsl @@ -0,0 +1,78 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/pom-maven2jpp-newdepmap.xsl b/pom-maven2jpp-newdepmap.xsl new file mode 100644 index 0000000..ea1dcd3 --- /dev/null +++ b/pom-maven2jpp-newdepmap.xsl @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/pool-1.3-jpp-depmap.xml b/pool-1.3-jpp-depmap.xml new file mode 100644 index 0000000..fb5ddd2 --- /dev/null +++ b/pool-1.3-jpp-depmap.xml @@ -0,0 +1,52 @@ + + + + + junit + junit + 3.8.1 + + + JPP + junit + junit.jar + 3.8.1 + + + + + maven + maven-changes-plugin + 1.6 + http://maven.apache.org/maven-1.x/plugins/changes/ + plugin + + + + + maven + maven-jdiff-plugin + 1.5 + http://maven.apache.org/maven-1.x/plugins/jdiff/ + plugin + + + + + maven + maven-plugin-plugin + 1.7 + http://maven.apache.org/maven-1.x/plugins/plugin/ + plugin + + + + + maven + maven-scm-plugin + 1.5 + http://maven.apache.org/maven-1.x/plugins/scm/ + plugin + + + diff --git a/pool-tomcat5-build.xml b/pool-tomcat5-build.xml new file mode 100644 index 0000000..859feac --- /dev/null +++ b/pool-tomcat5-build.xml @@ -0,0 +1,71 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +