Author: pawelz Date: Wed Jun 9 19:15:56 2010 GMT Module: packages Tag: HEAD ---- Log message: - merged DEVEL
---- Files affected: packages/java-commons-logging: java-commons-logging.spec (1.29 -> 1.30) , build.xml.patch (1.1 -> 1.2) , jakarta-commons-logging-target.patch (1.1 -> NONE) (REMOVED) ---- Diffs: ================================================================ Index: packages/java-commons-logging/java-commons-logging.spec diff -u packages/java-commons-logging/java-commons-logging.spec:1.29 packages/java-commons-logging/java-commons-logging.spec:1.30 --- packages/java-commons-logging/java-commons-logging.spec:1.29 Sun Apr 18 16:17:45 2010 +++ packages/java-commons-logging/java-commons-logging.spec Wed Jun 9 21:15:50 2010 @@ -6,27 +6,31 @@ %bcond_without javadoc # don't build javadoc %include /usr/lib/rpm/macros.java +%define srcname commons-logging Summary: Commons Logging - interface for logging systems Summary(pl.UTF-8): Commons Logging - interfejs do systemów logujących Name: java-commons-logging -Version: 1.0.4 -Release: 4 -License: Apache +Version: 1.1.1 +Release: 1 +License: Apache v2.0 Group: Libraries/Java -Source0: http://archive.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz -# Source0-md5: db5dc75c89e794f794be92d10df6be1b -Patch0: jakarta-commons-logging-target.patch +Source0: http://www.apache.org/dist/commons/logging/source/commons-logging-%{version}-src.tar.gz +# Source0-md5: e5cfa8cca13152d7545fde6b1783c60a +Patch0: build.xml.patch URL: http://commons.apache.org/logging/ BuildRequires: ant +BuildRequires: ant-junit +BuildRequires: java(servlet) +BuildRequires: java-avalon-framework +BuildRequires: java-avalon-logkit +BuildRequires: java-junit BuildRequires: java-log4j BuildRequires: jdk >= 1.4 BuildRequires: jpackage-utils -BuildRequires: junit BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 Requires: jpackage-utils Requires: jre >= 1.4 -Provides: jakarta-commons-logging Obsoletes: jakarta-commons-logging BuildArch: noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -46,70 +50,90 @@ niewielka liczba podstawowych implementacji, aby pozwolić użytkownikom na używanie pakietu samodzielnie. -%package javadoc -Summary: Commons Logging documentation -Summary(pl.UTF-8): Dokumentacja do Commons Logging -Group: Documentation -Requires: jpackage-utils -Provides: jakarta-commons-logging-javadoc -Obsoletes: jakarta-commons-logging-doc -Obsoletes: jakarta-commons-logging-javadoc - -%description javadoc -Commons Logging documentation. - -%description javadoc -l pl.UTF-8 -Dokumentacja do Commons Logging. - %prep %setup -q -n commons-logging-%{version}-src + +%undos build.xml %patch0 -p1 %build -required_jars="log4j junit" -CLASSPATH=$(build-classpath $required_jars) -export CLASSPATH -%ant dist javadoc +cat > build.properties << EOF +log4j12.jar=%(find-jar log4j) +junit.jar=%(find-jar junit) +logkit.jar=%(find-jar avalon-logkit) +avalon-framework-impl.jar=%(find-jar avalon-framework-impl.jar) +avalon-framework-api.jar=%(find-jar avalon-framework-api.jar) +servletapi.jar=%(find-jar servlet-api.jar) +EOF + +! grep -q '=$' build.properties + +export LC_ALL=en_US + +%ant %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} -cp -a dist/commons-logging-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}-api.jar -cp -a dist/commons-logging.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar -ln -s commons-logging-%{version}-api.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar -ln -s commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging.jar -# javadoc -%if %{with javadoc} -install -d $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -cp -a dist/docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version} -ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink -%endif +install target/commons-logging-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-%{version}.jar +install target/commons-logging-adapters-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-adapters-%{version}.jar +install target/commons-logging-api-1.1.1.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api-%{version}.jar +install target/commons-logging-appender.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-appender-%{version}.jar +install target/commons-logging-wrapper.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-wrapper-%{version}.jar + +ln -s commons-logging-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging.jar +ln -s commons-logging-adapters-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-adapters.jar +ln -s commons-logging-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-api.jar +ln -s commons-logging-appender-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-appender.jar +ln -s commons-logging-wrapper-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/commons-logging-wrapper.jar %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -ln -nfs %{name}-%{version} %{_javadocdir}/%{name} - %files %defattr(644,root,root,755) -%doc dist/*.txt %{_javadir}/*.jar -%if %{with javadoc} -%files javadoc -%defattr(644,root,root,755) -%{_javadocdir}/%{name}-%{version} -%ghost %{_javadocdir}/%{name} -%endif - %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[email protected]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.30 2010/06/09 19:15:50 pawelz +- merged DEVEL + +Revision 1.21.2.8 2010/06/09 19:09:44 pawelz +- G: Libraries/Java +- rel 1 + +Revision 1.21.2.7 2010/06/09 19:07:35 pawelz +- install files manually + +Revision 1.21.2.6 2010/06/09 18:51:50 pawelz +- now it builds + +Revision 1.21.2.5 2010/06/09 18:00:48 pawelz +- merged HEAD. Does not build. + +Revision 1.21.2.4 2009/03/29 15:43:43 pawelz +- jdk bconds +- dropped EA +- Proper P/O after changing Name +- small fixes, unified + +Revision 1.21.2.3 2009/01/23 11:19:54 pawelz +- BR: junit, avalon-{framework,logkit} +- unified License + +Revision 1.21.2.2 2009/01/23 11:17:10 pawelz +- it is no longer part of jakarta project (fixed name and descriptions) +- updated java deps + +Revision 1.21.2.1 2007/12/07 23:37:03 glen +- 1.1.1 (one test fails, therefore DEVEL branch) + Revision 1.29 2010/04/18 14:17:45 pawelz - updated java deps ================================================================ Index: packages/java-commons-logging/build.xml.patch diff -u /dev/null packages/java-commons-logging/build.xml.patch:1.2 --- /dev/null Wed Jun 9 21:15:56 2010 +++ packages/java-commons-logging/build.xml.patch Wed Jun 9 21:15:50 2010 @@ -0,0 +1,42 @@ +--- commons-logging-1.1.1-src/build.xml~ 2010-06-09 20:47:36.000000000 +0200 ++++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:48:11.000000000 +0200 +@@ -94,7 +94,7 @@ + <property name="component.title" value="Logging Wrapper Library"/> + + <!-- The current version number of this component --> +- <property name="component.version" value="1.1.1-SNAPSHOT"/> ++ <property name="component.version" value="1.1.1"/> + + <!-- The base directory for compilation targets --> + <property name="build.home" value="${basedir}/target"/> +--- commons-logging-1.1.1-src/build.xml~ 2007-11-22 00:27:52.000000000 +0100 ++++ commons-logging-1.1.1-src/build.xml 2010-06-09 20:27:15.000000000 +0200 +@@ -146,7 +146,8 @@ + <pathelement location="${build.home}/classes"/> + <pathelement location="${junit.jar}"/> + <pathelement location="${logkit.jar}"/> +- <pathelement location="${avalon-framework.jar}"/> ++ <pathelement location="${avalon-framework-impl.jar}"/> ++ <pathelement location="${avalon-framework-api.jar}"/> + <pathelement location="${servletapi.jar}"/> + </path> + +@@ -167,7 +168,8 @@ + <pathelement location="${build.home}/tests"/> + <pathelement location="${junit.jar}"/> + <pathelement location="${logkit.jar}"/> +- <pathelement location="${avalon-framework.jar}"/> ++ <pathelement location="${avalon-framework-impl.jar}"/> ++ <pathelement location="${avalon-framework-api.jar}"/> + <pathelement location="${conf.home}"/> + <pathelement location="${servletapi.jar}"/> + </path> +@@ -246,7 +248,7 @@ + <!-- Note: log4j13 support is not available in the 1.1 release. --> + <!--Log4j13: ${log4j13.jar}--> + LogKit: ${logkit.jar} +- Avalon-Framework: ${avalon-framework.jar} ++ Avalon-Framework: ${avalon-framework-impl.jar} + ${avalon-framework-api.jar} + </echo> + + <mkdir dir="${build.home}"/> ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-logging/java-commons-logging.spec?r1=1.29&r2=1.30&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-commons-logging/build.xml.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
