Hello community, here is the log from the commit of package jakarta-commons-lang checked in at Wed Jul 30 00:58:53 CEST 2008. -------- --- jakarta-commons-lang/jakarta-commons-lang.changes 2006-09-15 14:55:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-lang/jakarta-commons-lang.changes 2008-07-29 09:11:11.000000000 +0200 @@ -1,0 +2,16 @@ +Tue Jul 29 09:09:19 CEST 2008 - anosek@suse.cz + +- made the symlink jakarta-commons-lang -> jakarta-commons-lang-2.3 + part of the javadoc package + +------------------------------------------------------------------- +Mon Jul 21 15:33:36 CEST 2008 - mvyskocil@suse.cz + +- update to 2.3 + - merged with japackage 1.7 spec file + - add a maven build support and a maven pom files and post/un scripts for + depmap files +- removed a source=1.1 - fixed build under openjdk6 +- removed a crosslink patch + +------------------------------------------------------------------- Old: ---- commons-lang-2.0-src.tar.gz jakarta-commons-lang-crosslink.patch New: ---- commons-lang-2.3-jpp-depmap.xml commons-lang-2.3.pom commons-lang-2.3-src.tar.bz2 pom-maven2jpp-depcat.xsl pom-maven2jpp-mapdeps.xsl pom-maven2jpp-newdepmap.xsl ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-lang.spec ++++++ --- /var/tmp/diff_new_pack.N19695/_old 2008-07-30 00:58:30.000000000 +0200 +++ /var/tmp/diff_new_pack.N19695/_new 2008-07-30 00:58:30.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package jakarta-commons-lang (Version 2.0) +# spec file for package jakarta-commons-lang (Version 2.3) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -10,22 +10,43 @@ # norootforbuild -Name: jakarta-commons-lang -BuildRequires: ant java2-devel-packages junit xml-commons-apis +%define with_maven 0 %define base_name lang %define short_name commons-%{base_name} -%define name jakarta-%{short_name} %define section free -Version: 2.0 -Release: 25 + +Name: jakarta-commons-lang +Version: 2.3 +Release: 1 Summary: Jakarta Commons Lang Package -License: Apache +License: The Apache Software License Group: Development/Libraries/Java -URL: http://jakarta.apache.org/commons/lang.html -Source0: http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.0-... -Patch0: %{name}-crosslink.patch +Url: http://jakarta.apache.org/commons/lang.html +Source0: http://www.apache.org/dist/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: %{short_name}-%{version}-jpp-depmap.xml +Source5: %{short_name}-%{version}.pom BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +BuildRequires: jpackage-utils >= 1.7.2 +BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: perl +BuildRequires: java-devel +BuildRequires: unzip +BuildRequires: saxon +BuildRequires: saxon-scripts +%if %{with_maven} +BuildRequires: maven >= 1.1 +BuildRequires: maven-plugin-changelog +BuildRequires: maven-plugin-changes +BuildRequires: maven-plugin-xdoc +%endif +PreReq: jpackage-utils >= 1.7.2 +Requires(post): jpackage-utils >= 1.7.2 +Requires(postun): jpackage-utils >= 1.7.2 %description The standard Java libraries fail to provide enough methods for @@ -41,6 +62,7 @@ %package javadoc +License: The Apache Software License PreReq: coreutils Summary: Javadoc for jakarta-commons-lang Group: Development/Libraries/Java @@ -61,63 +83,148 @@ +%if %{with_maven} + +%package manual + +Summary: Documents for %{name} +Group: Development/Documentation + +%description manual +The standard Java libraries fail to provide enough methods for +manipulation of its core classes. The Commons Lang Component provides +these extra methods. The Commons Lang Component provides a host of +helper utilities for the java.lang API, notably String manipulation +methods, basic numerical methods, object reflection, creation and +serialization, and System properties. Additionally it contains an +inheritable enum type, an exception structure that supports multiple +types of nested-Exceptions and a series of utlities dedicated to help +with building methods, such as hashCode, toString and equals. + +This package contains the documentation for the Jakarta Commons +Lang Package. +%endif + %prep %setup -q -n %{short_name}-%{version}-src -%patch0 -p0 +%{__perl} -pi -e 's/\r//g' *.txt +if [ ! -f %{SOURCE4} ]; then +export DEPCAT=$(pwd)/%{short_name}-%{version}-depcat.new.xml +echo '<?xml version="1.0" standalone="yes"?>' > $DEPCAT +echo '<depset>' >> $DEPCAT +for p in $(find . -name project.xml); do + pushd $(dirname $p) + /usr/bin/saxon project.xml %{SOURCE1} >> $DEPCAT + popd +done +echo >> $DEPCAT +echo '</depset>' >> $DEPCAT +/usr/bin/saxon $DEPCAT %{SOURCE2} > %{short_name}-%{version}-depmap.new.xml +fi %build -if ! grep -q "javac.*source=" build.xml ; then - perl -p -i -e 's|<javac |<javac source=\"1.1\" |' build.xml - perl -p -i -e 's|<javadoc |<javadoc source=\"1.4\" |' build.xml -fi -ant \ +%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 \ + -Dmaven.javadoc.source=1.4 \ + -Dmaven.repo.remote=file:/usr/share/maven/repository \ + -Dmaven.home.local=$(pwd)/.maven \ + jar javadoc xdoc:transform +%else + ant \ -Djunit.jar=$(find-jar junit) \ -Dfinal.name=%{short_name} \ - -Dj2se.javadoc=%{_javadocdir}/java \ - dist + -Djdk.javadoc=%{_javadocdir}/java \ + jar javadoc +%endif %install # jars mkdir -p $RPM_BUILD_ROOT%{_javadir} +%if %{with_maven} +cp -p target/%{short_name}-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar +%else cp -p dist/%{short_name}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{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 %{base_name} %{base_name} %{version} JPP %{name} +# pom +install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms +install -m 644 %{SOURCE5} \ + $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom # javadoc mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} cp -pr dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink +ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} +## manual +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -p STATUS.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +cp -p *.txt $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version} +%if %{with_maven} +rm -rf target/docs/apidocs +install -d -m 755 $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site +cp -pr target/docs/* $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/site +%endif %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} +%post +%update_maven_depmap + +%postun +%update_maven_depmap %files %defattr(0644,root,root,0755) -%doc PROPOSAL.html STATUS.html LICENSE.txt RELEASE-NOTES.txt +%dir %{_docdir}/%{name}-%{version} +%doc %{_docdir}/%{name}-%{version}/STATUS.html +%doc %{_docdir}/%{name}-%{version}/*.txt %{_javadir}/* +%{_datadir}/maven2 +%{_mavendepmapfragdir} %files javadoc %defattr(0644,root,root,0755) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} +%if %{with_maven} + +%files manual +%defattr(0644,root,root,0755) +%doc %{_docdir}/%{name}-%{version}/site +%endif -%changelog -n jakarta-commons-lang -* Fri Sep 15 2006 - ro@suse.de +%changelog +* Tue Jul 29 2008 anosek@suse.cz +- made the symlink jakarta-commons-lang -> jakarta-commons-lang-2.3 + part of the javadoc package +* Mon Jul 21 2008 mvyskocil@suse.cz +- update to 2.3 + - merged with japackage 1.7 spec file + - add a maven build support and a maven pom files and post/un scripts for + depmap files +- removed a source=1.1 - fixed build under openjdk6 +- removed a crosslink patch +* Fri Sep 15 2006 ro@suse.de - use source=1.1 for java -* Wed Jan 25 2006 - mls@suse.de +* Wed Jan 25 2006 mls@suse.de - converted neededforbuild to BuildRequires -* Mon Aug 29 2005 - jsmeix@suse.de +* Mon Aug 29 2005 jsmeix@suse.de - Removed the "test" to be built so that it builds now on all architectures (see bug 102629). The "test" failed on ppc, s390x, and ppc64 (see bug 113779). -* Wed Jul 27 2005 - jsmeix@suse.de +* Wed Jul 27 2005 jsmeix@suse.de - Adjustments in the spec file. -* Mon Jul 18 2005 - jsmeix@suse.de +* Mon Jul 18 2005 jsmeix@suse.de - Current version 2.0 from JPackage.org -* Thu Sep 16 2004 - skh@suse.de +* Thu Sep 16 2004 skh@suse.de - Fix prerequires of javadoc subpackage -* Thu Sep 02 2004 - skh@suse.de +* Thu Sep 02 2004 skh@suse.de - Initial package created with version 2.0 (JPackage 1.5) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org