packages: java-avalon-framework/java-avalon-framework.spec - renamed from a...

pawelz pawelz at pld-linux.org
Sat Apr 3 23:10:57 CEST 2010


Author: pawelz                       Date: Sat Apr  3 21:10:57 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- renamed from avalon-framework
- force java-sun

---- Files affected:
packages/java-avalon-framework:
   java-avalon-framework.spec (1.17 -> 1.18) 

---- Diffs:

================================================================
Index: packages/java-avalon-framework/java-avalon-framework.spec
diff -u packages/java-avalon-framework/java-avalon-framework.spec:1.17 packages/java-avalon-framework/java-avalon-framework.spec:1.18
--- packages/java-avalon-framework/java-avalon-framework.spec:1.17	Sun Dec  9 02:22:52 2007
+++ packages/java-avalon-framework/java-avalon-framework.spec	Sat Apr  3 23:10:51 2010
@@ -1,32 +1,32 @@
 # $Revision$, $Date$
-# 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
@@ -59,24 +59,23 @@
 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
@@ -91,6 +90,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/04/03 21:10:51  pawelz
+- renamed from avalon-framework
+- force java-sun
+
 Revision 1.17  2007/12/09 01:22:52  glen
 - R: jpackage-utils for %{_javadir}; cosmetics/cleanups
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/java-avalon-framework/java-avalon-framework.spec?r1=1.17&r2=1.18&f=u



More information about the pld-cvs-commit mailing list