Author: glen Date: Sun Dec 2 19:32:17 2007 GMT Module: SPECS Tag: HEAD ---- Log message: - builds in this state
---- Files affected: SPECS: avalon-framework.spec (1.15 -> 1.16) ---- Diffs: ================================================================ Index: SPECS/avalon-framework.spec diff -u SPECS/avalon-framework.spec:1.15 SPECS/avalon-framework.spec:1.16 --- SPECS/avalon-framework.spec:1.15 Wed Sep 19 18:40:56 2007 +++ SPECS/avalon-framework.spec Sun Dec 2 20:32:12 2007 @@ -1,4 +1,11 @@ # $Revision$, $Date$ +# TODO +# - chicken-egg: who was first, avalon-framework or avalon-logkit? +# +# Conditional build: +%bcond_with tests # build and run tests +# +%include /usr/lib/rpm/macros.java Summary: The Avalon Framework Summary(pl.UTF-8): Szkielet Avalon Name: avalon-framework @@ -10,12 +17,19 @@ # Source0-md5: d4cffb4ba1d07bdc517ac6e322636495 Source1: http://www.apache.org/dist/excalibur/avalon-framework/source/%{name}-impl-%{version}-src.tar.gz # Source1-md5: 62499f9b32ac4d722a46a4f2cfbbf0d8 +Patch0: %{name}-tests.patch URL: http://excalibur.apache.org/framework/ BuildRequires: ant >= 1.5 +%{?with_tests:BuildRequires: ant-junit} BuildRequires: ant-nodeps +BuildRequires: avalon-logkit +BuildRequires: jakarta-commons-logging BuildRequires: jpackage-utils -BuildRequires: junit +%{?with_tests:BuildRequires: junit} +BuildRequires: logging-log4j +BuildRequires: rpm-javaprov BuildRequires: rpmbuild(macros) >= 1.300 +BuildRequires: sed >= 4.0 BuildArch: noarch ExclusiveArch: i586 i686 pentium3 pentium4 athlon %{x8664} noarch BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -34,35 +48,35 @@ %prep %setup -q -c -T -tar xzf %{SOURCE0} -tar xzf %{SOURCE1} +%{__tar} -xzf %{SOURCE0} +%{__tar} -xzf %{SOURCE1} +%patch0 -p1 + +# Fix for wrong-file-end-of-line-encoding problem +find '(' -name '*.html' -o -name '*.css' -o -name '*.xml' ')' -print0 | xargs -0 sed -i -e 's,\r$,,' %build -required_jars='junit' -export CLASSPATH="`/usr/bin/build-classpath $required_jars`" -export JAVA_HOME=%{java_home} -#export JAVA_HOME=/usr/lib/jvm/java-sun-1.5.0.06 -export JAVAC=%javac -export JAVA=%java - -# nope. doesn't work. nooo-way. -cd %{name}-api-%{version} -%ant -cd .. - -cd %{name}-impl-%{version} -%ant -cd .. +required_jars="avalon-logkit %{?with_tests:junit}" +export CLASSPATH=$(build-classpath $required_jars) + +%ant -f %{name}-api-%{version}/build.xml \ + -Dnoget=1 \ + dist %{?with_tests:test} + +required_jars="avalon-logkit commons-logging log4j" +export CLASSPATH=$(build-classpath $required_jars):$(pwd)/avalon-framework-api-4.3/target/avalon-framework-api-4.3.jar +%ant -f %{name}-impl-%{version}/build.xml \ + -Dnoget=1 \ + dist %{?with_tests:test} %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_javadir} +cp -a %{name}-api-%{version}/target/%{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar +ln -sf %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar -install %{name}-impl-%{version}/target/%{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar -install %{name}-api-%{version}/target/%{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api-%{version}.jar - +cp -a %{name}-impl-%{version}/target/%{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl-%{version}.jar ln -sf %{name}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-impl.jar -ln -sf %{name}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-api.jar %clean rm -rf $RPM_BUILD_ROOT @@ -77,6 +91,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.16 2007-12-02 19:32:12 glen +- builds in this state + Revision 1.15 2007-09-19 16:40:56 glen - unify macros ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/avalon-framework.spec?r1=1.15&r2=1.16&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
