packages: java-avalon-framework/java-avalon-framework.spec - more macros! -...

[pawelz]

Author: pawelz                       Date: Sat Apr 24 17:40:02 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more macros!
- verbose %files

---- Files affected:
packages/java-avalon-framework:
   java-avalon-framework.spec (1.22 -> 1.23) 

---- Diffs:

================================================================
Index: packages/java-avalon-framework/java-avalon-framework.spec
diff -u packages/java-avalon-framework/java-avalon-framework.spec:1.22 packages/java-avalon-framework/java-avalon-framework.spec:1.23
--- packages/java-avalon-framework/java-avalon-framework.spec:1.22	Sat Apr 24 19:34:49 2010
+++ packages/java-avalon-framework/java-avalon-framework.spec	Sat Apr 24 19:39:56 2010
@@ -28,7 +28,7 @@
 BuildRequires:	jdk
 BuildRequires:	jpackage-utils
 BuildRequires:	rpm-javaprov
-BuildRequires:	rpmbuild(macros) >= 1.300
+BuildRequires:	rpmbuild(macros) >= 1.553
 BuildRequires:	sed >= 4.0
 BuildConflicts:	java-gcj-compat-devel
 Requires:	jpackage-utils
@@ -54,7 +54,7 @@
 %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$,,'
+find '(' -name '*.html' -o -name '*.css' -o -name '*.xml' ')' -print0 | xargs -0 %undos
 
 %build
 required_jars="avalon-logkit %{?with_tests:junit}"
@@ -65,7 +65,7 @@
 	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
+export CLASSPATH=$(build-classpath $required_jars):$(pwd)/avalon-framework-api-%{version}/target/avalon-framework-api-%{version}.jar
 %ant -f %{srcname}-impl-%{version}/build.xml \
 	-Dnoget=1 \
 	dist %{?with_tests:test}
@@ -83,7 +83,10 @@
 
 %files
 %defattr(644,root,root,755)
-%{_javadir}/*.jar
+%{_javadir}/%{srcname}-api.jar
+%{_javadir}/%{srcname}-api-%{version}.jar
+%{_javadir}/%{srcname}-impl.jar
+%{_javadir}/%{srcname}-impl-%{version}.jar
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -91,6 +94,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.23  2010/04/24 17:39:56  pawelz
+- more macros!
+- verbose %files
+
 Revision 1.22  2010/04/24 17:34:49  pawelz
 - use full power of %setup macro
 
================================================================

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