Author: pawelz Date: Mon Feb 16 07:24:24 2009 GMT Module: SPECS Tag: HEAD ---- Log message: - correct dir for javadoc - use java-gcj-compat-devel - do not R jre - do not build javadoc when being built --without javadoc - rel 4
---- Files affected: SPECS: java-commons-beanutils.spec (1.20 -> 1.21) ---- Diffs: ================================================================ Index: SPECS/java-commons-beanutils.spec diff -u SPECS/java-commons-beanutils.spec:1.20 SPECS/java-commons-beanutils.spec:1.21 --- SPECS/java-commons-beanutils.spec:1.20 Fri Jan 23 11:35:24 2009 +++ SPECS/java-commons-beanutils.spec Mon Feb 16 08:24:19 2009 @@ -4,11 +4,13 @@ %bcond_without javadoc # don't build javadoc # %include /usr/lib/rpm/macros.java -Summary: Jakarta Commons BeanUtils - Bean Introspection Utilities -Summary(pl.UTF-8): Jakarta Commons BeanUtils - narzędzia do badania JavaBeans +# +%define srcname commons-beanutils +Summary: Commons BeanUtils - Bean Introspection Utilities +Summary(pl.UTF-8): Commons BeanUtils - narzędzia do badania JavaBeans Name: java-commons-beanutils Version: 1.7.0 -Release: 3 +Release: 4 License: Apache Group: Libraries/Java Source0: http://www.apache.org/dist/commons/beanutils/source/commons-beanutils-%{version}-src.tar.gz @@ -17,11 +19,11 @@ URL: http://commons.apache.org/beanutils/ BuildRequires: java-commons-collections BuildRequires: java-commons-logging +BuildRequires: java-gcj-compat-devel BuildRequires: jpackage-utils BuildRequires: junit BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 -Requires: jre Suggests: java-commons-collections Provides: jakarta-commons-beanutils Obsoletes: jakarta-commons-beanutils @@ -29,31 +31,31 @@ BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description -The Bean Introspection Utilities component of the Jakarta Commons +The Bean Introspection Utilities component of the Commons subproject offers low-level utility classes that assist in getting and setting property values on Java classes that follow the naming design patterns outlined in the JavaBeans Specification, as well as mechanisms for dynamically defining and accessing bean properties. %description -l pl.UTF-8 -Komponent Bean Instrospection Utilities z podprojektu Jakarta Commons +Komponent Bean Instrospection Utilities z podprojektu Commons oferuje niskopoziomowe klasy narzędziowe pomagające w odczytywaniu i ustawianiu wartości składowych klas Javy zgodnych ze wzorcami nazewnictwa określonymi w specyfikacji JavaBeans oraz mechanizmy do dynamicznego definiowania i dostępu do składowych. %package javadoc -Summary: Jakarta Commons BeanUtils documentation -Summary(pl.UTF-8): Dokumentacja do Jakarta Commons BeanUtils +Summary: Commons BeanUtils documentation +Summary(pl.UTF-8): Dokumentacja do Commons BeanUtils Group: Documentation Requires: jpackage-utils Obsoletes: jakarta-commons-beanutils-doc %description javadoc -Jakarta Commons BeanUtils documentation. +Commons BeanUtils documentation. %description javadoc -l pl.UTF-8 -Dokumentacja do Jakarta Commons BeanUtils. +Dokumentacja do Commons BeanUtils. %prep %setup -q -n commons-beanutils-%{version}-src @@ -63,31 +65,38 @@ required_jars="commons-logging commons-collections" export CLASSPATH=$(build-classpath $required_jars) export LC_ALL=en_US # sources are not in ASCII -%ant dist +%ant clean +%ant -Dbuild.compiler=extJavac jar bean-collections-dist + +%if %{with javadoc} +export SHELL=/bin/sh +%ant javadoc +%endif + %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} # jars -cp -a dist/commons-beanutils-core.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core-%{version}.jar -ln -s commons-beanutils-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-core.jar +cp -a dist/%{srcname}-core.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-core-%{version}.jar +ln -s %{srcname}-core-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-core.jar -cp -a dist/commons-beanutils-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections-%{version}.jar -ln -s commons-beanutils-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-beanutils-bean-collections.jar +cp -a optional/bean-collections/dist/%{srcname}-bean-collections.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-bean-collections-%{version}.jar +ln -s %{srcname}-bean-collections-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-bean-collections.jar # javadoc %if %{with javadoc} -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +install -d $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +cp -a dist/docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{srcname}-%{version} +ln -s %{srcname}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{srcname} # ghost symlink %endif %clean rm -rf $RPM_BUILD_ROOT %post javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} +ln -nfs %{srcname}-%{version} %{_javadocdir}/%{srcname} %files %defattr(644,root,root,755) @@ -97,8 +106,8 @@ %if %{with javadoc} %files javadoc %defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} +%{_javadocdir}/%{srcname}-%{version} +%ghost %{_javadocdir}/%{srcname} %endif %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) @@ -107,6 +116,13 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.21 2009/02/16 07:24:19 pawelz +- correct dir for javadoc +- use java-gcj-compat-devel +- do not R jre +- do not build javadoc when being built --without javadoc +- rel 4 + Revision 1.20 2009/01/23 10:35:24 pawelz - commons-{logging,collections} are no longer part of jakarta projekt ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/java-commons-beanutils.spec?r1=1.20&r2=1.21&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
