diff --git a/proxool.spec b/proxool.spec index 5577fec..b5ddaf0 100644 --- a/proxool.spec +++ b/proxool.spec @@ -1,67 +1,45 @@ -%global git_commit 659fc71 +Name: proxool +Version: 0.9.1 +Release: 23 +Summary: Connection pool library for Java +License: ASL 2.0 +URL: http://proxool.sourceforge.net/ +Source0: proxool-proxool-659fc71.tar.gz +Source1: proxool.pom +Patch0001: proxool-no-embedded-cglib.patch -Summary: Java connection pool library -Name: proxool -Version: 0.9.1 -Release: 22%{?dist} -Epoch: 0 -License: ASL 2.0 -URL: http://proxool.sourceforge.net/ -# Grabbing a newer version from git due to license change -# https://github.com/proxool/proxool/tarball/master -# (commit 659fc71e617151327779802a5171f0da8205918d) -Source0: proxool-proxool-%{git_commit}.tar.gz -Source1: proxool.pom -Patch0: proxool-no-embedded-cglib.patch +BuildRequires: ant >= 0:1.7.1 ant-junit java-devel >= 0:1.6.0 javapackages-local +BuildRequires: mvn(avalon-framework:avalon-framework-api) +BuildRequires: mvn(avalon-framework:avalon-framework-impl) +BuildRequires: mvn(avalon-logkit:avalon-logkit) mvn(com.puppycrawl.tools:checkstyle) +BuildRequires: mvn(commons-collections:commons-collections) mvn(net.sf.cglib:cglib) +BuildRequires: mvn(commons-lang:commons-lang) mvn(commons-logging:commons-logging) +BuildRequires: mvn(dom4j:dom4j) mvn(hsqldb:hsqldb:1) mvn(javax.servlet:javax.servlet-api) +BuildRequires: mvn(javax.transaction:jta) mvn(junit:junit) mvn(log4j:log4j:1.2.17) -BuildRequires: ant >= 0:1.7.1 -BuildRequires: ant-junit -BuildRequires: java-devel >= 0:1.6.0 -BuildRequires: javapackages-local -BuildRequires: mvn(avalon-framework:avalon-framework-api) -BuildRequires: mvn(avalon-framework:avalon-framework-impl) -BuildRequires: mvn(avalon-logkit:avalon-logkit) -BuildRequires: mvn(com.puppycrawl.tools:checkstyle) -BuildRequires: mvn(commons-collections:commons-collections) -BuildRequires: mvn(commons-lang:commons-lang) -BuildRequires: mvn(commons-logging:commons-logging) -BuildRequires: mvn(dom4j:dom4j) -BuildRequires: mvn(hsqldb:hsqldb:1) -BuildRequires: mvn(javax.servlet:javax.servlet-api) -BuildRequires: mvn(javax.transaction:jta) -BuildRequires: mvn(junit:junit) -BuildRequires: mvn(log4j:log4j:1.2.17) -BuildRequires: mvn(net.sf.cglib:cglib) - -BuildArch: noarch +BuildArch: noarch %description -Transparently adds connection pooling to your existing JDBC driver. -Complies with the J2SE API, giving you the confidence to develop to -standards. You can monitor the performance of your database -connections and listen to connection events. -It's easy to configure using the JDBC API, XML, or Java property -files - you decide. +Add connection pooling to your existing JDBC driver transparently.Compliant with the J2SE API,giving you the confidence +to develop standards. You can monitor the performance of the database Connect and listen for connection events. -%package javadoc -Summary: Javadoc for %{name} +%package help +Summary: Documentation for proxool +Provides: %{name}-javadoc = %{version}-%{release} +Obsoletes: %{name}-javadoc < %{version}-%{release} -%description javadoc -This package contains the API documentation for %{name}. +%description help +This package provides documentation for proxool. %prep -%setup -q -n %{name}-%{name}-%{git_commit} -#find . -name "*.jar" -exec rm {} \; +%autosetup -n proxool-proxool-659fc71 -p1 find . -type f -a -executable -exec chmod -x {} \; rm -rf lib jarjar -%patch0 -p1 -b .sav0 - sed -i.new_checkstyle "s|com.puppycrawl.tools.checkstyle.CheckStyleTask|com.puppycrawl.tools.checkstyle.ant.CheckstyleAntTask|" build.xml - sed -i.doclint "s|public="true"|public="true" additionalparam="-Xdoclint:none"|" build.xml -%mvn_file %{name}:%{name} %{name} +%mvn_file proxool:proxool proxool %build CLASSPATH=$(build-classpath cglib avalon-framework glassfish-servlet-api) ant build-jar javadoc @@ -71,82 +49,10 @@ CLASSPATH=$(build-classpath cglib avalon-framework glassfish-servlet-api) ant bu %mvn_install -J build/api %files -f .mfiles -%doc CHANGES.txt README.txt -%license LICENCE.txt +%doc CHANGES.txt README.txt LICENCE.txt -%files javadoc -f .mfiles-javadoc -%license LICENCE.txt +%files help -f .mfiles-javadoc %changelog -* Fri Jul 13 2018 Fedora Release Engineering - 0:0.9.1-22 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild - -* Fri Feb 09 2018 Fedora Release Engineering - 0:0.9.1-21 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 0:0.9.1-20 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Sat Feb 11 2017 Fedora Release Engineering - 0:0.9.1-19 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Thu Feb 04 2016 Fedora Release Engineering - 0:0.9.1-18 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Thu Dec 24 2015 gil cattaneo 0:0.9.1-17 -- convert %%defines to %%global - -* Tue Jul 07 2015 gil cattaneo 0:0.9.1-16 -- rebuilt for RHBZ#1240441 -- edit POM dependencies list -- use BRs mvn()-like - -* Thu Jun 18 2015 Fedora Release Engineering - 0:0.9.1-15 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Wed Feb 11 2015 gil cattaneo 0:0.9.1-14 -- introduce license macro - -* Sat Jun 07 2014 Fedora Release Engineering - 0:0.9.1-13 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Fri Mar 28 2014 Michael Simacek - 0:0.9.1-12 -- Use Requires: java-headless rebuild (#1067528) - -* Sat Aug 17 2013 gil cattaneo 0:0.9.1-11 -- fix rhbz#992827 -- fix BR list -- removed rpmlint problems -- minor changes to adapt to current guideline - -* Sun Aug 04 2013 Fedora Release Engineering - 0:0.9.1-10 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Thu Feb 14 2013 Fedora Release Engineering - 0:0.9.1-9 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sat Jul 21 2012 Fedora Release Engineering - 0:0.9.1-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Wed Mar 14 2012 Andy Grimm - 0:0.9.1-7 -- Fix cglib groupId in POM to match Fedora's cglib - -* Sat Jan 14 2012 Fedora Release Engineering - 0:0.9.1-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild - -* Tue Dec 13 2011 Andy Grimm - 0:0.9.1-5 -- Remove executable permissions introduced in git repository - -* Mon Dec 12 2011 Andy Grimm - 0:0.9.1-4 -- Fix license, use git upstream source, and fix - Requires for javadoc subpackage. - -* Thu Oct 20 2011 Andy Grimm - 0:0.9.1-3 -- add POM file - -* Wed Oct 19 2011 Andy Grimm - 0:0.9.1-2 -- spec file clean-up - -* Fri Aug 26 2011 Andy Grimm - 0:0.9.1-1 -- initial build - +* Fri Dec 20 2019 fengbing - 0.9.1-23 +- Package init