Hello community, here is the log from the commit of package jakarta-commons-lang for openSUSE:Factory checked in at Fri Feb 5 14:36:11 CET 2010. -------- --- jakarta-commons-lang/jakarta-commons-lang.changes 2008-07-29 09:11:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/jakarta-commons-lang/jakarta-commons-lang.changes 2010-01-27 09:39:27.000000000 +0100 @@ -1,0 +2,5 @@ +Wed Jan 27 08:39:19 UTC 2010 - mvyskocil@suse.cz + +- merged with jakarta-commons-lang-2.1-7.jpp5.src.rpm + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- 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 New: ---- commons-lang-2.4-src.tar.gz jakarta-commons-lang-build.patch jakarta-commons-lang-component-info.xml ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ jakarta-commons-lang.spec ++++++ --- /var/tmp/diff_new_pack.e254ky/_old 2010-02-05 14:34:32.000000000 +0100 +++ /var/tmp/diff_new_pack.e254ky/_new 2010-02-05 14:34:32.000000000 +0100 @@ -1,7 +1,9 @@ # -# spec file for package jakarta-commons-lang (Version 2.3) +# spec file for package jakarta-commons-lang (Version 2.4) # -# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2000-2009, JPackage Project +# All rights reserved. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,172 +17,99 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild -%define with_maven 0 +%define with() %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}} +%define without() %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}} +%define bcond_with() %{expand:%%{?_with_%{1}:%%global with_%{1} 1}} +%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}} +%define repodir %{_javadir}/repository.jboss.com/apache-lang/%{version}-brew +%define repodirlib %{repodir}/lib +%define repodirres %{repodir}/resources +%define repodirsrc %{repodir}/src %define base_name lang %define short_name commons-%{base_name} %define section free -Name: jakarta-commons-lang -Version: 2.3 -Release: 37 +Name: jakarta-%{short_name} +Version: 2.4 +Release: 1 Summary: Jakarta Commons Lang Package -License: The Apache Software License +License: ASL 2.0 Group: Development/Libraries/Java -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 +Url: http://jakarta.apache.org/commons/lang +Source0: http://archive.apache.org/dist/jakarta/commons/lang/source/commons-lang-2.4-... +Source1: jakarta-commons-lang-component-info.xml +Patch0: jakarta-commons-lang-build.patch +Requires(post): jpackage-utils +Requires(postun): jpackage-utils +Requires: commons-parent >= 9 BuildRequires: ant BuildRequires: ant-junit -BuildRequires: perl +BuildRequires: java-javadoc +BuildRequires: jpackage-utils 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 +BuildArch: noarch +Provides: %{short_name} = %{version}-%{release} +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description 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 utilities dedicated to -helping with building methods, such as hashCode, toString and equals. - +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 utilities dedicated to help with building methods, such +as hashCode, toString and equals. %package javadoc -License: The Apache Software License -PreReq: coreutils -Summary: Javadoc for jakarta-commons-lang -Group: Development/Libraries/Java - -%description javadoc -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 javadoc documentation for the Jakarta Commons -Lang Package. - - - -%if %{with_maven} - -%package manual - -Summary: Documents for %{name} +License: ASL 2.0 +Summary: Javadoc for %{name} Group: Development/Documentation +Requires: java-javadoc -%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 +%description javadoc +Javadoc for %{name}. %prep %setup -q -n %{short_name}-%{version}-src -%{__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 +%patch0 -p1 -b .p0 +%{__perl} -pi \ + -e 's/\r$//g;' \ + PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt %build -%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) \ +export OPT_JAR_LIST=`%{__cat} %{_sysconfdir}/ant.d/junit` +export CLASSPATH= +%{ant} \ + -Dcompile.source=1.4 \ + -Djunit.jar=$(build-classpath junit) \ -Dfinal.name=%{short_name} \ -Djdk.javadoc=%{_javadocdir}/java \ - jar javadoc -%endif + test dist %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} +%{__mkdir_p} %{buildroot}%{_javadir} +%{__cp} -p %{short_name}/%{short_name}/%{short_name}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|jakarta-||g"`; done) +(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed "s|-%{version}||g"`; done) # pom -install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms -install -m 644 %{SOURCE5} \ - $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP-%{name}.pom +%{__mkdir_p} %{buildroot}%{_datadir}/maven2/poms +%{__cp} -p pom.xml %{buildroot}%{_datadir}/maven2/poms/JPP-%{name}.pom +%add_to_maven_depmap commons-lang commons-lang %{version} JPP %{name} # 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} -## 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 +%{__mkdir_p} %{buildroot}%{_javadocdir}/%{name}-%{version} +%{__cp} -pr %{short_name}/%{short_name}/docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}/ +%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{name} +%{__ln_s} %{name}-%{version} %{buildroot}%{_javadocdir}/%{short_name}-%{version} +%{__ln_s} %{short_name}-%{version} %{buildroot}%{_javadocdir}/%{short_name} %clean -rm -rf $RPM_BUILD_ROOT +%{__rm} -rf %{buildroot} %post %update_maven_depmap @@ -190,22 +119,19 @@ %files %defattr(0644,root,root,0755) -%dir %{_docdir}/%{name}-%{version} -%doc %{_docdir}/%{name}-%{version}/STATUS.html -%doc %{_docdir}/%{name}-%{version}/*.txt -%{_javadir}/* -%{_datadir}/maven2 -%{_mavendepmapfragdir} +%doc PROPOSAL.html LICENSE.txt NOTICE.txt RELEASE-NOTES.txt +%{_javadir}/%{name}-%{version}.jar +%{_javadir}/%{name}.jar +%{_javadir}/%{short_name}-%{version}.jar +%{_javadir}/%{short_name}.jar +%{_datadir}/maven2/poms/JPP-%{name}.pom +%{_mavendepmapfragdir}/%{name} %files javadoc %defattr(0644,root,root,0755) -%doc %{_javadocdir}/%{name}-%{version} -%doc %{_javadocdir}/%{name} -%if %{with_maven} - -%files manual -%defattr(0644,root,root,0755) -%doc %{_docdir}/%{name}-%{version}/site -%endif +%{_javadocdir}/%{name}-%{version} +%{_javadocdir}/%{name} +%{_javadocdir}/%{short_name}-%{version} +%{_javadocdir}/%{short_name} %changelog ++++++ jakarta-commons-lang-build.patch ++++++ --- commons-lang-2.4-src/build.xml.p0 2008-01-15 18:56:47.000000000 -0500 +++ commons-lang-2.4-src/build.xml 2009-03-18 14:57:26.425150740 -0400 @@ -62,7 +62,7 @@ </copy> </target> <target name="compile" depends="static" description="Compile shareable components"> - <javac srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" target="${compile.target}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}"> + <javac encoding="8859_1" srcdir="${source.home}" destdir="${build.home}/classes" debug="${compile.debug}" deprecation="${compile.deprecation}" source="${compile.source}" excludes="${compile.excludes}" optimize="${compile.optimize}"> <classpath refid="compile.classpath"/> </javac> <copy todir="${build.home}/classes" filtering="on"> @@ -70,7 +70,7 @@ </copy> </target> <target name="compile.tests" depends="compile" description="Compile unit test cases"> - <javac srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" target="${compile.target}" source="${compile.source}" optimize="${compile.optimize}"> + <javac encoding="8859_1" srcdir="${test.home}" destdir="${build.home}/tests" debug="${compile.debug}" deprecation="off" source="${compile.source}" optimize="${compile.optimize}"> <classpath refid="test.classpath"/> </javac> <copy todir="${build.home}/tests" filtering="on"> @@ -89,7 +89,7 @@ <tstamp> <format property="current.year" pattern="yyyy"/> </tstamp> - <javadoc sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="<h1>${component.title}</h1>" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}"> + <javadoc encoding="8859_1" sourcepath="${source.home}" destdir="${dist.home}/docs/api" overview="${source.home}/org/apache/commons/lang/overview.html" packagenames="org.apache.commons.*" excludepackagenames="${javadoc.excludepackagenames}" author="true" version="true" doctitle="<h1>${component.title}</h1>" windowtitle="${component.title} (Version ${component.version})" bottom="Copyright &copy; 2001-${current.year} - Apache Software Foundation" use="true" link="${jdk.javadoc}" source="${compile.source}"> <classpath refid="compile.classpath"/> </javadoc> </target> @@ -121,7 +121,7 @@ <delete file="${final.name}.tar"/> <fixcrlf srcdir="${final.name}" eol="crlf" includes="**/*.txt"/> <zip destfile="${final.name}.zip" basedir="${final.name}"/> - <delete dir="${final.name}"/> + <!-- <delete dir="${final.name}"/> --> </target> <target name="jar" depends="compile" description="Create jar"> <mkdir dir="${dist.home}"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org