- renamed from avalon-framework

- force java-sun

Changed files:
    java-avalon-framework.spec -> 1.18

diff --git a/java-avalon-framework.spec b/java-avalon-framework.spec
index bad05ae342bf4d4d017e3b07968b3dca76b172e4..0b64bcc1552691e7642c547db79e1e2e11a19a75 100644 (file)
--- a/java-avalon-framework.spec
+++ b/java-avalon-framework.spec
@@ -1,31 +1,31 @@
-# TODO
-# - chicken-egg: who was first, avalon-framework or avalon-logkit?
 #
 # Conditional build:
 %bcond_with    tests           # build and run tests
 #
+%define                srcname avalon-framework
 %include       /usr/lib/rpm/macros.java
 Summary:       The Avalon Framework
 Summary(pl.UTF-8):     Szkielet Avalon
-Name:          avalon-framework
+Name:          java-avalon-framework
 Version:       4.3
 Release:       0.1
 License:       Apache v2.0
 Group:         Libraries
-Source0:       http://www.apache.org/dist/excalibur/avalon-framework/source/%{name}-api-%{version}-src.tar.gz
+Source0:       http://www.apache.org/dist/excalibur/avalon-framework/source/%{srcname}-api-%{version}-src.tar.gz
 # Source0-md5: d4cffb4ba1d07bdc517ac6e322636495
-Source1:       http://www.apache.org/dist/excalibur/avalon-framework/source/%{name}-impl-%{version}-src.tar.gz
+Source1:       http://www.apache.org/dist/excalibur/avalon-framework/source/%{srcname}-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: java-avalon-logkit
+BuildRequires: java-commons-logging
+%{?with_tests:BuildRequires:   java-junit}
+BuildRequires: java-log4j
+BuildRequires: java-sun
 BuildRequires: jpackage-utils
-%{?with_tests:BuildRequires:   junit}
-BuildRequires: logging-log4j
 BuildRequires: rpm-javaprov
 BuildRequires: rpmbuild(macros) >= 1.300
 BuildRequires: sed >= 4.0
@@ -58,24 +58,23 @@ find '(' -name '*.html' -o -name '*.css' -o -name '*.xml' ')' -print0 | xargs -0
 required_jars="avalon-logkit %{?with_tests:junit}"
 export CLASSPATH=$(build-classpath $required_jars)
 
-%ant -f %{name}-api-%{version}/build.xml \
+%ant -f %{srcname}-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 \
+%ant -f %{srcname}-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
-
-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
+cp -a %{srcname}-api-%{version}/target/%{srcname}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-api-%{version}.jar
+ln -sf %{srcname}-api-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-api.jar
+cp -a %{srcname}-impl-%{version}/target/%{srcname}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-impl-%{version}.jar
+ln -sf %{srcname}-impl-%{version}.jar $RPM_BUILD_ROOT%{_javadir}/%{srcname}-impl.jar
 
 %clean
 rm -rf $RPM_BUILD_ROOT