2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
%global base_name beanutils
|
|
|
|
%global short_name commons-%{base_name}
|
|
|
|
|
|
|
|
Name: apache-%{short_name}
|
|
|
|
Version: 1.8.3
|
2011-11-22 13:46:13 +00:00
|
|
|
Release: 5%{?dist}
|
2010-05-26 08:17:52 +00:00
|
|
|
Summary: Java utility methods for accessing and modifying the properties of arbitrary JavaBeans
|
|
|
|
License: ASL 2.0
|
|
|
|
Group: Development/Libraries
|
|
|
|
URL: http://commons.apache.org/%{base_name}
|
|
|
|
BuildArch: noarch
|
|
|
|
Source0: http://archive.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
|
|
|
|
# this will not be needed after commons-collections have proper pom
|
|
|
|
|
|
|
|
BuildRequires: apache-commons-logging >= 0:1.0
|
|
|
|
BuildRequires: java >= 1:1.6.0
|
|
|
|
BuildRequires: jpackage-utils > 0:1.7.2
|
2011-11-22 13:46:13 +00:00
|
|
|
BuildRequires: maven
|
2010-05-26 08:17:52 +00:00
|
|
|
BuildRequires: maven-plugin-bundle
|
|
|
|
BuildRequires: maven-surefire-maven-plugin
|
|
|
|
BuildRequires: maven-surefire-provider-junit
|
2011-11-22 13:46:13 +00:00
|
|
|
BuildRequires: maven-antrun-plugin
|
|
|
|
BuildRequires: maven-assembly-plugin
|
|
|
|
BuildRequires: maven-compiler-plugin
|
|
|
|
BuildRequires: maven-idea-plugin
|
|
|
|
BuildRequires: maven-install-plugin
|
|
|
|
BuildRequires: maven-jar-plugin
|
|
|
|
BuildRequires: maven-javadoc-plugin
|
|
|
|
BuildRequires: maven-resources-plugin
|
|
|
|
BuildRequires: maven-site-plugin
|
2010-05-26 08:17:52 +00:00
|
|
|
#change to apache-commons-collections once transition is done
|
2011-11-22 13:46:13 +00:00
|
|
|
BuildRequires: apache-commons-collections-testframework >= 0:2.0
|
|
|
|
BuildRequires: apache-commons-collections >= 0:2.0
|
|
|
|
Requires: apache-commons-collections >= 0:2.0
|
2010-05-26 08:17:52 +00:00
|
|
|
Requires: apache-commons-logging >= 0:1.0
|
|
|
|
Requires: java >= 1:1.6.0
|
|
|
|
|
|
|
|
|
|
|
|
# This should go away with F-17
|
|
|
|
Provides: jakarta-%{short_name} = 0:%{version}-%{release}
|
|
|
|
Obsoletes: jakarta-%{short_name} <= 0:1.7.0
|
|
|
|
|
|
|
|
%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: Documentation
|
|
|
|
Requires: jpackage-utils
|
|
|
|
|
|
|
|
Provides: jakarta-%{short_name}-javadoc = 0:%{version}-%{release}
|
|
|
|
Obsoletes: jakarta-%{short_name}-javadoc <= 0:1.7.0
|
|
|
|
|
|
|
|
%description javadoc
|
|
|
|
%{summary}.
|
|
|
|
|
|
|
|
%prep
|
|
|
|
%setup -q -n %{short_name}-%{version}-src
|
|
|
|
sed -i 's/\r//' *.txt
|
|
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
|
|
|
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
|
|
|
|
mkdir -p $MAVEN_REPO_LOCAL
|
|
|
|
# test failures ignored because they are caused by mock
|
2011-11-22 13:46:13 +00:00
|
|
|
mvn-rpmbuild -Dmaven.test.failure.ignore=true \
|
|
|
|
install javadoc:javadoc
|
2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
# jars
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
|
2011-11-22 13:46:13 +00:00
|
|
|
install -m 644 target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
|
|
|
|
|
|
|
|
# main jar created from these, we install them just for safe measure
|
|
|
|
install -m 644 target/%{short_name}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-bean-collections.jar
|
|
|
|
install -m 644 target/%{short_name}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-core.jar
|
2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
pushd $RPM_BUILD_ROOT%{_javadir}
|
2011-11-22 13:46:13 +00:00
|
|
|
for jar in *.jar; do
|
2010-05-26 08:17:52 +00:00
|
|
|
ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
|
|
|
|
done
|
|
|
|
popd # come back from javadir
|
|
|
|
|
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
|
2011-11-22 13:46:13 +00:00
|
|
|
install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
|
2010-05-26 08:17:52 +00:00
|
|
|
|
2011-11-22 13:46:13 +00:00
|
|
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}-core,%{short_name}:%{short_name}-bean-collections"
|
|
|
|
%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name},org.apache.commons:%{short_name}-core,org.apache.commons:%{short_name}-bean-collections"
|
2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
# javadoc
|
2011-11-22 13:46:13 +00:00
|
|
|
install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
|
|
|
cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
|
2010-05-26 08:17:52 +00:00
|
|
|
|
2011-11-22 13:46:13 +00:00
|
|
|
%pre javadoc
|
|
|
|
# workaround for rpm bug, can be removed in F-20
|
|
|
|
[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
|
|
|
|
rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
|
2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
|
|
|
|
%files
|
|
|
|
%doc *.txt
|
2011-11-22 13:46:13 +00:00
|
|
|
%{_javadir}/%{short_name}.jar
|
|
|
|
%{_javadir}/%{short_name}-core.jar
|
|
|
|
%{_javadir}/%{short_name}-bean-collections.jar
|
|
|
|
%{_javadir}/%{name}.jar
|
|
|
|
%{_javadir}/%{name}-core.jar
|
|
|
|
%{_javadir}/%{name}-bean-collections.jar
|
|
|
|
%{_mavenpomdir}/JPP-%{name}.pom
|
|
|
|
%{_mavendepmapfragdir}/%{name}
|
2010-05-26 08:17:52 +00:00
|
|
|
|
|
|
|
%files javadoc
|
2010-07-08 13:05:56 +00:00
|
|
|
%doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
|
2010-05-26 08:17:52 +00:00
|
|
|
%{_javadocdir}/%{name}
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
2011-11-22 13:46:13 +00:00
|
|
|
* Tue Nov 22 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8.3-5
|
|
|
|
- Packaging fixes
|
|
|
|
- Remove unneeded depmap
|
|
|
|
- Remove versioned jars and javadocs
|
|
|
|
- Use maven 3 to build
|
|
|
|
|
2011-02-08 01:23:26 +00:00
|
|
|
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.3-4
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
|
|
|
|
2010-07-08 13:05:56 +00:00
|
|
|
* Thu Jul 8 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8.3-3
|
|
|
|
- Add license to javadoc subpackage
|
|
|
|
|
2010-05-26 08:17:52 +00:00
|
|
|
* Mon May 24 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8.3-2
|
|
|
|
- Added provides to javadoc subpackage
|
|
|
|
|
|
|
|
* Fri May 21 2010 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.8.3-1
|
|
|
|
- Re-did whole spec file, dropped gcj support
|
|
|
|
- Rename package (jakarta-commons-beanutils->apache-commons-beanutils)
|
|
|
|
|
|
|
|
* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7.0-12.3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
|
|
|
|
|
|
|
* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.7.0-11.3
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
|
|
|
|
|
|
|
* Thu Oct 23 2008 David Walluck <dwalluck@redhat.com> 0:1.7.0-10.3
|
|
|
|
- Fedora-specific: enable GCJ support
|
|
|
|
|
|
|
|
* Thu Oct 23 2008 David Walluck <dwalluck@redhat.com> 0:1.7.0-10.2
|
|
|
|
- Fedora-specific: BuildRequires: java-1.6.0-devel
|
|
|
|
|
|
|
|
* Thu Oct 23 2008 David Walluck <dwalluck@redhat.com> 0:1.7.0-10.1
|
|
|
|
- Fedora-specific: remove repolib
|
|
|
|
- Fedora-specific: enable JDK6 support
|
|
|
|
|
|
|
|
* Mon Oct 20 2008 David Walluck <dwalluck@redhat.com> 0:1.7.0-10
|
|
|
|
- add flag to build with maven
|
|
|
|
|
|
|
|
* Fri Sep 19 2008 David Walluck <dwalluck@redhat.com> 0:1.7.0-9
|
|
|
|
- add jdk6 patch
|
|
|
|
- fix repolib
|
|
|
|
|
|
|
|
* Sun Jun 15 2008 David Walluck <dwalluck@redhat.com> 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 <pcheung@redhat.com> - 0:1.7.0-7
|
|
|
|
- First JPP5 build
|
|
|
|
|
|
|
|
* Tue Jul 24 2007 Ralph Apel <r.apel at r-apel.de> - 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 <vivekl@redhat.com> - 0:1.7.0-2jpp.ep1.2
|
|
|
|
- Fix repolib location
|
|
|
|
|
|
|
|
* Tue Mar 13 2007 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-2jpp.ep1.1
|
|
|
|
- New repolib location
|
|
|
|
|
|
|
|
* Mon Mar 05 2007 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-2jpp.el4ep1.3
|
|
|
|
- Remove pre section used for RHUG cleanup
|
|
|
|
|
|
|
|
* Tue Feb 20 2007 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.7.0-2jpp.el4ep1.2
|
|
|
|
- Add -brew suffix
|
|
|
|
|
|
|
|
* Fri Feb 17 2007 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.7.0-2jpp.el4ep1.1
|
|
|
|
- Add repolib support
|
|
|
|
|
|
|
|
* Thu Aug 17 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-5jpp
|
|
|
|
- Require what is used in post/postun for javadoc
|
|
|
|
|
|
|
|
* Fri Jul 14 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-4jpp
|
|
|
|
- Add AOT bits
|
|
|
|
|
|
|
|
* Thu May 11 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-3jpp
|
|
|
|
- Add header
|
|
|
|
- Remove unecessary macro definitions
|
|
|
|
|
|
|
|
* Wed Feb 22 2006 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-2jpp_1rh
|
|
|
|
- Merge with upstream
|
|
|
|
|
|
|
|
* Wed Apr 27 2005 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp_3rh
|
|
|
|
- Fix build so that collections jar is created
|
|
|
|
|
|
|
|
* Sat Jan 29 2005 Ralph Apel <r.apel@r-apel.de> - 0:1.7.0-2jpp
|
|
|
|
- Use the "dist" target to get a full build, including bean-collections
|
|
|
|
|
|
|
|
* Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp_1rh
|
|
|
|
- Import from upstream
|
|
|
|
|
|
|
|
* Thu Oct 21 2004 Fernando Nasser <fnasser@redhat.com> - 0:1.7.0-1jpp
|
|
|
|
- Upgrade to 1.7.0
|
|
|
|
|
|
|
|
* Fri Oct 1 2004 Andrew Overholt <overholt@redhat.com> 0:1.6.1-4jpp_6rh
|
|
|
|
- add coreutils BuildRequires
|
|
|
|
|
|
|
|
* Sun Aug 23 2004 Randy Watler <rwatler at finali.com> - 0:1.6.1-5jpp
|
|
|
|
- Rebuild with ant-1.6.2
|
|
|
|
|
|
|
|
* Fri Jul 2 2004 Aizaz Ahmed <aahmed@redhat.com> 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 <fche@redhat.com> 0:1.6.1-4jpp_4rh
|
|
|
|
- more of the same, for version-suffixed .jar files
|
|
|
|
|
|
|
|
* Fri Mar 26 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_3rh
|
|
|
|
- add RHUG upgrade cleanup
|
|
|
|
|
|
|
|
* Fri Mar 5 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_2rh
|
|
|
|
- RH vacuuming part II
|
|
|
|
|
|
|
|
* Thu Mar 4 2004 Frank Ch. Eigler <fche@redhat.com> 0:1.6.1-4jpp_1rh
|
|
|
|
- RH vacuuming
|
|
|
|
|
|
|
|
* Fri May 09 2003 David Walluck <david@anti-microsoft.org> 0:1.6.1-4jpp
|
|
|
|
- update for JPackage 1.5
|
|
|
|
|
|
|
|
* Thu Feb 27 2003 Henri Gomez <hgomez@users.sourceforge.net> 1.6.1-2jpp
|
|
|
|
- fix ASF license and add packager name
|
|
|
|
|
|
|
|
* Wed Feb 19 2003 Henri Gomez <hgomez@users.sourceforge.net> 1.6.1-1jpp
|
|
|
|
- 1.6.1
|
|
|
|
|
|
|
|
* Thu Feb 13 2003 Henri Gomez <hgomez@users.sourceforge.net> 1.6-1jpp
|
|
|
|
- 1.6
|
|
|
|
|
|
|
|
* Thu Oct 24 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.5-1jpp
|
|
|
|
- 1.5
|
|
|
|
|
|
|
|
* Fri Aug 23 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.4.1-1jpp
|
|
|
|
- 1.4.1
|
|
|
|
|
|
|
|
* Tue Aug 20 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.4-1jpp
|
|
|
|
- 1.4
|
|
|
|
|
|
|
|
* Fri Jul 12 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.3-3jpp
|
|
|
|
- change to commons-xxx.jar instead of commons-xxx.home in ant parameters
|
|
|
|
|
|
|
|
* Mon Jun 10 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.3-2jpp
|
|
|
|
- use sed instead of bash 2.x extension in link area to make spec compatible
|
|
|
|
with distro using bash 1.1x
|
|
|
|
|
2011-11-22 13:46:13 +00:00
|
|
|
* Fri Jun 07 2002 Henri Gomez <hgomez@users.sourceforge.net> 1.3-1jpp
|
2010-05-26 08:17:52 +00:00
|
|
|
- 1.3
|
|
|
|
- added short names in %%{_javadir}, as does jakarta developpers
|
|
|
|
- first jPackage release
|